+2003-10-11 Michael Koch <konqueror@gmx.de>
+
+ * javax/naming/Context.java,
+ javax/naming/Name.java,
+ javax/naming/NameParser.java,
+ javax/naming/NamingEnumeration.java,
+ javax/naming/Referenceable.java,
+ javax/naming/directory/Attribute.java,
+ javax/naming/directory/Attributes.java,
+ javax/naming/directory/DirContext.java,
+ javax/naming/event/EventContext.java,
+ javax/naming/event/EventDirContext.java,
+ javax/naming/event/NamespaceChangeListener.java,
+ javax/naming/event/NamingListener.java,
+ javax/naming/event/ObjectChangeListener.java,
+ javax/naming/ldap/Control.java,
+ javax/naming/ldap/ExtendedRequest.java,
+ javax/naming/ldap/ExtendedResponse.java,
+ javax/naming/ldap/HasControls.java,
+ javax/naming/ldap/LdapContext.java,
+ javax/naming/ldap/UnsolicitedNotification.java,
+ javax/naming/ldap/UnsolicitedNotificationListener.java,
+ javax/naming/spi/DirObjectFactory.java,
+ javax/naming/spi/DirStateFactory.java,
+ javax/naming/spi/InitialContextFactory.java,
+ javax/naming/spi/InitialContextFactoryBuilder.java,
+ javax/naming/spi/ObjectFactory.java,
+ javax/naming/spi/ObjectFactoryBuilder.java,
+ javax/naming/spi/Resolver.java,
+ javax/naming/spi/StateFactory.java:
+ Removing redundant modifiers.
+
2003-10-11 Michael Koch <konqueror@gmx.de>
* java/security/Key.java,
public interface Context
{
// Property with name of the inital context factory to use
- public static final String INITIAL_CONTEXT_FACTORY
+ String INITIAL_CONTEXT_FACTORY
= "java.naming.factory.initial";
// Property with colon-separated list of object factories to use.
- public static final String OBJECT_FACTORIES
+ String OBJECT_FACTORIES
= "java.naming.factory.object";
// Property with colon-separated list of state factories to use.
- public static final String STATE_FACTORIES
+ String STATE_FACTORIES
= "java.naming.factory.state";
// Property with colon-separated list of package prefixes to use.
- public static final String URL_PKG_PREFIXES
+ String URL_PKG_PREFIXES
= "java.naming.factory.url.pkgs";
// Property with URL specifying configuration for the service
// provider to use.
- public static final String PROVIDER_URL
+ String PROVIDER_URL
= "java.naming.provider.url";
// Property with the DNS host and domain names to use.
- public static final String DNS_URL
+ String DNS_URL
= "java.naming.dns.url";
// Property with the authoritativeness of the service requested.
- public static final String AUTHORITATIVE
+ String AUTHORITATIVE
= "java.naming.authoritative";
// Property with the batch size to use when returning data via the
// service's protocol.
- public static final String BATCHSIZE
+ String BATCHSIZE
= "java.naming.batchsize";
// Property defining how referrals encountered by the service
// provider are to be processed.
- public static final String REFERRAL
+ String REFERRAL
= "java.naming.referral";
// Property specifying the security protocol to use.
- public static final String SECURITY_PROTOCOL
+ String SECURITY_PROTOCOL
= "java.naming.security.protocol";
// Property specifying the security level to use.
- public static final String SECURITY_AUTHENTICATION
+ String SECURITY_AUTHENTICATION
= "java.naming.security.authentication";
// Property for the identity of the principal for authenticating
// the caller to the service.
- public static final String SECURITY_PRINCIPAL
+ String SECURITY_PRINCIPAL
= "java.naming.security.principal";
// Property specifying the credentials of the principal for
// authenticating the caller to the service.
- public static final String SECURITY_CREDENTIALS
+ String SECURITY_CREDENTIALS
= "java.naming.security.credentials";
// Property for specifying the preferred language to use with the
// service.
- public static final String LANGUAGE
+ String LANGUAGE
= "java.naming.language";
// Property for the initial context constructor to use when searching
// for other properties.
- public static final String APPLET
+ String APPLET
= "java.naming.applet";
- public void bind (Name name, Object obj) throws NamingException;
- public void bind (String name, Object obj) throws NamingException;
+ void bind (Name name, Object obj) throws NamingException;
+ void bind (String name, Object obj) throws NamingException;
- public Object lookup (Name name) throws NamingException;
- public Object lookup (String name) throws NamingException;
+ Object lookup (Name name) throws NamingException;
+ Object lookup (String name) throws NamingException;
- public void rebind (Name name, Object obj) throws NamingException;
- public void rebind (String name, Object obj) throws NamingException;
+ void rebind (Name name, Object obj) throws NamingException;
+ void rebind (String name, Object obj) throws NamingException;
- public void unbind (Name name) throws NamingException;
- public void unbind (String name) throws NamingException;
+ void unbind (Name name) throws NamingException;
+ void unbind (String name) throws NamingException;
- public void rename (Name oldName, Name newName) throws NamingException;
- public void rename (String oldName, String newName) throws NamingException;
+ void rename (Name oldName, Name newName) throws NamingException;
+ void rename (String oldName, String newName) throws NamingException;
- public NamingEnumeration list (Name name) throws NamingException;
- public NamingEnumeration list (String name) throws NamingException;
+ NamingEnumeration list (Name name) throws NamingException;
+ NamingEnumeration list (String name) throws NamingException;
- public NamingEnumeration listBindings (Name name) throws NamingException;
- public NamingEnumeration listBindings (String name) throws NamingException;
+ NamingEnumeration listBindings (Name name) throws NamingException;
+ NamingEnumeration listBindings (String name) throws NamingException;
- public void destroySubcontext (Name name) throws NamingException;
- public void destroySubcontext (String name) throws NamingException;
+ void destroySubcontext (Name name) throws NamingException;
+ void destroySubcontext (String name) throws NamingException;
- public Context createSubcontext (Name name) throws NamingException;
- public Context createSubcontext (String name) throws NamingException;
+ Context createSubcontext (Name name) throws NamingException;
+ Context createSubcontext (String name) throws NamingException;
- public Object lookupLink (Name name) throws NamingException;
- public Object lookupLink (String name) throws NamingException;
+ Object lookupLink (Name name) throws NamingException;
+ Object lookupLink (String name) throws NamingException;
- public NameParser getNameParser (Name name) throws NamingException;
- public NameParser getNameParser (String name) throws NamingException;
+ NameParser getNameParser (Name name) throws NamingException;
+ NameParser getNameParser (String name) throws NamingException;
- public Name composeName (Name name, Name prefix) throws NamingException;
- public String composeName (String name,
+ Name composeName (Name name, Name prefix) throws NamingException;
+ String composeName (String name,
String prefix) throws NamingException;
- public Object addToEnvironment (String propName,
+ Object addToEnvironment (String propName,
Object propVal) throws NamingException;
- public Object removeFromEnvironment (String propName) throws NamingException;
+ Object removeFromEnvironment (String propName) throws NamingException;
- public Hashtable getEnvironment () throws NamingException;
+ Hashtable getEnvironment () throws NamingException;
- public void close () throws NamingException;
+ void close () throws NamingException;
- public String getNameInNamespace () throws NamingException;
+ String getNameInNamespace () throws NamingException;
}
*/
public interface Name extends Cloneable, Serializable
{
- static final long serialVersionUID = -3617482732056931635L;
+ long serialVersionUID = -3617482732056931635L;
/**
* Returns the number of components of this <code>Name</code>.
* The returned number can be zero.
*/
- public int size();
+ int size();
/**
* Returns <code>true</code> if the number of components of this
* <code>Name</code> is zero, <code>false</code> otherwise.
*/
- public boolean isEmpty();
+ boolean isEmpty();
/**
* Returns a non-null (but possibly empty) <code>Enumeration</code> of the
* components of the <code>Name</code> as <code>String</code>s.
*/
- public Enumeration getAll();
+ Enumeration getAll();
/**
* Gets the component at the given index.
* @exception ArrayIndexOutOfBoundsException if the given index is smaller
* then zero or greater then or equal to <code>size()</code>.
*/
- public String get(int i);
+ String get(int i);
/**
* Returns the components till the given index as a <code>Name</code>.
* @exception ArrayIndexOutOfBoundsException if the given index is smaller
* then zero or greater then or equal to <code>size()</code>.
*/
- public Name getPrefix(int i);
+ Name getPrefix(int i);
/**
* Returns the components from the given index till the end as a
* @exception ArrayIndexOutOfBoundsException if the given index is smaller
* then zero or greater then or equal to <code>size()</code>.
*/
- public Name getSuffix(int i);
+ Name getSuffix(int i);
/**
* Adds the given <code>String</code> component to the end of this
* @exception InvalidNameException if the given <code>String</code> is not a
* valid component for this <code>Name</code>.
*/
- public Name add(String comp) throws InvalidNameException;
+ Name add(String comp) throws InvalidNameException;
/**
* Inserts the given <code>String</code> component to this <code>Name</code>
* @exception InvalidNameException if the given <code>String</code> is not a
* valid component for this <code>Name</code>.
*/
- public Name add(int posn, String comp) throws InvalidNameException;
+ Name add(int posn, String comp) throws InvalidNameException;
/**
* Adds all the components of the given <code>Name</code> to the end of this
* @exception InvalidNameException if any of the given components is not a
* valid component for this <code>Name</code>.
*/
- public Name addAll(Name suffix) throws InvalidNameException;
+ Name addAll(Name suffix) throws InvalidNameException;
/**
* Inserts all the components of the given <code>Name</code> to this
* @exception InvalidNameException if any of the given components is not a
* valid component for this <code>Name</code>.
*/
- public Name addAll(int posn, Name n) throws InvalidNameException;
+ Name addAll(int posn, Name n) throws InvalidNameException;
/**
* Removes the component at the given index from this <code>Name</code>.
* @exception InvalidNameException if the given <code>String</code> is not a
* valid component for this <code>Name</code>.
*/
- public Object remove(int posn) throws InvalidNameException;
+ Object remove(int posn) throws InvalidNameException;
/**
* Returns <code>true</code> if this <code>Name</code> starts with the
* components of the given <code>Name</code>, <code>false</code> otherwise.
*/
- public boolean startsWith(Name name);
+ boolean startsWith(Name name);
/**
* Returns <code>true</code> if this <code>Name</code> ends with the
* components of the given <code>Name</code>, <code>false</code> otherwise.
*/
- public boolean endsWith(Name name);
+ boolean endsWith(Name name);
/**
* Compares the given object to this <code>Name</code>.
* be compared. The definition of smaller, bigger and equal is up to the
* actual implementing class.
*/
- public int compareTo(Object obj);
+ int compareTo(Object obj);
/**
* Returns a clone of this <code>Name</code>. It will be a deep copy of
* all the components of the <code>Name</code> so that changes to components
* of the components does not change the component in this <code>Name</code>.
*/
- public Object clone();
+ Object clone();
}
public interface NameParser
{
- public Name parse (String name) throws NamingException;
+ Name parse (String name) throws NamingException;
}
public interface NamingEnumeration extends Enumeration
{
- public void close() throws NamingException;
- public boolean hasMore() throws NamingException;
- public Object next() throws NamingException;
+ void close() throws NamingException;
+ boolean hasMore() throws NamingException;
+ Object next() throws NamingException;
}
public interface Referenceable
{
- public Reference getReference() throws NamingException;
+ Reference getReference() throws NamingException;
}
*/
public interface Attribute extends Cloneable, Serializable
{
- public static final long serialVersionUID = 8707690322213556804L;
+ long serialVersionUID = 8707690322213556804L;
- public NamingEnumeration getAll() throws NamingException;
- public Object get() throws NamingException;
- public int size();
- public String getID();
- public boolean contains(Object attrVal);
- public boolean add(Object attrVal);
- public boolean remove(Object attrval);
- public void clear();
- public DirContext getAttributeSyntaxDefinition() throws NamingException;
- public DirContext getAttributeDefinition() throws NamingException;
- public Object clone();
- public boolean isOrdered();
- public Object get(int ix) throws NamingException;
- public Object remove(int ix);
- public void add(int ix, Object attrVal);
- public Object set(int ix, Object attrVal);
+ NamingEnumeration getAll() throws NamingException;
+ Object get() throws NamingException;
+ int size();
+ String getID();
+ boolean contains(Object attrVal);
+ boolean add(Object attrVal);
+ boolean remove(Object attrval);
+ void clear();
+ DirContext getAttributeSyntaxDefinition() throws NamingException;
+ DirContext getAttributeDefinition() throws NamingException;
+ Object clone();
+ boolean isOrdered();
+ Object get(int ix) throws NamingException;
+ Object remove(int ix);
+ void add(int ix, Object attrVal);
+ Object set(int ix, Object attrVal);
}
public interface Attributes extends Cloneable, Serializable
{
- public boolean isCaseIgnored();
- public int size();
- public Attribute get(String attrID);
- public NamingEnumeration getAll();
- public NamingEnumeration getIDs();
- public Attribute put(String attrID, Object val);
- public Attribute put(Attribute attr);
- public Attribute remove(String attrID);
- public Object clone();
+ boolean isCaseIgnored();
+ int size();
+ Attribute get(String attrID);
+ NamingEnumeration getAll();
+ NamingEnumeration getIDs();
+ Attribute put(String attrID, Object val);
+ Attribute put(Attribute attr);
+ Attribute remove(String attrID);
+ Object clone();
}
public interface DirContext extends Context
{
- public static final int ADD_ATTRIBUTE = 1;
- public static final int REPLACE_ATTRIBUTE = 2;
- public static final int REMOVE_ATTRIBUTE = 3;
+ int ADD_ATTRIBUTE = 1;
+ int REPLACE_ATTRIBUTE = 2;
+ int REMOVE_ATTRIBUTE = 3;
- public Attributes getAttributes (String name) throws NamingException;
- public Attributes getAttributes (String name, String[] attrIds) throws NamingException;
- public Attributes getAttributes (Name name) throws NamingException;
- public Attributes getAttributes(Name name, String[] attrIds) throws NamingException;
- public void modifyAttributes(Name name, int mod_op, Attributes attrs) throws NamingException;
- public void modifyAttributes(String name, int mod_op, Attributes attrs) throws NamingException;
- public void modifyAttributes(Name name, ModificationItem[] mods) throws NamingException;
- public void modifyAttributes(String name, ModificationItem[] mods) throws NamingException;
- public void bind(Name name, Object obj, Attributes attrs) throws NamingException;
- public void bind(String name, Object obj, Attributes attrs) throws NamingException;
- public void rebind(Name name, Object obj, Attributes attrs) throws NamingException;
- public void rebind(String name, Object obj, Attributes attrs) throws NamingException;
- public DirContext createSubcontext(Name name, Attributes attrs) throws NamingException;
- public DirContext createSubcontext(String name, Attributes attrs) throws NamingException;
- public DirContext getSchema(Name name) throws NamingException;
- public DirContext getSchema(String name) throws NamingException;
- public DirContext getSchemaClassDefinition(Name name) throws NamingException;
- public DirContext getSchemaClassDefinition(String name) throws NamingException;
- public NamingEnumeration search(Name name, Attributes matchingAttributes, String[] attributesToReturn) throws NamingException;
- public NamingEnumeration search(String name, Attributes matchingAttributes, String[] attributesToReturn) throws NamingException;
- public NamingEnumeration search(Name name, Attributes matchingAttributes) throws NamingException;
- public NamingEnumeration search(String name, Attributes matchingAttributes) throws NamingException;
- public NamingEnumeration search(Name name, String filter, SearchControls cons) throws NamingException;
- public NamingEnumeration search(String name, String filter, SearchControls cons) throws NamingException;
- public NamingEnumeration search(Name name, String filterExpr, Object[] filterArgs, SearchControls cons) throws NamingException;
- public NamingEnumeration search(String name, String filterExpr, Object[] filterArgs, SearchControls cons) throws NamingException;
+ Attributes getAttributes (String name) throws NamingException;
+ Attributes getAttributes (String name, String[] attrIds) throws NamingException;
+ Attributes getAttributes (Name name) throws NamingException;
+ Attributes getAttributes(Name name, String[] attrIds) throws NamingException;
+ void modifyAttributes(Name name, int mod_op, Attributes attrs) throws NamingException;
+ void modifyAttributes(String name, int mod_op, Attributes attrs) throws NamingException;
+ void modifyAttributes(Name name, ModificationItem[] mods) throws NamingException;
+ void modifyAttributes(String name, ModificationItem[] mods) throws NamingException;
+ void bind(Name name, Object obj, Attributes attrs) throws NamingException;
+ void bind(String name, Object obj, Attributes attrs) throws NamingException;
+ void rebind(Name name, Object obj, Attributes attrs) throws NamingException;
+ void rebind(String name, Object obj, Attributes attrs) throws NamingException;
+ DirContext createSubcontext(Name name, Attributes attrs) throws NamingException;
+ DirContext createSubcontext(String name, Attributes attrs) throws NamingException;
+ DirContext getSchema(Name name) throws NamingException;
+ DirContext getSchema(String name) throws NamingException;
+ DirContext getSchemaClassDefinition(Name name) throws NamingException;
+ DirContext getSchemaClassDefinition(String name) throws NamingException;
+ NamingEnumeration search(Name name, Attributes matchingAttributes, String[] attributesToReturn) throws NamingException;
+ NamingEnumeration search(String name, Attributes matchingAttributes, String[] attributesToReturn) throws NamingException;
+ NamingEnumeration search(Name name, Attributes matchingAttributes) throws NamingException;
+ NamingEnumeration search(String name, Attributes matchingAttributes) throws NamingException;
+ NamingEnumeration search(Name name, String filter, SearchControls cons) throws NamingException;
+ NamingEnumeration search(String name, String filter, SearchControls cons) throws NamingException;
+ NamingEnumeration search(Name name, String filterExpr, Object[] filterArgs, SearchControls cons) throws NamingException;
+ NamingEnumeration search(String name, String filterExpr, Object[] filterArgs, SearchControls cons) throws NamingException;
}
public interface EventContext extends Context
{
- public static final int OBJECT_SCOPE = 0;
- public static final int ONELEVEL_SCOPE = 1;
- public static final int SUBTREE_SCOPE = 2;
+ int OBJECT_SCOPE = 0;
+ int ONELEVEL_SCOPE = 1;
+ int SUBTREE_SCOPE = 2;
- public void addNamingListener(Name target, int scope, NamingListener l)
+ void addNamingListener (Name target, int scope, NamingListener l)
throws NamingException;
- public void addNamingListener(String target, int scope, NamingListener l)
+
+ void addNamingListener (String target, int scope, NamingListener l)
throws NamingException;
- public void removeNamingListener(NamingListener l) throws NamingException;
- public boolean targetMustExist() throws NamingException;
+
+ void removeNamingListener (NamingListener l) throws NamingException;
+
+ boolean targetMustExist() throws NamingException;
}
public interface EventDirContext extends EventContext, DirContext
{
- public void addNamingListener(Name target, String filter, SearchControls ctls,
- NamingListener l) throws NamingException;
- public void addNamingListener(String target, String filter,
- SearchControls ctls, NamingListener l)
+ void addNamingListener (Name target, String filter, SearchControls ctls,
+ NamingListener l) throws NamingException;
+
+ void addNamingListeneri (String target, String filter, SearchControls ctls,
+ NamingListener l) throws NamingException;
+
+ void addNamingListener (Name target, String filter, Object[] filterArgs,
+ SearchControls ctls, NamingListener l)
throws NamingException;
- public void addNamingListener(Name target, String filter, Object[] filterArgs,
- SearchControls ctls, NamingListener l)
- throws NamingException;
- public void addNamingListener(String target, String filter,
+
+ void addNamingListener(String target, String filter,
Object[] filterArgs, SearchControls ctls,
NamingListener l) throws NamingException;
}
public interface NamespaceChangeListener extends NamingListener
{
- public void objectAdded(NamingEvent evt);
- public void objectRemoved(NamingEvent evt);
- public void objectRenamed(NamingEvent evt);
+ void objectAdded(NamingEvent evt);
+ void objectRemoved(NamingEvent evt);
+ void objectRenamed(NamingEvent evt);
}
public interface NamingListener extends EventListener
{
- public void namingExceptionThrown(NamingExceptionEvent evt);
+ void namingExceptionThrown(NamingExceptionEvent evt);
}
public interface ObjectChangeListener extends NamingListener
{
- public void objectChanged(NamingEvent evt);
+ void objectChanged(NamingEvent evt);
}
public interface Control extends Serializable
{
- public static final boolean CRITICAL = true;
- public static final boolean NONCRITICAL = false;
+ boolean CRITICAL = true;
+ boolean NONCRITICAL = false;
- public String getID();
- public boolean isCritical();
- public byte[] getEncodedValue();
+ String getID();
+ boolean isCritical();
+ byte[] getEncodedValue();
}
public interface ExtendedRequest extends Serializable
{
- public String getID();
- public byte[] getEncodedValue();
- public ExtendedResponse createExtendedResponse(String id,
+ String getID();
+ byte[] getEncodedValue();
+ ExtendedResponse createExtendedResponse(String id,
byte[] berValue, int offset,
int length)
throws NamingException;
public interface ExtendedResponse extends Serializable
{
- public String getID();
- public byte[] getEncodedValue();
+ String getID();
+ byte[] getEncodedValue();
}
public interface HasControls
{
- public Control[] getControls() throws NamingException;
+ Control[] getControls() throws NamingException;
}
public interface LdapContext extends DirContext
{
- public static final String CONTROL_FACTORIES = "java.naming.factory.control";
+ String CONTROL_FACTORIES = "java.naming.factory.control";
- public ExtendedResponse extendedOperation(ExtendedRequest request)
+ ExtendedResponse extendedOperation(ExtendedRequest request)
throws NamingException;
- public LdapContext newInstance(Control[] requestControls)
+ LdapContext newInstance(Control[] requestControls)
throws NamingException;
- public void reconnect(Control[] connCtls) throws NamingException;
- public Control[] getConnectControls() throws NamingException;
- public void setRequestControls(Control[] requestControls)
+ void reconnect(Control[] connCtls) throws NamingException;
+ Control[] getConnectControls() throws NamingException;
+ void setRequestControls(Control[] requestControls)
throws NamingException;
- public Control[] getRequestControls() throws NamingException;
- public Control[] getResponseControls() throws NamingException;
+ Control[] getRequestControls() throws NamingException;
+ Control[] getResponseControls() throws NamingException;
}
public interface UnsolicitedNotification extends ExtendedResponse, HasControls
{
- public String[] getReferrals();
- public NamingException getException();
+ String[] getReferrals();
+ NamingException getException();
}
public interface UnsolicitedNotificationListener extends NamingListener
{
- public void notificationReceived(UnsolicitedNotificationEvent evt);
+ void notificationReceived(UnsolicitedNotificationEvent evt);
}
public interface DirObjectFactory extends ObjectFactory
{
- public Object getObjectInstance(Object obj, Name name, Context nameCtx,
+ Object getObjectInstance(Object obj, Name name, Context nameCtx,
Hashtable environment, Attributes attrs)
throws Exception;
}
}
}
- public DirStateFactory.Result getStateToBind(Object obj, Name name,
+ DirStateFactory.Result getStateToBind(Object obj, Name name,
Context nameCtx,
Hashtable environment,
Attributes inAttrs)
public interface InitialContextFactory
{
- public Context getInitialContext (Hashtable environment) throws NamingException;
+ Context getInitialContext (Hashtable environment) throws NamingException;
}
public interface InitialContextFactoryBuilder
{
- public InitialContextFactory createInitialContextFactory (Hashtable environment) throws NamingException;
+ InitialContextFactory createInitialContextFactory (Hashtable environment)
+ throws NamingException;
}
package javax.naming.spi;
import java.util.Hashtable;
-import javax.naming.*;
+import javax.naming.Context;
+import javax.naming.Name;
public interface ObjectFactory
{
- public Object getObjectInstance (Object obj,
- Name name,
- Context nameCtx,
- Hashtable environment)
- throws Exception;
+ Object getObjectInstance (Object obj, Name name, Context nameCtx,
+ Hashtable environment)
+ throws Exception;
}
public interface ObjectFactoryBuilder
{
- public ObjectFactory createObjectFactory(Object obj,
+ ObjectFactory createObjectFactory(Object obj,
Hashtable environment)
throws NamingException;
}
public interface Resolver
{
- public ResolveResult resolveToClass(Name name, Class contextType)
+ ResolveResult resolveToClass(Name name, Class contextType)
throws NamingException;
- public ResolveResult resolveToClass(String name, Class contextType)
+ ResolveResult resolveToClass(String name, Class contextType)
throws NamingException;
}
public interface StateFactory
{
- public Object getStateToBind(Object obj, Name name, Context nameCtx,
+ Object getStateToBind(Object obj, Name name, Context nameCtx,
Hashtable environment) throws NamingException;
}