harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndbe...@apache.org
Subject svn commit: r437433 [8/17] - in /incubator/harmony/enhanced/classlib/trunk/modules/jndi/src: main/java/javax/naming/ main/java/javax/naming/directory/ main/java/javax/naming/event/ main/java/javax/naming/ldap/ main/java/javax/naming/spi/ main/java/org/...
Date Sun, 27 Aug 2006 18:26:28 GMT
Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/directory/InvalidAttributeValueException.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/directory/InvalidAttributeValueException.java?rev=437433&r1=437432&r2=437433&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/directory/InvalidAttributeValueException.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/directory/InvalidAttributeValueException.java Sun Aug 27 11:26:20 2006
@@ -1,79 +1,79 @@
-/* Copyright 2004 The Apache Software Foundation or its licensors, as applicable
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
- package javax.naming.directory;
-
-import javax.naming.NamingException;
-
-/**
- * Thrown when the value part of an attribute is invalid.
- * <p>
- * Directory service providers may restrict the characteristics of the attribute
- * value.  If an attempt is made to set the attribute with an invalid attribute
- * value the provider will throw an <code>InvalidAttributeValueException</code>.</p>
- * <p>
- * Examples include attempting to set a value on an attribute that doesn't take 
- * a value, attempting to set multiple values on an attribute that only takes a 
- * single value, attempting to clear a value on an attribute that must have a 
- * value, and so on.</p> 
- * <p>
- * The serialization and synchronization specification for <code>NamingException</code>
- * applies equally to this class.</p>
- * 
- * @see NamingException
- * 
- */
-public class InvalidAttributeValueException extends NamingException {
-
-	/*
-	 * -------------------------------------------------------------------
-	 * Constants
-	 * -------------------------------------------------------------------
-	 */
-	 
-	/* Serialization information - start. */
-	private static final long serialVersionUID = 0x7903d78afec63b03L;
-	/* Serialization information - end. */
-
-	/*
-	 * -------------------------------------------------------------------
-	 * Constructors
-	 * -------------------------------------------------------------------
-	 */
-	 	
-	/**
-	 * Default constructor. 
-	 * <p>
-	 * All fields are initialized to null.</p>
-	 */	 		
-	public InvalidAttributeValueException() {
-		super();
-	}
-
-	/**
-	 * Constructs an <code>InvalidAttributeValueException</code> instance 
-     * using the supplied text of the message.
-	 * <p>
-	 * All fields are initialized to null.</p>
-	 * 
-	 * @param s				message about the problem
-	 */
-	public InvalidAttributeValueException(String s) {
-		super(s);
-	}
-
-}
-
-
+/* Copyright 2004 The Apache Software Foundation or its licensors, as applicable
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+ package javax.naming.directory;
+
+import javax.naming.NamingException;
+
+/**
+ * Thrown when the value part of an attribute is invalid.
+ * <p>
+ * Directory service providers may restrict the characteristics of the attribute
+ * value.  If an attempt is made to set the attribute with an invalid attribute
+ * value the provider will throw an <code>InvalidAttributeValueException</code>.</p>
+ * <p>
+ * Examples include attempting to set a value on an attribute that doesn't take 
+ * a value, attempting to set multiple values on an attribute that only takes a 
+ * single value, attempting to clear a value on an attribute that must have a 
+ * value, and so on.</p> 
+ * <p>
+ * The serialization and synchronization specification for <code>NamingException</code>
+ * applies equally to this class.</p>
+ * 
+ * @see NamingException
+ * 
+ */
+public class InvalidAttributeValueException extends NamingException {
+
+	/*
+	 * -------------------------------------------------------------------
+	 * Constants
+	 * -------------------------------------------------------------------
+	 */
+	 
+	/* Serialization information - start. */
+	private static final long serialVersionUID = 0x7903d78afec63b03L;
+	/* Serialization information - end. */
+
+	/*
+	 * -------------------------------------------------------------------
+	 * Constructors
+	 * -------------------------------------------------------------------
+	 */
+	 	
+	/**
+	 * Default constructor. 
+	 * <p>
+	 * All fields are initialized to null.</p>
+	 */	 		
+	public InvalidAttributeValueException() {
+		super();
+	}
+
+	/**
+	 * Constructs an <code>InvalidAttributeValueException</code> instance 
+     * using the supplied text of the message.
+	 * <p>
+	 * All fields are initialized to null.</p>
+	 * 
+	 * @param s				message about the problem
+	 */
+	public InvalidAttributeValueException(String s) {
+		super(s);
+	}
+
+}
+
+

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/directory/InvalidAttributeValueException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/directory/InvalidAttributesException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/directory/InvalidSearchControlsException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/directory/InvalidSearchFilterException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/directory/ModificationItem.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/directory/NoSuchAttributeException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/directory/SchemaViolationException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/directory/SearchControls.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/directory/SearchResult.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/event/EventContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/event/EventDirContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/event/NamespaceChangeListener.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/event/NamingEvent.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/event/NamingEvent.java?rev=437433&r1=437432&r2=437433&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/event/NamingEvent.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/event/NamingEvent.java Sun Aug 27 11:26:20 2006
@@ -1,282 +1,282 @@
-/* Copyright 2004 The Apache Software Foundation or its licensors, as applicable
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package javax.naming.event;
-
-import java.util.EventObject;
-import javax.naming.Binding;
-
-/**
- * An event from a directory or naming service, for passing to a listener.
- * <p>
- * The source of the event is always the <code>EventContext</code> that the 
- * listener registered with. Names in the <code>NamingEvent</code> object 
- * are all relative to this context.</p>
- * <p>
- * Note the discussion about threads and synchronization in the description for
- * this package.</p>
- * 
- * 
- */
-public class NamingEvent extends EventObject {
-
-    /*
-     * -----------------------------------------
-     * Constants
-     * -----------------------------------------
-     */
-
-    /**
-     * A <code>NamingEvent</code> type constant, indicating that an object was
-     * added.
-     */
-    public static final int OBJECT_ADDED = 0;
-
-    /**
-     * A <code>NamingEvent</code> type constant, indicating that an object was
-     * changed.
-     */
-    public static final int OBJECT_CHANGED = 3;
-
-    /**
-     * A <code>NamingEvent</code> type constant, indicating that an object was
-     * removed.
-     */
-    public static final int OBJECT_REMOVED = 1;
-
-    /**
-     * A <code>NamingEvent</code> type constant, indicating that an object was
-     * renamed.
-     */
-    public static final int OBJECT_RENAMED = 2;
-
-    /* 
-     * This constant is used during deserialization to check the J2SE version which
-     * created the serialized object.
-     */
-    private static final long serialVersionUID = 0x9d18b00289d22f45L; //J2SE 1.4.2
-
-    /*
-     * -------------------------------------------------------------------
-     * Instance variables
-     * -------------------------------------------------------------------
-     */
-
-    /**
-     * Some information about the event, whose format is specified by the 
-     * service provider.
-     * 
-     * @serial
-     */
-    protected Object changeInfo;
-
-    /**
-     * The binding after the event.
-     * 
-     * @serial
-     */
-    protected Binding newBinding;
-
-    /**
-     * The binding before the event.
-     * 
-     * @serial
-     */
-    protected Binding oldBinding;
-
-    /**
-     * The type of this event. Its value is one of the constant event types
-     * above.
-     * 
-     * @serial
-     */
-    protected int type;
-
-    // the context that generated this event
-    private transient EventContext eventContext;
-
-    /*
-     * -----------------------------------------
-     * Constructors
-     * -----------------------------------------
-     */
-
-    /**
-     * 
-     * Constructs an <code>NamingEvent</code> with all parameters. 
-     *
-     * @param eventContext	the context that generated this event. It is the
-     * 						originator of this event and cannot be null.
-     * @param type			the constant value that specifies the type of event
-     * @param newBinding    binding after the event. <code>newBinding</code> might 
-     * 						be null depending on the value of the <code>type</code>
-     * 						parameter as follows:
-     * 						<ul>
-     * 						<li>
-     * 						<code>OBJECT_ADDED</code> - <code>newBinding</code> cannot be null
-     * 						</li>
-     * 						<li>
-     * 						<code>OBJECT_CHANGED</code> - <code>newBinding</code> cannot be null
-     * 						</li>
-     * 						<li>
-     * 						<code>OBJECT_REMOVED</code> - <code>newBinding</code> can be null
-     * 						</li>
-     * 						<li>
-     * 						<code>OBJECT_RENAMED</code> - <code>newBinding</code> can be null
-     * 						</li>
-     * 						</ul>
-     * 						The names are relative to the <code>eventContext</code>
-     * @param oldBinding	the binding before the event. <code>oldBinding</code> might 
-     * 						be null depending on the value of the <code>type</code>
-     * 						parameter as follows:
-     * 						<ul>
-     * 						<li>
-     * 						<code>OBJECT_ADDED</code> - <code>oldBinding</code> 
-     * 						can be null
-     * 						</li>
-     * 						<li>
-     * 						<code>OBJECT_CHANGED</code> - <code>oldBinding</code> 
-     * 						cannot be null
-     * 						</li>
-     * 						<li>
-     * 						<code>OBJECT_REMOVED</code> - <code>oldBinding</code> 
-     * 						cannot be null
-     * 						</li>
-     * 						<li>
-     * 						<code>OBJECT_RENAMED</code> - <code>oldBinding</code> 
-     * 						can be null
-     * 						</li>
-     * 						</ul>
-     * 						The names are relative to the <code>eventContext</code>
-     * @param changeInfo	contain some information about the event and maybe 
-     * 						null, the format of which is specified by the 
-     * 						service provider.
-     */
-    public NamingEvent(
-        EventContext eventContext,
-        int type,
-        Binding newBinding,
-        Binding oldBinding,
-        Object changeInfo) {
-        super(eventContext);
-
-        this.type = type;
-        this.changeInfo = changeInfo;
-        this.newBinding = newBinding;
-        this.oldBinding = oldBinding;
-        this.eventContext = eventContext;
-
-    }
-
-    /*
-     * -----------------------------------------
-     * Methods
-     * -----------------------------------------
-     */
-
-    /**
-     * Calls a method to notify the listener of this event. 
-     * <p>
-     * For <code>OBJECT_ADDED</code>, <code>OBJECT_REMOVED</code> or 
-     * <code>OBJECT_RENAMED</code> type events this method calls the 
-     * corresponding method in the <code>NamespaceChangedListener</code> 
-     * interface. For <code>OBJECT_CHANGED</code> type events this method calls 
-     * <code>objectChanged()</code> in the <code>ObjectChangeListener</code> 
-     * interface.</p>
-     * 
-     * @param naminglistener	the listener of this event
-     */
-    public void dispatch(NamingListener naminglistener) {
-        switch (type) {
-            case OBJECT_ADDED :
-                 ((NamespaceChangeListener) naminglistener).objectAdded(this);
-                break;
-            case OBJECT_REMOVED :
-                 ((NamespaceChangeListener) naminglistener).objectRemoved(this);
-                break;
-            case OBJECT_RENAMED :
-                 ((NamespaceChangeListener) naminglistener).objectRenamed(this);
-                break;
-            case OBJECT_CHANGED :
-                 ((ObjectChangeListener) naminglistener).objectChanged(this);
-                break;
-        }
-    }
-
-    /**
-     * Gets the change information.
-     * 
-     * @return 				the change information object provided by the 
-     * 						service provider, which may be null.
-     */
-    public Object getChangeInfo() {
-        return changeInfo;
-    }
-
-    /**
-     * Gets the <code>EventContext</code> that generated this event.
-     * 
-     * @return				the <code>EventContext</code> that generated this event.
-     */
-    public EventContext getEventContext() {
-        return eventContext;
-    }
-
-    /**
-     * Gets the binding after this event.
-     * <p>
-     * If it exists and is inside the scope that was specified when the listener 
-     * was registered using <code>EventContext.addNamimgListener</code>. 
-     * Returns null otherwise. Therefore for an <code>OBJECT_RENAMED</code> 
-     * event, the return value will be non-null if the new name places the 
-     * binding within the scope for the listener.</p>
-     *
-     * @return				the binding after this event
-     */
-    public Binding getNewBinding() {
-        return newBinding;
-    }
-
-    /**
-     * Gets the binding before this event. 
-     * <p>
-     * If it existed and was inside the scope that was specified when the 
-     * listener was registered using <code>EventContext.addNamimgListener</code>. 
-     * Returns null otherwise. Therefore for an <code>OBJECT_RENAMED</code> 
-     * event, the return value will be non-null if the old name placed the 
-     * binding within the scope for the listener.</p>
-     *
-     * @return				the binding before this event
-     */
-    public Binding getOldBinding() {
-        return oldBinding;
-    }
-
-    /**
-     * Gets the type of the event. 
-     * <p>
-     * The return value is constrained to a choice from: 
-     * <code>OBJECT_ADDED</code>, <code>OBJECT_REMOVED</code>, 
-     * <code>OBJECT_RENAMED</code>, <code>OBJECT_CHANGED</code>.</p>
-     * 
-     * @return				the type of the event
-     */
-    public int getType() {
-        return type;
-    }
-}
-
-
+/* Copyright 2004 The Apache Software Foundation or its licensors, as applicable
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package javax.naming.event;
+
+import java.util.EventObject;
+import javax.naming.Binding;
+
+/**
+ * An event from a directory or naming service, for passing to a listener.
+ * <p>
+ * The source of the event is always the <code>EventContext</code> that the 
+ * listener registered with. Names in the <code>NamingEvent</code> object 
+ * are all relative to this context.</p>
+ * <p>
+ * Note the discussion about threads and synchronization in the description for
+ * this package.</p>
+ * 
+ * 
+ */
+public class NamingEvent extends EventObject {
+
+    /*
+     * -----------------------------------------
+     * Constants
+     * -----------------------------------------
+     */
+
+    /**
+     * A <code>NamingEvent</code> type constant, indicating that an object was
+     * added.
+     */
+    public static final int OBJECT_ADDED = 0;
+
+    /**
+     * A <code>NamingEvent</code> type constant, indicating that an object was
+     * changed.
+     */
+    public static final int OBJECT_CHANGED = 3;
+
+    /**
+     * A <code>NamingEvent</code> type constant, indicating that an object was
+     * removed.
+     */
+    public static final int OBJECT_REMOVED = 1;
+
+    /**
+     * A <code>NamingEvent</code> type constant, indicating that an object was
+     * renamed.
+     */
+    public static final int OBJECT_RENAMED = 2;
+
+    /* 
+     * This constant is used during deserialization to check the J2SE version which
+     * created the serialized object.
+     */
+    private static final long serialVersionUID = 0x9d18b00289d22f45L; //J2SE 1.4.2
+
+    /*
+     * -------------------------------------------------------------------
+     * Instance variables
+     * -------------------------------------------------------------------
+     */
+
+    /**
+     * Some information about the event, whose format is specified by the 
+     * service provider.
+     * 
+     * @serial
+     */
+    protected Object changeInfo;
+
+    /**
+     * The binding after the event.
+     * 
+     * @serial
+     */
+    protected Binding newBinding;
+
+    /**
+     * The binding before the event.
+     * 
+     * @serial
+     */
+    protected Binding oldBinding;
+
+    /**
+     * The type of this event. Its value is one of the constant event types
+     * above.
+     * 
+     * @serial
+     */
+    protected int type;
+
+    // the context that generated this event
+    private transient EventContext eventContext;
+
+    /*
+     * -----------------------------------------
+     * Constructors
+     * -----------------------------------------
+     */
+
+    /**
+     * 
+     * Constructs an <code>NamingEvent</code> with all parameters. 
+     *
+     * @param eventContext	the context that generated this event. It is the
+     * 						originator of this event and cannot be null.
+     * @param type			the constant value that specifies the type of event
+     * @param newBinding    binding after the event. <code>newBinding</code> might 
+     * 						be null depending on the value of the <code>type</code>
+     * 						parameter as follows:
+     * 						<ul>
+     * 						<li>
+     * 						<code>OBJECT_ADDED</code> - <code>newBinding</code> cannot be null
+     * 						</li>
+     * 						<li>
+     * 						<code>OBJECT_CHANGED</code> - <code>newBinding</code> cannot be null
+     * 						</li>
+     * 						<li>
+     * 						<code>OBJECT_REMOVED</code> - <code>newBinding</code> can be null
+     * 						</li>
+     * 						<li>
+     * 						<code>OBJECT_RENAMED</code> - <code>newBinding</code> can be null
+     * 						</li>
+     * 						</ul>
+     * 						The names are relative to the <code>eventContext</code>
+     * @param oldBinding	the binding before the event. <code>oldBinding</code> might 
+     * 						be null depending on the value of the <code>type</code>
+     * 						parameter as follows:
+     * 						<ul>
+     * 						<li>
+     * 						<code>OBJECT_ADDED</code> - <code>oldBinding</code> 
+     * 						can be null
+     * 						</li>
+     * 						<li>
+     * 						<code>OBJECT_CHANGED</code> - <code>oldBinding</code> 
+     * 						cannot be null
+     * 						</li>
+     * 						<li>
+     * 						<code>OBJECT_REMOVED</code> - <code>oldBinding</code> 
+     * 						cannot be null
+     * 						</li>
+     * 						<li>
+     * 						<code>OBJECT_RENAMED</code> - <code>oldBinding</code> 
+     * 						can be null
+     * 						</li>
+     * 						</ul>
+     * 						The names are relative to the <code>eventContext</code>
+     * @param changeInfo	contain some information about the event and maybe 
+     * 						null, the format of which is specified by the 
+     * 						service provider.
+     */
+    public NamingEvent(
+        EventContext eventContext,
+        int type,
+        Binding newBinding,
+        Binding oldBinding,
+        Object changeInfo) {
+        super(eventContext);
+
+        this.type = type;
+        this.changeInfo = changeInfo;
+        this.newBinding = newBinding;
+        this.oldBinding = oldBinding;
+        this.eventContext = eventContext;
+
+    }
+
+    /*
+     * -----------------------------------------
+     * Methods
+     * -----------------------------------------
+     */
+
+    /**
+     * Calls a method to notify the listener of this event. 
+     * <p>
+     * For <code>OBJECT_ADDED</code>, <code>OBJECT_REMOVED</code> or 
+     * <code>OBJECT_RENAMED</code> type events this method calls the 
+     * corresponding method in the <code>NamespaceChangedListener</code> 
+     * interface. For <code>OBJECT_CHANGED</code> type events this method calls 
+     * <code>objectChanged()</code> in the <code>ObjectChangeListener</code> 
+     * interface.</p>
+     * 
+     * @param naminglistener	the listener of this event
+     */
+    public void dispatch(NamingListener naminglistener) {
+        switch (type) {
+            case OBJECT_ADDED :
+                 ((NamespaceChangeListener) naminglistener).objectAdded(this);
+                break;
+            case OBJECT_REMOVED :
+                 ((NamespaceChangeListener) naminglistener).objectRemoved(this);
+                break;
+            case OBJECT_RENAMED :
+                 ((NamespaceChangeListener) naminglistener).objectRenamed(this);
+                break;
+            case OBJECT_CHANGED :
+                 ((ObjectChangeListener) naminglistener).objectChanged(this);
+                break;
+        }
+    }
+
+    /**
+     * Gets the change information.
+     * 
+     * @return 				the change information object provided by the 
+     * 						service provider, which may be null.
+     */
+    public Object getChangeInfo() {
+        return changeInfo;
+    }
+
+    /**
+     * Gets the <code>EventContext</code> that generated this event.
+     * 
+     * @return				the <code>EventContext</code> that generated this event.
+     */
+    public EventContext getEventContext() {
+        return eventContext;
+    }
+
+    /**
+     * Gets the binding after this event.
+     * <p>
+     * If it exists and is inside the scope that was specified when the listener 
+     * was registered using <code>EventContext.addNamimgListener</code>. 
+     * Returns null otherwise. Therefore for an <code>OBJECT_RENAMED</code> 
+     * event, the return value will be non-null if the new name places the 
+     * binding within the scope for the listener.</p>
+     *
+     * @return				the binding after this event
+     */
+    public Binding getNewBinding() {
+        return newBinding;
+    }
+
+    /**
+     * Gets the binding before this event. 
+     * <p>
+     * If it existed and was inside the scope that was specified when the 
+     * listener was registered using <code>EventContext.addNamimgListener</code>. 
+     * Returns null otherwise. Therefore for an <code>OBJECT_RENAMED</code> 
+     * event, the return value will be non-null if the old name placed the 
+     * binding within the scope for the listener.</p>
+     *
+     * @return				the binding before this event
+     */
+    public Binding getOldBinding() {
+        return oldBinding;
+    }
+
+    /**
+     * Gets the type of the event. 
+     * <p>
+     * The return value is constrained to a choice from: 
+     * <code>OBJECT_ADDED</code>, <code>OBJECT_REMOVED</code>, 
+     * <code>OBJECT_RENAMED</code>, <code>OBJECT_CHANGED</code>.</p>
+     * 
+     * @return				the type of the event
+     */
+    public int getType() {
+        return type;
+    }
+}
+
+

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/event/NamingEvent.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/event/NamingExceptionEvent.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/event/NamingListener.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/event/ObjectChangeListener.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/ldap/Control.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/ldap/ControlFactory.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/ldap/ControlFactory.java?rev=437433&r1=437432&r2=437433&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/ldap/ControlFactory.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/ldap/ControlFactory.java Sun Aug 27 11:26:20 2006
@@ -1,174 +1,174 @@
-/* Copyright 2004 The Apache Software Foundation or its licensors, as applicable
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package javax.naming.ldap;
-
-import java.util.Hashtable;
-import javax.naming.Context;
-import javax.naming.NamingException;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-import org.apache.harmony.jndi.internal.EnvironmentReader;
-
-/**
- * This abstract class is used for factories which create controls as used in 
- * LDAPv3.
- * These factories are used by service providers to obtain control instances 
- * when they receive a response control.
- *
- * @see Control
- * 
- */
-public abstract class ControlFactory {
-
-    /*
-     * -------------------------------------------------------------------
-     * Constructors
-     * -------------------------------------------------------------------
-     */
-
-    /**
-     * Constructs a <code>ControlFactory</code> instance with no parameters.
-     */
-    protected ControlFactory() {
-    	super();
-    }
-
-    /*
-     * -------------------------------------------------------------------
-     * Methods
-     * -------------------------------------------------------------------
-     */
-
-    /**
-     * Uses this control factory to create a particular type of <code>Control
-     * </code> based on the supplied control.
-     * It is likely that the supplied control contains data encoded in BER 
-     * format as received from an LDAP server. Returns <code>null</code> if the
-     * factory cannot create a <code>Control</code> else it returns the type of
-     * <code>Control</code> created by the factory.
-
-     * 
-     * @param c                 the supplied control
-     * @throws NamingException  If an error is encountered.
-     * @return the control
-     */
-    public abstract Control getControlInstance(Control c)
-        throws NamingException;
-
-    /**
-     * Creates a particular type of control based on the supplied control c.
-     * It is likely that the supplied control contains data encoded in BER 
-     * format as received from an LDAP server.
-     * <p>
-     * This method tries the factories in LdapContext.CONTROL_FACTORIES, 
-     * first from the supplied <code>Hashtable</code> then from the resource
-     * provider files of the supplied <code>Context</code>.</p>
-     * <p> 
-     * It returns the supplied control if no factories are loaded or a control
-     * cannot be created. Otherwise, a new <code>Control</code> instance is 
-     * returned.
-     * 
-     * @param c                 the supplied <code>Control</code> instance
-     * @param ctx               the supplied <code>Context</code> instance
-     * @param h                 the supplier JNDI environment properties
-     * @return                  the supplied control if no factories are loaded
-     *                          or a control cannot be created, otherwise a new 
-     *                          <code>Control</code> instance
-     * @throws NamingException  If an error is encountered.
-     */
-    public static Control getControlInstance(
-        Control c,
-        Context ctx,
-        Hashtable<?, ?> h)
-        throws NamingException {
-
-        // obtain control factories from hashtable and provider resource file
-        String fnames[] =
-            EnvironmentReader
-                .getFactoryNamesFromEnvironmentAndProviderResource(
-                h,
-                ctx,
-                LdapContext.CONTROL_FACTORIES);
-
-        // for each control factory
-        for (int i = 0; i < fnames.length; i++) {
-            // new factory instance by its class name
-            ControlFactory factory = null;
-            try {
-                factory =
-                    (ControlFactory) classForName(fnames[i]).newInstance();
-            } catch (Exception e) {
-                continue;
-            }
-            // try obtaining a Control using the factory
-            Control control = factory.getControlInstance(c);
-            // if a Control is obtained successfully, return it
-            if (null != control) {
-                return control;
-            }
-        }
-
-        // all factories failed, return the input argument c
-        return c;
-    }
-
-    /*
-     * Use the context class loader or the system class loader to load the
-     * specified class, in a privileged manner.
-     */
-    private static Class classForName(final String className)
-        throws ClassNotFoundException {
-
-        Class cls =
-            (Class) AccessController.doPrivileged(new PrivilegedAction() {
-            public Object run() {
-                // try thread context class loader first
-                try {
-                    return Class.forName(
-                        className,
-                        true,
-                        Thread.currentThread().getContextClassLoader());
-                } catch (ClassNotFoundException e) {
-                	// Ignored
-                }
-                // try system class loader second
-                try {
-                    return Class.forName(
-                        className,
-                        true,
-                        ClassLoader.getSystemClassLoader());
-                } catch (ClassNotFoundException e1) {
-                	// Ignored
-                }
-                // return null, if fail to load class
-                return null;
-            }
-        });
-
-        if (cls == null) {
-            throw new ClassNotFoundException(
-                "class " + className + " not found"); //$NON-NLS-1$ //$NON-NLS-2$
-        }
-
-        return cls;
-
-    }
-
-}
-
-
+/* Copyright 2004 The Apache Software Foundation or its licensors, as applicable
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package javax.naming.ldap;
+
+import java.util.Hashtable;
+import javax.naming.Context;
+import javax.naming.NamingException;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+import org.apache.harmony.jndi.internal.EnvironmentReader;
+
+/**
+ * This abstract class is used for factories which create controls as used in 
+ * LDAPv3.
+ * These factories are used by service providers to obtain control instances 
+ * when they receive a response control.
+ *
+ * @see Control
+ * 
+ */
+public abstract class ControlFactory {
+
+    /*
+     * -------------------------------------------------------------------
+     * Constructors
+     * -------------------------------------------------------------------
+     */
+
+    /**
+     * Constructs a <code>ControlFactory</code> instance with no parameters.
+     */
+    protected ControlFactory() {
+    	super();
+    }
+
+    /*
+     * -------------------------------------------------------------------
+     * Methods
+     * -------------------------------------------------------------------
+     */
+
+    /**
+     * Uses this control factory to create a particular type of <code>Control
+     * </code> based on the supplied control.
+     * It is likely that the supplied control contains data encoded in BER 
+     * format as received from an LDAP server. Returns <code>null</code> if the
+     * factory cannot create a <code>Control</code> else it returns the type of
+     * <code>Control</code> created by the factory.
+
+     * 
+     * @param c                 the supplied control
+     * @throws NamingException  If an error is encountered.
+     * @return the control
+     */
+    public abstract Control getControlInstance(Control c)
+        throws NamingException;
+
+    /**
+     * Creates a particular type of control based on the supplied control c.
+     * It is likely that the supplied control contains data encoded in BER 
+     * format as received from an LDAP server.
+     * <p>
+     * This method tries the factories in LdapContext.CONTROL_FACTORIES, 
+     * first from the supplied <code>Hashtable</code> then from the resource
+     * provider files of the supplied <code>Context</code>.</p>
+     * <p> 
+     * It returns the supplied control if no factories are loaded or a control
+     * cannot be created. Otherwise, a new <code>Control</code> instance is 
+     * returned.
+     * 
+     * @param c                 the supplied <code>Control</code> instance
+     * @param ctx               the supplied <code>Context</code> instance
+     * @param h                 the supplier JNDI environment properties
+     * @return                  the supplied control if no factories are loaded
+     *                          or a control cannot be created, otherwise a new 
+     *                          <code>Control</code> instance
+     * @throws NamingException  If an error is encountered.
+     */
+    public static Control getControlInstance(
+        Control c,
+        Context ctx,
+        Hashtable<?, ?> h)
+        throws NamingException {
+
+        // obtain control factories from hashtable and provider resource file
+        String fnames[] =
+            EnvironmentReader
+                .getFactoryNamesFromEnvironmentAndProviderResource(
+                h,
+                ctx,
+                LdapContext.CONTROL_FACTORIES);
+
+        // for each control factory
+        for (int i = 0; i < fnames.length; i++) {
+            // new factory instance by its class name
+            ControlFactory factory = null;
+            try {
+                factory =
+                    (ControlFactory) classForName(fnames[i]).newInstance();
+            } catch (Exception e) {
+                continue;
+            }
+            // try obtaining a Control using the factory
+            Control control = factory.getControlInstance(c);
+            // if a Control is obtained successfully, return it
+            if (null != control) {
+                return control;
+            }
+        }
+
+        // all factories failed, return the input argument c
+        return c;
+    }
+
+    /*
+     * Use the context class loader or the system class loader to load the
+     * specified class, in a privileged manner.
+     */
+    private static Class classForName(final String className)
+        throws ClassNotFoundException {
+
+        Class cls =
+            (Class) AccessController.doPrivileged(new PrivilegedAction() {
+            public Object run() {
+                // try thread context class loader first
+                try {
+                    return Class.forName(
+                        className,
+                        true,
+                        Thread.currentThread().getContextClassLoader());
+                } catch (ClassNotFoundException e) {
+                	// Ignored
+                }
+                // try system class loader second
+                try {
+                    return Class.forName(
+                        className,
+                        true,
+                        ClassLoader.getSystemClassLoader());
+                } catch (ClassNotFoundException e1) {
+                	// Ignored
+                }
+                // return null, if fail to load class
+                return null;
+            }
+        });
+
+        if (cls == null) {
+            throw new ClassNotFoundException(
+                "class " + className + " not found"); //$NON-NLS-1$ //$NON-NLS-2$
+        }
+
+        return cls;
+
+    }
+
+}
+
+

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/ldap/ControlFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/ldap/ExtendedRequest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/ldap/ExtendedResponse.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/ldap/HasControls.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/ldap/InitialLdapContext.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/ldap/InitialLdapContext.java?rev=437433&r1=437432&r2=437433&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/ldap/InitialLdapContext.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/ldap/InitialLdapContext.java Sun Aug 27 11:26:20 2006
@@ -1,167 +1,167 @@
-/* Copyright 2004 The Apache Software Foundation or its licensors, as applicable
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package javax.naming.ldap;
-
-import java.util.Hashtable;
-import javax.naming.directory.InitialDirContext;
-import javax.naming.NamingException;
-import javax.naming.NotContextException;
-
-/**
- * This is used as the starting context when the LDAPv3 extended functionality
- * provided by the <code>javax.naming.ldap</code> package is required.
- *
- * See <code>LdapContext</code> for a description of the Request and Response 
- * controls.
- * 
- * @see LdapContext
- * 
- */
-public class InitialLdapContext
-    extends InitialDirContext
-    implements LdapContext {
-
-    /*
-     * -------------------------------------------------------------------
-     * Constants
-     * -------------------------------------------------------------------
-     */
-
-    /*
-     * This is set to the environment property java.naming.ldap.version. 
-     */
-    private static final String LDAP_VERSION = "java.naming.ldap.version"; //$NON-NLS-1$
-
-    /*
-     * This is set to the environment property java.naming.ldap.control.connect.
-     */
-    private static final String CONNECT_CONTROL =
-        "java.naming.ldap.control.connect"; //$NON-NLS-1$
-
-    /*
-     * The version of this LDAP context implementaton. 
-     */
-    private static final String THIS_LDAP_VERSION = "3"; //$NON-NLS-1$
-
-    /*
-     * -------------------------------------------------------------------
-     * Constructors
-     * -------------------------------------------------------------------
-     */
-
-    /**
-     * Constructs an <code>InitialLdapContext</code> instance without using 
-     * any environment properties or connection controls.
-     * 
-     * @throws NamingException  If an error is encountered. 
-     */
-    public InitialLdapContext() throws NamingException {
-        this(null, null);
-    }
-
-    /**
-     * Constructs an <code>InitialLdapContext</code> instance using the supplied
-     * environment properties and connection controls.
-     * 
-     * @param h                 the environment properties which may be null
-     * @param cs                the connection controls which may be null
-     * @throws NamingException  If an error is encountered.
-     */
-    public InitialLdapContext(Hashtable<?, ?> h, Control[] cs)
-        throws NamingException {
-        super(true);
-
-        /* 
-         * Prepare the environment properties to be inherited by the 
-         * service provider.
-         */
-        Hashtable<Object,Object> newEnvironment = null;
-        if (null == h) {
-            newEnvironment = new Hashtable<Object,Object>();
-        } else {
-            newEnvironment = (Hashtable<Object,Object>) h.clone();
-        }
-
-        // Set the environment property java.naming.ldap.control.connect
-        if (null != cs) {
-            Control[] cloneOfCs = new Control[cs.length];
-            System.arraycopy(cs, 0, cloneOfCs, 0, cs.length);
-            newEnvironment.put(CONNECT_CONTROL, cloneOfCs);
-        }
-
-        // Set the enviroment property java.naming.ldap.version to be 3
-        newEnvironment.put(LDAP_VERSION, THIS_LDAP_VERSION);
-
-        // Initialize the initial context
-        super.init(newEnvironment);
-    }
-
-    /*
-     * -------------------------------------------------------------------
-     * Methods
-     * -------------------------------------------------------------------
-     */
-
-    /*
-     * Gets the default initial context and verify that it's an instance of
-     * LdapContext.
-     */
-    private LdapContext getDefaultInitLdapContext() throws NamingException {
-        if (!(super.defaultInitCtx instanceof LdapContext)) {
-            throw new NotContextException("Expected an LdapContext object."); //$NON-NLS-1$
-        }
-        return (LdapContext) super.defaultInitCtx;
-    }
-
-    /*
-     * -------------------------------------------------------------------
-     * Methods of Interface LdapContext
-     * -------------------------------------------------------------------
-     */
-
-    public ExtendedResponse extendedOperation(ExtendedRequest e)
-        throws NamingException {
-        return getDefaultInitLdapContext().extendedOperation(e);
-    }
-
-    public LdapContext newInstance(Control[] ac) throws NamingException {
-        return getDefaultInitLdapContext().newInstance(ac);
-    }
-
-    public void reconnect(Control[] ac) throws NamingException {
-        getDefaultInitLdapContext().reconnect(ac);
-    }
-
-    public Control[] getConnectControls() throws NamingException {
-        return getDefaultInitLdapContext().getConnectControls();
-    }
-
-    public void setRequestControls(Control[] ac) throws NamingException {
-        getDefaultInitLdapContext().setRequestControls(ac);
-    }
-
-    public Control[] getRequestControls() throws NamingException {
-        return getDefaultInitLdapContext().getRequestControls();
-    }
-
-    public Control[] getResponseControls() throws NamingException {
-        return getDefaultInitLdapContext().getResponseControls();
-    }
-
-}
-
-
+/* Copyright 2004 The Apache Software Foundation or its licensors, as applicable
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package javax.naming.ldap;
+
+import java.util.Hashtable;
+import javax.naming.directory.InitialDirContext;
+import javax.naming.NamingException;
+import javax.naming.NotContextException;
+
+/**
+ * This is used as the starting context when the LDAPv3 extended functionality
+ * provided by the <code>javax.naming.ldap</code> package is required.
+ *
+ * See <code>LdapContext</code> for a description of the Request and Response 
+ * controls.
+ * 
+ * @see LdapContext
+ * 
+ */
+public class InitialLdapContext
+    extends InitialDirContext
+    implements LdapContext {
+
+    /*
+     * -------------------------------------------------------------------
+     * Constants
+     * -------------------------------------------------------------------
+     */
+
+    /*
+     * This is set to the environment property java.naming.ldap.version. 
+     */
+    private static final String LDAP_VERSION = "java.naming.ldap.version"; //$NON-NLS-1$
+
+    /*
+     * This is set to the environment property java.naming.ldap.control.connect.
+     */
+    private static final String CONNECT_CONTROL =
+        "java.naming.ldap.control.connect"; //$NON-NLS-1$
+
+    /*
+     * The version of this LDAP context implementaton. 
+     */
+    private static final String THIS_LDAP_VERSION = "3"; //$NON-NLS-1$
+
+    /*
+     * -------------------------------------------------------------------
+     * Constructors
+     * -------------------------------------------------------------------
+     */
+
+    /**
+     * Constructs an <code>InitialLdapContext</code> instance without using 
+     * any environment properties or connection controls.
+     * 
+     * @throws NamingException  If an error is encountered. 
+     */
+    public InitialLdapContext() throws NamingException {
+        this(null, null);
+    }
+
+    /**
+     * Constructs an <code>InitialLdapContext</code> instance using the supplied
+     * environment properties and connection controls.
+     * 
+     * @param h                 the environment properties which may be null
+     * @param cs                the connection controls which may be null
+     * @throws NamingException  If an error is encountered.
+     */
+    public InitialLdapContext(Hashtable<?, ?> h, Control[] cs)
+        throws NamingException {
+        super(true);
+
+        /* 
+         * Prepare the environment properties to be inherited by the 
+         * service provider.
+         */
+        Hashtable<Object,Object> newEnvironment = null;
+        if (null == h) {
+            newEnvironment = new Hashtable<Object,Object>();
+        } else {
+            newEnvironment = (Hashtable<Object,Object>) h.clone();
+        }
+
+        // Set the environment property java.naming.ldap.control.connect
+        if (null != cs) {
+            Control[] cloneOfCs = new Control[cs.length];
+            System.arraycopy(cs, 0, cloneOfCs, 0, cs.length);
+            newEnvironment.put(CONNECT_CONTROL, cloneOfCs);
+        }
+
+        // Set the enviroment property java.naming.ldap.version to be 3
+        newEnvironment.put(LDAP_VERSION, THIS_LDAP_VERSION);
+
+        // Initialize the initial context
+        super.init(newEnvironment);
+    }
+
+    /*
+     * -------------------------------------------------------------------
+     * Methods
+     * -------------------------------------------------------------------
+     */
+
+    /*
+     * Gets the default initial context and verify that it's an instance of
+     * LdapContext.
+     */
+    private LdapContext getDefaultInitLdapContext() throws NamingException {
+        if (!(super.defaultInitCtx instanceof LdapContext)) {
+            throw new NotContextException("Expected an LdapContext object."); //$NON-NLS-1$
+        }
+        return (LdapContext) super.defaultInitCtx;
+    }
+
+    /*
+     * -------------------------------------------------------------------
+     * Methods of Interface LdapContext
+     * -------------------------------------------------------------------
+     */
+
+    public ExtendedResponse extendedOperation(ExtendedRequest e)
+        throws NamingException {
+        return getDefaultInitLdapContext().extendedOperation(e);
+    }
+
+    public LdapContext newInstance(Control[] ac) throws NamingException {
+        return getDefaultInitLdapContext().newInstance(ac);
+    }
+
+    public void reconnect(Control[] ac) throws NamingException {
+        getDefaultInitLdapContext().reconnect(ac);
+    }
+
+    public Control[] getConnectControls() throws NamingException {
+        return getDefaultInitLdapContext().getConnectControls();
+    }
+
+    public void setRequestControls(Control[] ac) throws NamingException {
+        getDefaultInitLdapContext().setRequestControls(ac);
+    }
+
+    public Control[] getRequestControls() throws NamingException {
+        return getDefaultInitLdapContext().getRequestControls();
+    }
+
+    public Control[] getResponseControls() throws NamingException {
+        return getDefaultInitLdapContext().getResponseControls();
+    }
+
+}
+
+

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/ldap/InitialLdapContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/ldap/LdapContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/ldap/LdapReferralException.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/ldap/LdapReferralException.java?rev=437433&r1=437432&r2=437433&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/ldap/LdapReferralException.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/ldap/LdapReferralException.java Sun Aug 27 11:26:20 2006
@@ -1,107 +1,107 @@
-/* Copyright 2004 The Apache Software Foundation or its licensors, as applicable
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package javax.naming.ldap;
-
-import java.util.Hashtable;
-
-import javax.naming.Context;
-import javax.naming.NamingException;
-import javax.naming.ReferralException;
-
-/**
- * <code>LdapReferralException</code> is an abstract exception which extends
- * <code>ReferralException</code> to handle LDAPv3 request controls.
- * 
- */
-public abstract class LdapReferralException extends ReferralException {
-
-    /*
-     * -------------------------------------------------------------------
-     * Constants
-     * -------------------------------------------------------------------
-     */
-
-    /* 
-     * This constant is used during deserialization to check the J2SE version which
-     * created the serialized object.
-     */
-    static final long serialVersionUID = -1668992791764950804L; // J2SE 1.4.2
-
-    /*
-     * -------------------------------------------------------------------
-     * Constructors
-     * -------------------------------------------------------------------
-     */
-
-    /**
-     * Default constructor.
-     */
-    protected LdapReferralException() {
-    	super();
-    }
-
-    /**
-     * Constructs an LdapReferralException instance using the supplied text of
-     * the message
-     * @param s				the supplied text of the message, which may be null
-     */
-    protected LdapReferralException(String s) {
-        super(s);
-    }
-
-    /*
-     * -------------------------------------------------------------------
-     * Methods
-     * -------------------------------------------------------------------
-     */
-
-    /**
-     * Gets referal context without environment properties.
-     * 
-     * @return 				referral context
-     * @throws NamingException
-     * 						If cannot get referral context correctly.
-     */
-    public abstract Context getReferralContext() throws NamingException;
-
-    /**
-     * Gets referal context with environment properties.
-     * 
-     * @param h				environment properties			
-     * @return 				referral context
-     * @throws NamingException
-     * 						If cannot get referral context correctly.
-     */
-    public abstract Context getReferralContext(Hashtable<?, ?> h)
-        throws NamingException;
-
-    /**
-     * Gets referal context with environment properties and an array of LDAPv3
-     * controls.
-     * 
-     * @param h				environment properties
-     * @param cs			array of LDAPv3 controls
-     * @return 				referral context
-     * @throws NamingException
-     * 						If cannot get referral context correctly.
-     */
-    public abstract Context getReferralContext(Hashtable<?, ?> h, Control[] cs)
-        throws NamingException;
-
-}
-
-
+/* Copyright 2004 The Apache Software Foundation or its licensors, as applicable
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package javax.naming.ldap;
+
+import java.util.Hashtable;
+
+import javax.naming.Context;
+import javax.naming.NamingException;
+import javax.naming.ReferralException;
+
+/**
+ * <code>LdapReferralException</code> is an abstract exception which extends
+ * <code>ReferralException</code> to handle LDAPv3 request controls.
+ * 
+ */
+public abstract class LdapReferralException extends ReferralException {
+
+    /*
+     * -------------------------------------------------------------------
+     * Constants
+     * -------------------------------------------------------------------
+     */
+
+    /* 
+     * This constant is used during deserialization to check the J2SE version which
+     * created the serialized object.
+     */
+    static final long serialVersionUID = -1668992791764950804L; // J2SE 1.4.2
+
+    /*
+     * -------------------------------------------------------------------
+     * Constructors
+     * -------------------------------------------------------------------
+     */
+
+    /**
+     * Default constructor.
+     */
+    protected LdapReferralException() {
+    	super();
+    }
+
+    /**
+     * Constructs an LdapReferralException instance using the supplied text of
+     * the message
+     * @param s				the supplied text of the message, which may be null
+     */
+    protected LdapReferralException(String s) {
+        super(s);
+    }
+
+    /*
+     * -------------------------------------------------------------------
+     * Methods
+     * -------------------------------------------------------------------
+     */
+
+    /**
+     * Gets referal context without environment properties.
+     * 
+     * @return 				referral context
+     * @throws NamingException
+     * 						If cannot get referral context correctly.
+     */
+    public abstract Context getReferralContext() throws NamingException;
+
+    /**
+     * Gets referal context with environment properties.
+     * 
+     * @param h				environment properties			
+     * @return 				referral context
+     * @throws NamingException
+     * 						If cannot get referral context correctly.
+     */
+    public abstract Context getReferralContext(Hashtable<?, ?> h)
+        throws NamingException;
+
+    /**
+     * Gets referal context with environment properties and an array of LDAPv3
+     * controls.
+     * 
+     * @param h				environment properties
+     * @param cs			array of LDAPv3 controls
+     * @return 				referral context
+     * @throws NamingException
+     * 						If cannot get referral context correctly.
+     */
+    public abstract Context getReferralContext(Hashtable<?, ?> h, Control[] cs)
+        throws NamingException;
+
+}
+
+

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/ldap/LdapReferralException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/ldap/UnsolicitedNotification.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/ldap/UnsolicitedNotificationEvent.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/ldap/UnsolicitedNotificationListener.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/spi/DirObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/spi/DirObjectFactory.java?rev=437433&r1=437432&r2=437433&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/spi/DirObjectFactory.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/spi/DirObjectFactory.java Sun Aug 27 11:26:20 2006
@@ -1,63 +1,63 @@
-/* Copyright 2004 The Apache Software Foundation or its licensors, as applicable
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package javax.naming.spi;
-
-import java.util.Hashtable;
-import javax.naming.Name;
-import javax.naming.Context;
-import javax.naming.directory.Attributes;
-
-/**
- * An <code>DirObjectFactory</code> creates objects of a specified type. 
- * <code>DirObjectFactory</code> is a specific version of 
- * <code>ObjectFactory</code> for <code>DirectoryManager</code>.
- * 
- * @see ObjectFactory
- * @see DirectoryManager
- */
-public interface DirObjectFactory extends ObjectFactory {
-
-    /*
-     * -------------------------------------------------------------------
-     * Methods
-     * -------------------------------------------------------------------
-     */
-
-    /**
-     * Similar to <code>ObjectFactory.getObjectInstance</code>, with an 
-     * additional <code>attributes</code> parameter.
-     * 
-     * @param o     an object
-     * @param n     a name
-     * @param c     a context
-     * @param envmt a context environment
-     * @param a     some attributes
-     * @return      the created object
-     * @throws Exception if an exception occurs
-     * @see ObjectFactory#getObjectInstance(Object, Name, Context, Hashtable)
-     */
-    Object getObjectInstance(
-        Object o,
-        Name n,
-        Context c,
-        Hashtable<?, ?> envmt,
-        Attributes a)
-        throws Exception;
-
-}
-
-
+/* Copyright 2004 The Apache Software Foundation or its licensors, as applicable
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package javax.naming.spi;
+
+import java.util.Hashtable;
+import javax.naming.Name;
+import javax.naming.Context;
+import javax.naming.directory.Attributes;
+
+/**
+ * An <code>DirObjectFactory</code> creates objects of a specified type. 
+ * <code>DirObjectFactory</code> is a specific version of 
+ * <code>ObjectFactory</code> for <code>DirectoryManager</code>.
+ * 
+ * @see ObjectFactory
+ * @see DirectoryManager
+ */
+public interface DirObjectFactory extends ObjectFactory {
+
+    /*
+     * -------------------------------------------------------------------
+     * Methods
+     * -------------------------------------------------------------------
+     */
+
+    /**
+     * Similar to <code>ObjectFactory.getObjectInstance</code>, with an 
+     * additional <code>attributes</code> parameter.
+     * 
+     * @param o     an object
+     * @param n     a name
+     * @param c     a context
+     * @param envmt a context environment
+     * @param a     some attributes
+     * @return      the created object
+     * @throws Exception if an exception occurs
+     * @see ObjectFactory#getObjectInstance(Object, Name, Context, Hashtable)
+     */
+    Object getObjectInstance(
+        Object o,
+        Name n,
+        Context c,
+        Hashtable<?, ?> envmt,
+        Attributes a)
+        throws Exception;
+
+}
+
+

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/spi/DirObjectFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/spi/DirStateFactory.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/spi/DirStateFactory.java?rev=437433&r1=437432&r2=437433&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/spi/DirStateFactory.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/spi/DirStateFactory.java Sun Aug 27 11:26:20 2006
@@ -1,134 +1,134 @@
-/* Copyright 2004 The Apache Software Foundation or its licensors, as applicable
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package javax.naming.spi;
-
-import java.util.Hashtable;
-import javax.naming.Name;
-import javax.naming.Context;
-import javax.naming.NamingException;
-import javax.naming.directory.Attributes;
-
-/**
- * The <code>DirStateFactory</code> interface describes a factory used to get 
- * the state of an object to be bound. <code>DirStateFactory</code> is a 
- * specific version of <code>StateFactory</code> for 
- * <code>DirectoryManager</code>.
- * 
- * @see StateFactory
- * @see DirectoryManager
- */
-public interface DirStateFactory extends StateFactory {
-
-    /*
-     * -------------------------------------------------------------------
-     * Methods
-     * -------------------------------------------------------------------
-     */
-
-    /**
-     * Similar to <code>StateFactory.getStateToBind</code> with an additional
-     * <code>attributes</code> parameter.
-     * 
-     * @param o     an object
-     * @param n     a name
-     * @param c     a context
-     * @param envmt a context environment
-     * @param a     some attributes
-     * @return      the state as a <code>Result</code> instance, containing
-     *              an object and associated attributes.
-     * @throws NamingException if an exception occurs
-     * @see StateFactory#getStateToBind(Object, Name, Context, Hashtable)
-     */
-    Result getStateToBind(
-        Object o,
-        Name n,
-        Context c,
-        Hashtable<?, ?> envmt,
-        Attributes a)
-        throws NamingException;
-
-    /*
-     * -------------------------------------------------------------------
-     * Inner classes
-     * -------------------------------------------------------------------
-     */
-
-    /**
-     * Used by the <code>DirectoryManager.getStateToBind</code> method as
-     * the returning value.
-     */
-    public static class Result {
-
-        /*
-         * -------------------------------------------------------------------
-         * Instance variables
-         * -------------------------------------------------------------------
-         */
-
-        // the Object returned by DirectoryManager.getStateToBind.
-        private Object obj;
-
-        // the Attributes returned by DirectoryManager.getStateToBind.
-        private Attributes attrs;
-
-        /*
-         * -------------------------------------------------------------------
-         * Constructors
-         * -------------------------------------------------------------------
-         */
-
-        /**
-         * Creates an instance of <code>DirStateFactory.Result</code>
-         * 
-         * @param o the object returned by 
-         *          <code>DirectoryManager.getStateToBind</code>. May be null.
-         * @param a the attributes returned by 
-         *          <code>DirectoryManager.getStateToBind</code>. May be null.
-         */
-        public Result(Object o, Attributes a) {
-            this.obj = o;
-            this.attrs = a;
-        }
-
-        /*
-         * -------------------------------------------------------------------
-         * Methods
-         * -------------------------------------------------------------------
-         */
-
-        /**
-         * Returns the object associated with this result.
-         * 
-         * @return the object associated with this result.
-         */
-        public Object getObject() {
-            return this.obj;
-        }
-
-        /**
-         * Returns the attributes associated with this result.
-         * 
-         * @return the attributes associated with this result.
-         */
-        public Attributes getAttributes() {
-            return this.attrs;
-        }
-    }
-
-}
-
-
+/* Copyright 2004 The Apache Software Foundation or its licensors, as applicable
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package javax.naming.spi;
+
+import java.util.Hashtable;
+import javax.naming.Name;
+import javax.naming.Context;
+import javax.naming.NamingException;
+import javax.naming.directory.Attributes;
+
+/**
+ * The <code>DirStateFactory</code> interface describes a factory used to get 
+ * the state of an object to be bound. <code>DirStateFactory</code> is a 
+ * specific version of <code>StateFactory</code> for 
+ * <code>DirectoryManager</code>.
+ * 
+ * @see StateFactory
+ * @see DirectoryManager
+ */
+public interface DirStateFactory extends StateFactory {
+
+    /*
+     * -------------------------------------------------------------------
+     * Methods
+     * -------------------------------------------------------------------
+     */
+
+    /**
+     * Similar to <code>StateFactory.getStateToBind</code> with an additional
+     * <code>attributes</code> parameter.
+     * 
+     * @param o     an object
+     * @param n     a name
+     * @param c     a context
+     * @param envmt a context environment
+     * @param a     some attributes
+     * @return      the state as a <code>Result</code> instance, containing
+     *              an object and associated attributes.
+     * @throws NamingException if an exception occurs
+     * @see StateFactory#getStateToBind(Object, Name, Context, Hashtable)
+     */
+    Result getStateToBind(
+        Object o,
+        Name n,
+        Context c,
+        Hashtable<?, ?> envmt,
+        Attributes a)
+        throws NamingException;
+
+    /*
+     * -------------------------------------------------------------------
+     * Inner classes
+     * -------------------------------------------------------------------
+     */
+
+    /**
+     * Used by the <code>DirectoryManager.getStateToBind</code> method as
+     * the returning value.
+     */
+    public static class Result {
+
+        /*
+         * -------------------------------------------------------------------
+         * Instance variables
+         * -------------------------------------------------------------------
+         */
+
+        // the Object returned by DirectoryManager.getStateToBind.
+        private Object obj;
+
+        // the Attributes returned by DirectoryManager.getStateToBind.
+        private Attributes attrs;
+
+        /*
+         * -------------------------------------------------------------------
+         * Constructors
+         * -------------------------------------------------------------------
+         */
+
+        /**
+         * Creates an instance of <code>DirStateFactory.Result</code>
+         * 
+         * @param o the object returned by 
+         *          <code>DirectoryManager.getStateToBind</code>. May be null.
+         * @param a the attributes returned by 
+         *          <code>DirectoryManager.getStateToBind</code>. May be null.
+         */
+        public Result(Object o, Attributes a) {
+            this.obj = o;
+            this.attrs = a;
+        }
+
+        /*
+         * -------------------------------------------------------------------
+         * Methods
+         * -------------------------------------------------------------------
+         */
+
+        /**
+         * Returns the object associated with this result.
+         * 
+         * @return the object associated with this result.
+         */
+        public Object getObject() {
+            return this.obj;
+        }
+
+        /**
+         * Returns the attributes associated with this result.
+         * 
+         * @return the attributes associated with this result.
+         */
+        public Attributes getAttributes() {
+            return this.attrs;
+        }
+    }
+
+}
+
+

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/spi/DirStateFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message