Index: modules/jndi/src/main/java/javax/naming/directory/Attribute.java
===================================================================
--- modules/jndi/src/main/java/javax/naming/directory/Attribute.java.orig 2006-06-01 07:58:33.000000000 +0100
+++ modules/jndi/src/main/java/javax/naming/directory/Attribute.java 2006-06-01 08:04:01.000000000 +0100
@@ -189,7 +189,7 @@
* @return an enumeration of all values of the attribute
* @throws NamingException If any NamingException occurs.
*/
- NamingEnumeration getAll() throws NamingException;
+ NamingEnumeration> getAll() throws NamingException;
/**
* Returns the attribute's schema definition.
Index: modules/jndi/src/main/java/javax/naming/directory/Attributes.java
===================================================================
--- modules/jndi/src/main/java/javax/naming/directory/Attributes.java.orig 2006-06-01 07:58:33.000000000 +0100
+++ modules/jndi/src/main/java/javax/naming/directory/Attributes.java 2006-06-01 08:04:01.000000000 +0100
@@ -72,7 +72,7 @@
* @return an enumeration of all contained attributes
*
*/
- NamingEnumeration getAll();
+ NamingEnumeration extends javax.naming.directory.Attribute> getAll();
/**
* Returns an enumeration containing the zero or more names (IDs) of the
@@ -82,7 +82,7 @@
*
* @return an enumeration of the IDs of all contained attributes
*/
- NamingEnumeration getIDs();
+ NamingEnumeration getIDs();
/**
* Indicates whether case is ignored in the names of the attributes.
Index: modules/jndi/src/main/java/javax/naming/directory/BasicAttributes.java
===================================================================
--- modules/jndi/src/main/java/javax/naming/directory/BasicAttributes.java.orig 2006-06-01 07:58:33.000000000 +0100
+++ modules/jndi/src/main/java/javax/naming/directory/BasicAttributes.java 2006-06-01 08:04:01.000000000 +0100
@@ -150,11 +150,11 @@
return (Attribute) attrMap.get(convertId(id));
}
- public NamingEnumeration getAll() {
+ public NamingEnumeration getAll() {
return new BasicNamingEnumeration(attrMap.elements());
}
- public NamingEnumeration getIDs() {
+ public NamingEnumeration getIDs() {
if (ignoreCase) {
Enumeration e = this.attrMap.elements();
Vector v = new Vector(attrMap.size());
Index: modules/jndi/src/main/java/javax/naming/directory/DirContext.java
===================================================================
--- modules/jndi/src/main/java/javax/naming/directory/DirContext.java.orig 2006-06-01 07:58:32.000000000 +0100
+++ modules/jndi/src/main/java/javax/naming/directory/DirContext.java 2006-06-01 08:04:01.000000000 +0100
@@ -22,6 +22,7 @@
import javax.naming.NamingException;
import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
/**
* This is the main interface to a directory service.
@@ -481,7 +482,7 @@
* @throws NamingException If any occurs.
* @see #search(Name name, Attributes attributes, String[] as)
*/
- NamingEnumeration search(Name name, Attributes attributes)
+ NamingEnumeration search(Name name, Attributes attributes)
throws NamingException;
/**
@@ -530,7 +531,8 @@
* @return NamngEnumeration of SearchResult
* @throws NamingException If any occurs.
*/
- NamingEnumeration search(Name name, Attributes attributes, String as[])
+ NamingEnumeration search(Name name, Attributes attributes,
+ String as[])
throws NamingException;
/**
@@ -582,7 +584,7 @@
* @throws NamingException If any occurs.
* @see SearchControls
*/
- NamingEnumeration search(
+ NamingEnumeration search(
Name name,
String filter,
Object[] objs,
@@ -604,7 +606,7 @@
* @throws NamingException If any occurs.
* @see #search(Name, String, Object[], SearchControls)
*/
- NamingEnumeration search(
+ NamingEnumeration search(
Name name,
String filter,
SearchControls searchControls)
@@ -622,7 +624,7 @@
* @throws NamingException If any occurs.
* @see #search(Name, Attributes)
*/
- NamingEnumeration search(String name, Attributes attributes)
+ NamingEnumeration search(String name, Attributes attributes)
throws NamingException;
/**
@@ -638,7 +640,8 @@
* @throws NamingException If any occurs.
* @see #search(Name, Attributes, String[])
*/
- NamingEnumeration search(String name, Attributes attributes, String as[])
+ NamingEnumeration search(String name, Attributes attributes,
+ String as[])
throws NamingException;
/**
@@ -655,7 +658,7 @@
* @throws NamingException If any occurs.
* @see #search(Name, String, Object[], SearchControls)
*/
- NamingEnumeration search(
+ NamingEnumeration search(
String name,
String filter,
Object[] objs,
@@ -675,7 +678,7 @@
* @throws NamingException If any occurs.
* @see #search(Name, String, SearchControls)
*/
- NamingEnumeration search(
+ NamingEnumeration search(
String name,
String filter,
SearchControls searchControls)
Index: modules/jndi/src/main/java/javax/naming/directory/InitialDirContext.java
===================================================================
--- modules/jndi/src/main/java/javax/naming/directory/InitialDirContext.java.orig 2006-06-01 07:58:33.000000000 +0100
+++ modules/jndi/src/main/java/javax/naming/directory/InitialDirContext.java 2006-06-01 08:04:01.000000000 +0100
@@ -24,6 +24,7 @@
import javax.naming.NamingException;
import javax.naming.NoInitialContextException;
import javax.naming.NotContextException;
+import javax.naming.directory.SearchResult;
/**
* This is the root context for directory service operations.
@@ -83,7 +84,8 @@
* If failed to construct a new instance.
* @see InitialContext
*/
- public InitialDirContext(Hashtable hashtable) throws NamingException {
+ public InitialDirContext(Hashtable, ?> hashtable)
+ throws NamingException {
super(hashtable);
}
@@ -218,12 +220,13 @@
getURLOrDefaultInitDirCtx(s).rebind(s, obj, attributes);
}
- public NamingEnumeration search(Name name, Attributes attributes)
+ public NamingEnumeration search(Name name,
+ Attributes attributes)
throws NamingException {
return getURLOrDefaultInitDirCtx(name).search(name, attributes);
}
- public NamingEnumeration search(
+ public NamingEnumeration search(
Name name,
Attributes attributes,
String[] as)
@@ -231,7 +234,7 @@
return getURLOrDefaultInitDirCtx(name).search(name, attributes, as);
}
- public NamingEnumeration search(
+ public NamingEnumeration search(
Name name,
String filter,
Object[] objs,
@@ -244,7 +247,7 @@
searchControls);
}
- public NamingEnumeration search(
+ public NamingEnumeration search(
Name name,
String filter,
SearchControls searchcontrols)
@@ -252,12 +255,13 @@
return getURLOrDefaultInitDirCtx(name).search(name, filter, searchcontrols);
}
- public NamingEnumeration search(String name, Attributes attributes)
+ public NamingEnumeration search(String name,
+ Attributes attributes)
throws NamingException {
return getURLOrDefaultInitDirCtx(name).search(name, attributes);
}
- public NamingEnumeration search(
+ public NamingEnumeration search(
String name,
Attributes attributes,
String[] as)
@@ -265,7 +269,7 @@
return getURLOrDefaultInitDirCtx(name).search(name, attributes, as);
}
- public NamingEnumeration search(
+ public NamingEnumeration search(
String name,
String filter,
Object[] objs,
@@ -274,7 +278,7 @@
return getURLOrDefaultInitDirCtx(name).search(name, filter, objs, searchControls);
}
- public NamingEnumeration search(
+ public NamingEnumeration search(
String name,
String filter,
SearchControls searchControls)
Index: modules/jndi/src/main/java/javax/naming/directory/BasicAttribute.java
===================================================================
--- modules/jndi/src/main/java/javax/naming/directory/BasicAttribute.java.orig 2006-06-01 07:58:33.000000000 +0100
+++ modules/jndi/src/main/java/javax/naming/directory/BasicAttribute.java 2006-06-01 08:04:01.000000000 +0100
@@ -92,7 +92,7 @@
* This is initialized by the public constructor and is required to be not
* null.
*/
- protected transient Vector values = new Vector();
+ protected transient Vector