harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndbe...@apache.org
Subject svn commit: r437433 [14/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/org/apache/harmony/jndi/provider/rmi/rmiURLContext.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/rmi/rmiURLContext.java?rev=437433&r1=437432&r2=437433&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/rmi/rmiURLContext.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/rmi/rmiURLContext.java Sun Aug 27 11:26:20 2006
@@ -1,138 +1,138 @@
-/*
- * Copyright 2005-2006 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.
- */
-
-/**
- * @author  Vasily Zakharov
- * @version $Revision: 1.1.2.3 $
- */
-package org.apache.harmony.jndi.provider.rmi;
-
-import java.util.Hashtable;
-
-import javax.naming.CompositeName;
-import javax.naming.NamingException;
-
-import javax.naming.spi.ResolveResult;
-
-import org.apache.harmony.jndi.provider.GenericURLContext;
-
-import org.apache.harmony.jndi.provider.rmi.registry.RegistryContext;
-
-
-/**
- * RMI URL context implementation.
- *
- * @author  Vasily Zakharov
- * @version $Revision: 1.1.2.3 $
- */
-public class rmiURLContext extends GenericURLContext {
-
-    /**
-     * Creates instance of this context with empty environment.
-     */
-    public rmiURLContext() {
-        super(null);
-    }
-
-    /**
-     * Creates instance of this context with specified environment.
-     *
-     * @param   environment
-     *          Environment to copy.
-     */
-    public rmiURLContext(Hashtable environment) {
-        super(environment);
-    }
-
-    /**
-     * Determines the proper {@link RegistryContext} from the specified URL
-     * and returns the {@link ResolveResult} object with that context
-     * as resolved object and the rest of the URL as remaining name.
-     *
-     * @param   url
-     *          URL.
-     *
-     * @param   environment
-     *          Environment.
-     *
-     * @return  {@link ResolveResult} object with resolved context
-     *          as resolved object the rest of the URL as remaining name.
-     *
-     * @throws  NamingException
-     *          If some naming error occurs.
-     */
-    protected ResolveResult getRootURLContext(
-            String url, Hashtable environment) throws NamingException {
-        if (!url.startsWith(RegistryContext.RMI_URL_PREFIX)) {
-            throw new IllegalArgumentException(
-                    "Not an RMI URL, incorrect prefix: " + url);
-        }
-        int length = url.length();
-        int start = RegistryContext.RMI_URL_PREFIX.length();
-        String hostName = null;
-        int port = 0;
-
-        if ((start < length) && (url.charAt(start) == '/')) {
-            start++;
-
-            if ((start < length) && (url.charAt(start) == '/')) {
-                start++;
-
-                // end marks either first slash or end of URL.
-                int end = url.indexOf('/', start);
-                if (end < 0) {
-                    end = length;
-                }
-
-                // hostEnd marks either end of hostname or end of URL.
-                int hostEnd = url.indexOf(':', start);
-                if ((hostEnd < 0) || (hostEnd > end)) {
-                    hostEnd = end;
-                }
-
-                // Extracting host name.
-                if (start < hostEnd) {
-                    hostName = url.substring(start, hostEnd);
-                }
-
-                // Extracting port number.
-                int portStart = hostEnd + 1;
-                if (portStart < end) {
-                    try {
-                        port = Integer.parseInt(url.substring(portStart, end));
-                    } catch (NumberFormatException e) {
-                        throw (IllegalArgumentException)
-                                new IllegalArgumentException("Invalid port "
-                                    + "number in URL: " + url).initCause(e);
-                    }
-                }
-
-                // Point start to suffix string.
-                start = ((end < length) ? (end + 1) : length);
-            }
-        }
-
-        // Create remaining name.
-        CompositeName name = new CompositeName();
-        if (start < length) {
-            name.add(url.substring(start));
-        }
-
-        return new ResolveResult(
-                new RegistryContext(hostName, port, environment), name);
-    }
-}
+/*
+ * Copyright 2005-2006 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.
+ */
+
+/**
+ * @author  Vasily Zakharov
+ * @version $Revision: 1.1.2.3 $
+ */
+package org.apache.harmony.jndi.provider.rmi;
+
+import java.util.Hashtable;
+
+import javax.naming.CompositeName;
+import javax.naming.NamingException;
+
+import javax.naming.spi.ResolveResult;
+
+import org.apache.harmony.jndi.provider.GenericURLContext;
+
+import org.apache.harmony.jndi.provider.rmi.registry.RegistryContext;
+
+
+/**
+ * RMI URL context implementation.
+ *
+ * @author  Vasily Zakharov
+ * @version $Revision: 1.1.2.3 $
+ */
+public class rmiURLContext extends GenericURLContext {
+
+    /**
+     * Creates instance of this context with empty environment.
+     */
+    public rmiURLContext() {
+        super(null);
+    }
+
+    /**
+     * Creates instance of this context with specified environment.
+     *
+     * @param   environment
+     *          Environment to copy.
+     */
+    public rmiURLContext(Hashtable environment) {
+        super(environment);
+    }
+
+    /**
+     * Determines the proper {@link RegistryContext} from the specified URL
+     * and returns the {@link ResolveResult} object with that context
+     * as resolved object and the rest of the URL as remaining name.
+     *
+     * @param   url
+     *          URL.
+     *
+     * @param   environment
+     *          Environment.
+     *
+     * @return  {@link ResolveResult} object with resolved context
+     *          as resolved object the rest of the URL as remaining name.
+     *
+     * @throws  NamingException
+     *          If some naming error occurs.
+     */
+    protected ResolveResult getRootURLContext(
+            String url, Hashtable environment) throws NamingException {
+        if (!url.startsWith(RegistryContext.RMI_URL_PREFIX)) {
+            throw new IllegalArgumentException(
+                    "Not an RMI URL, incorrect prefix: " + url);
+        }
+        int length = url.length();
+        int start = RegistryContext.RMI_URL_PREFIX.length();
+        String hostName = null;
+        int port = 0;
+
+        if ((start < length) && (url.charAt(start) == '/')) {
+            start++;
+
+            if ((start < length) && (url.charAt(start) == '/')) {
+                start++;
+
+                // end marks either first slash or end of URL.
+                int end = url.indexOf('/', start);
+                if (end < 0) {
+                    end = length;
+                }
+
+                // hostEnd marks either end of hostname or end of URL.
+                int hostEnd = url.indexOf(':', start);
+                if ((hostEnd < 0) || (hostEnd > end)) {
+                    hostEnd = end;
+                }
+
+                // Extracting host name.
+                if (start < hostEnd) {
+                    hostName = url.substring(start, hostEnd);
+                }
+
+                // Extracting port number.
+                int portStart = hostEnd + 1;
+                if (portStart < end) {
+                    try {
+                        port = Integer.parseInt(url.substring(portStart, end));
+                    } catch (NumberFormatException e) {
+                        throw (IllegalArgumentException)
+                                new IllegalArgumentException("Invalid port "
+                                    + "number in URL: " + url).initCause(e);
+                    }
+                }
+
+                // Point start to suffix string.
+                start = ((end < length) ? (end + 1) : length);
+            }
+        }
+
+        // Create remaining name.
+        CompositeName name = new CompositeName();
+        if (start < length) {
+            name.add(url.substring(start));
+        }
+
+        return new ResolveResult(
+                new RegistryContext(hostName, port, environment), name);
+    }
+}

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/rmi/rmiURLContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/rmi/rmiURLContextFactory.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/rmi/rmiURLContextFactory.java?rev=437433&r1=437432&r2=437433&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/rmi/rmiURLContextFactory.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/rmi/rmiURLContextFactory.java Sun Aug 27 11:26:20 2006
@@ -1,57 +1,57 @@
-/*
- * Copyright 2005-2006 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.
- */
-
-/**
- * @author  Vasily Zakharov
- * @version $Revision: 1.1.2.2 $
- */
-package org.apache.harmony.jndi.provider.rmi;
-
-import java.util.Hashtable;
-
-import javax.naming.Context;
-import javax.naming.Name;
-
-import org.apache.harmony.jndi.provider.GenericURLContextFactory;
-
-
-/**
- * URL context factory for {@link rmiURLContext}.
- *
- * @author  Vasily Zakharov
- * @version $Revision: 1.1.2.2 $
- */
-public class rmiURLContextFactory extends GenericURLContextFactory {
-
-    /**
-     * Default constructor.
-     */
-    public rmiURLContextFactory() {}
-
-    /**
-     * Returns new {@link rmiURLContext}. Used by
-     * {@link GenericURLContextFactory#getObjectInstance(Object, Name, Context, Hashtable)}.
-     *
-     * @param   environment
-     *          Environment.
-     *
-     * @return  New {@link rmiURLContext}.
-     */
-    protected Context createURLContext(Hashtable environment) {
-        return new rmiURLContext(environment);
-    }
-}
+/*
+ * Copyright 2005-2006 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.
+ */
+
+/**
+ * @author  Vasily Zakharov
+ * @version $Revision: 1.1.2.2 $
+ */
+package org.apache.harmony.jndi.provider.rmi;
+
+import java.util.Hashtable;
+
+import javax.naming.Context;
+import javax.naming.Name;
+
+import org.apache.harmony.jndi.provider.GenericURLContextFactory;
+
+
+/**
+ * URL context factory for {@link rmiURLContext}.
+ *
+ * @author  Vasily Zakharov
+ * @version $Revision: 1.1.2.2 $
+ */
+public class rmiURLContextFactory extends GenericURLContextFactory {
+
+    /**
+     * Default constructor.
+     */
+    public rmiURLContextFactory() {}
+
+    /**
+     * Returns new {@link rmiURLContext}. Used by
+     * {@link GenericURLContextFactory#getObjectInstance(Object, Name, Context, Hashtable)}.
+     *
+     * @param   environment
+     *          Environment.
+     *
+     * @return  New {@link rmiURLContext}.
+     */
+    protected Context createURLContext(Hashtable environment) {
+        return new rmiURLContext(environment);
+    }
+}

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/rmi/rmiURLContextFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/com/sun/jndi/url/dir2/dir2URLContextFactory.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/com/sun/jndi/url/dir2/dir2URLContextFactory.java?rev=437433&r1=437432&r2=437433&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/com/sun/jndi/url/dir2/dir2URLContextFactory.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/com/sun/jndi/url/dir2/dir2URLContextFactory.java Sun Aug 27 11:26:20 2006
@@ -1,127 +1,127 @@
-/* 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 com.sun.jndi.url.dir2;
-
-import java.util.Hashtable;
-
-import javax.naming.Context;
-import javax.naming.Name;
-import javax.naming.directory.Attributes;
-import javax.naming.spi.DirObjectFactory;
-
-import org.apache.harmony.jndi.tests.javax.naming.spi.NamingManagerTest;
-import org.apache.harmony.jndi.tests.javax.naming.util.Log;
-
-public class dir2URLContextFactory implements DirObjectFactory {
-
-	Log log = new Log(dir2URLContextFactory.class);
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.naming.spi.ObjectFactory#getObjectInstance(java.lang.Object,
-	 *      javax.naming.Name, javax.naming.Context, java.util.Hashtable)
-	 */
-	public Object getObjectInstance(Object o, Name n, Context c, Hashtable h)
-			throws Exception {
-		log.setMethod("getObjectInstance");
-		log.log("wrong method call");
-		return getObjectInstance(o, n, c, h, null);
-
-	}
-
-	public static class MockObject {
-		private Attributes a;
-
-		private Object o;
-
-		private Name n;
-
-		private Context c;
-
-		private Hashtable envmt;
-
-		public MockObject(Object o, Name n, Context c, Hashtable envmt,
-				Attributes a) {
-			this.o = o;
-			this.n = n;
-			this.c = c;
-			this.envmt = envmt;
-			this.a = a;
-		}
-
-		public String toString() {
-			String s = "MockObject {";
-
-			s += "Object= " + o + "\n";
-			s += "Name= " + n + "\n";
-			s += "Context= " + c + "\n";
-			s += "Env= " + envmt;
-			s += "Attr= " + a;
-			s += "}";
-
-			return s;
-		}
-
-		public boolean equals(Object obj) {
-			if (obj instanceof MockObject) {
-				MockObject theOther = (MockObject) obj;
-				if (o != theOther.o) {
-					return false;
-				}
-
-				boolean nameEqual = (null == n ? null == theOther.n : n
-						.equals(theOther.n));
-				if (!nameEqual) {
-					return false;
-				}
-
-				if (c != theOther.c) {
-					return false;
-				}
-
-				boolean envmtEqual = (null == envmt ? null == theOther.envmt
-						: envmt.equals(theOther.envmt));
-				if (!envmtEqual) {
-					return false;
-				}
-
-				boolean attrEqual = (null == a ? null == theOther.a : a
-						.equals(theOther.a));
-
-				return true;
-			} else {
-				return false;
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.naming.spi.DirObjectFactory#getObjectInstance(java.lang.Object,
-	 *      javax.naming.Name, javax.naming.Context, java.util.Hashtable,
-	 *      javax.naming.directory.Attributes)
-	 */
-	public Object getObjectInstance(Object o, Name n, Context c, Hashtable h,
-			Attributes a) throws Exception {
-		NamingManagerTest.issueIndicatedExceptions(h);
-		if (NamingManagerTest.returnNullIndicated(h)) {
-			return null;
-		}
-
-		return new MockObject(o, n, c, h, a);
-	}
-}
+/* 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 com.sun.jndi.url.dir2;
+
+import java.util.Hashtable;
+
+import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.directory.Attributes;
+import javax.naming.spi.DirObjectFactory;
+
+import org.apache.harmony.jndi.tests.javax.naming.spi.NamingManagerTest;
+import org.apache.harmony.jndi.tests.javax.naming.util.Log;
+
+public class dir2URLContextFactory implements DirObjectFactory {
+
+	Log log = new Log(dir2URLContextFactory.class);
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see javax.naming.spi.ObjectFactory#getObjectInstance(java.lang.Object,
+	 *      javax.naming.Name, javax.naming.Context, java.util.Hashtable)
+	 */
+	public Object getObjectInstance(Object o, Name n, Context c, Hashtable h)
+			throws Exception {
+		log.setMethod("getObjectInstance");
+		log.log("wrong method call");
+		return getObjectInstance(o, n, c, h, null);
+
+	}
+
+	public static class MockObject {
+		private Attributes a;
+
+		private Object o;
+
+		private Name n;
+
+		private Context c;
+
+		private Hashtable envmt;
+
+		public MockObject(Object o, Name n, Context c, Hashtable envmt,
+				Attributes a) {
+			this.o = o;
+			this.n = n;
+			this.c = c;
+			this.envmt = envmt;
+			this.a = a;
+		}
+
+		public String toString() {
+			String s = "MockObject {";
+
+			s += "Object= " + o + "\n";
+			s += "Name= " + n + "\n";
+			s += "Context= " + c + "\n";
+			s += "Env= " + envmt;
+			s += "Attr= " + a;
+			s += "}";
+
+			return s;
+		}
+
+		public boolean equals(Object obj) {
+			if (obj instanceof MockObject) {
+				MockObject theOther = (MockObject) obj;
+				if (o != theOther.o) {
+					return false;
+				}
+
+				boolean nameEqual = (null == n ? null == theOther.n : n
+						.equals(theOther.n));
+				if (!nameEqual) {
+					return false;
+				}
+
+				if (c != theOther.c) {
+					return false;
+				}
+
+				boolean envmtEqual = (null == envmt ? null == theOther.envmt
+						: envmt.equals(theOther.envmt));
+				if (!envmtEqual) {
+					return false;
+				}
+
+				boolean attrEqual = (null == a ? null == theOther.a : a
+						.equals(theOther.a));
+
+				return true;
+			} else {
+				return false;
+			}
+		}
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see javax.naming.spi.DirObjectFactory#getObjectInstance(java.lang.Object,
+	 *      javax.naming.Name, javax.naming.Context, java.util.Hashtable,
+	 *      javax.naming.directory.Attributes)
+	 */
+	public Object getObjectInstance(Object o, Name n, Context c, Hashtable h,
+			Attributes a) throws Exception {
+		NamingManagerTest.issueIndicatedExceptions(h);
+		if (NamingManagerTest.returnNullIndicated(h)) {
+			return null;
+		}
+
+		return new MockObject(o, n, c, h, a);
+	}
+}

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/com/sun/jndi/url/dir2/dir2URLContextFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/com/sun/jndi/url/nntp/nntpURLContextFactory.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/com/sun/jndi/url/nntp/nntpURLContextFactory.java?rev=437433&r1=437432&r2=437433&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/com/sun/jndi/url/nntp/nntpURLContextFactory.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/com/sun/jndi/url/nntp/nntpURLContextFactory.java Sun Aug 27 11:26:20 2006
@@ -1,103 +1,103 @@
-/* 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 com.sun.jndi.url.nntp;
-
-import java.util.Hashtable;
-
-import javax.naming.Context;
-import javax.naming.Name;
-import javax.naming.spi.ObjectFactory;
-
-import org.apache.harmony.jndi.tests.javax.naming.spi.NamingManagerTest;
-
-public class nntpURLContextFactory implements ObjectFactory {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.naming.spi.ObjectFactory#getObjectInstance(java.lang.Object,
-	 *      javax.naming.Name, javax.naming.Context, java.util.Hashtable)
-	 */
-	public Object getObjectInstance(Object o, Name n, Context c, Hashtable h)
-			throws Exception {
-
-		NamingManagerTest.issueIndicatedExceptions(h);
-		if (NamingManagerTest.returnNullIndicated(h)) {
-			return null;
-		}
-
-		return new MockObject(o, n, c, h);
-	}
-
-	public static class MockObject {
-		private Object o;
-
-		private Name n;
-
-		private Context c;
-
-		private Hashtable envmt;
-
-		public MockObject(Object o, Name n, Context c, Hashtable envmt) {
-			this.o = o;
-			this.n = n;
-			this.c = c;
-			this.envmt = envmt;
-		}
-
-		public String toString() {
-			String s = "MockObject {";
-
-			s += "Object= " + o + "\n";
-			s += "Name= " + n + "\n";
-			s += "Context= " + c + "\n";
-			s += "Env= " + envmt;
-
-			s += "}";
-
-			return s;
-		}
-
-		public boolean equals(Object obj) {
-			if (obj instanceof MockObject) {
-				MockObject theOther = (MockObject) obj;
-				if (o != theOther.o) {
-					return false;
-				}
-
-				boolean nameEqual = (null == n ? null == theOther.n : n
-						.equals(theOther.n));
-				if (!nameEqual) {
-					return false;
-				}
-
-				if (c != theOther.c) {
-					return false;
-				}
-
-				boolean envmtEqual = (null == envmt ? null == theOther.envmt
-						: envmt.equals(theOther.envmt));
-				if (!envmtEqual) {
-					return false;
-				}
-
-				return true;
-			} else {
-				return false;
-			}
-		}
-	}
-}
+/* 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 com.sun.jndi.url.nntp;
+
+import java.util.Hashtable;
+
+import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.spi.ObjectFactory;
+
+import org.apache.harmony.jndi.tests.javax.naming.spi.NamingManagerTest;
+
+public class nntpURLContextFactory implements ObjectFactory {
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see javax.naming.spi.ObjectFactory#getObjectInstance(java.lang.Object,
+	 *      javax.naming.Name, javax.naming.Context, java.util.Hashtable)
+	 */
+	public Object getObjectInstance(Object o, Name n, Context c, Hashtable h)
+			throws Exception {
+
+		NamingManagerTest.issueIndicatedExceptions(h);
+		if (NamingManagerTest.returnNullIndicated(h)) {
+			return null;
+		}
+
+		return new MockObject(o, n, c, h);
+	}
+
+	public static class MockObject {
+		private Object o;
+
+		private Name n;
+
+		private Context c;
+
+		private Hashtable envmt;
+
+		public MockObject(Object o, Name n, Context c, Hashtable envmt) {
+			this.o = o;
+			this.n = n;
+			this.c = c;
+			this.envmt = envmt;
+		}
+
+		public String toString() {
+			String s = "MockObject {";
+
+			s += "Object= " + o + "\n";
+			s += "Name= " + n + "\n";
+			s += "Context= " + c + "\n";
+			s += "Env= " + envmt;
+
+			s += "}";
+
+			return s;
+		}
+
+		public boolean equals(Object obj) {
+			if (obj instanceof MockObject) {
+				MockObject theOther = (MockObject) obj;
+				if (o != theOther.o) {
+					return false;
+				}
+
+				boolean nameEqual = (null == n ? null == theOther.n : n
+						.equals(theOther.n));
+				if (!nameEqual) {
+					return false;
+				}
+
+				if (c != theOther.c) {
+					return false;
+				}
+
+				boolean envmtEqual = (null == envmt ? null == theOther.envmt
+						: envmt.equals(theOther.envmt));
+				if (!envmtEqual) {
+					return false;
+				}
+
+				return true;
+			} else {
+				return false;
+			}
+		}
+	}
+}

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/com/sun/jndi/url/nntp/nntpURLContextFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/dazzle/jndi/testing/spi/DazzleContext.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/dazzle/jndi/testing/spi/DazzleContext.java?rev=437433&r1=437432&r2=437433&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/dazzle/jndi/testing/spi/DazzleContext.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/dazzle/jndi/testing/spi/DazzleContext.java Sun Aug 27 11:26:20 2006
@@ -1,268 +1,268 @@
-/* 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 dazzle.jndi.testing.spi;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import javax.naming.Binding;
-import javax.naming.CompositeName;
-import javax.naming.Context;
-import javax.naming.InvalidNameException;
-import javax.naming.Name;
-import javax.naming.NameAlreadyBoundException;
-import javax.naming.NameClassPair;
-import javax.naming.NameNotFoundException;
-import javax.naming.NameParser;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-import javax.naming.NotContextException;
-import javax.naming.OperationNotSupportedException;
-
-public class DazzleContext implements Context {
-
-	class BindingsEnum extends NamesEnum {
-
-		BindingsEnum(Enumeration keysEnum) {
-			super(keysEnum);
-		}
-
-		public Object nextElement() {
-			String key = (String) super.keysEnum.nextElement();
-			return new Binding(key, namespace.get(key));
-		}
-	}
-
-	class NamesEnum implements NamingEnumeration {
-
-		Enumeration keysEnum;
-
-		NamesEnum(Enumeration keysEnum) {
-			this.keysEnum = keysEnum;
-		}
-
-		public void close() throws NamingException {
-		}
-
-		public boolean hasMore() throws NamingException {
-			return hasMoreElements();
-		}
-
-		public boolean hasMoreElements() {
-			return keysEnum.hasMoreElements();
-		}
-
-		public Object next() throws NamingException {
-			return nextElement();
-		}
-
-		public Object nextElement() {
-			String key = (String) keysEnum.nextElement();
-			return new NameClassPair(key, namespace.get(key).getClass()
-					.getName());
-		}
-	}
-
-	private static NameParser nameParser = new DazzleParser();
-
-	Hashtable environment;
-
-	Hashtable namespace;
-
-	DazzleContext(Hashtable environment) {
-		this.environment = new Hashtable();
-		namespace = new Hashtable();
-		this.environment = (Hashtable) environment.clone();
-	}
-
-	public Object addToEnvironment(String propertyName, Object propertyValue)
-			throws NamingException {
-		return environment.put(propertyName, propertyValue);
-	}
-
-	public void bind(Name name, Object target) throws NamingException {
-		bind(name.toString(), target);
-	}
-
-	public void bind(String strName, Object target) throws NamingException {
-		if (strName.length() == 0) {
-			throw new InvalidNameException("Name cannot be empty!");
-		}
-		if (namespace.get(strName) != null) {
-			throw new NameAlreadyBoundException();
-		} else {
-			namespace.put(strName, target);
-			return;
-		}
-	}
-
-	public void close() throws NamingException {
-		environment = namespace = null;
-	}
-
-	public Name composeName(Name name, Name prefix) throws NamingException {
-		Name composite = (Name) prefix.clone();
-		composite.addAll(name);
-		return composite;
-	}
-
-	public String composeName(String strName, String strPrefix)
-			throws NamingException {
-		return composeName(((Name) (new CompositeName(strName))),
-				((Name) (new CompositeName(strPrefix)))).toString();
-	}
-
-	public Context createSubcontext(Name name) throws NamingException {
-		return createSubcontext(name.toString());
-	}
-
-	public Context createSubcontext(String arg0) throws NamingException {
-		throw new OperationNotSupportedException();
-	}
-
-	public void destroySubcontext(Name name) throws NamingException {
-		destroySubcontext(name.toString());
-	}
-
-	public void destroySubcontext(String strName) throws NamingException {
-		throw new OperationNotSupportedException();
-	}
-
-	public Hashtable getEnvironment() throws NamingException {
-		return (Hashtable) environment.clone();
-	}
-
-	public String getNameInNamespace() throws NamingException {
-		return "";
-	}
-
-	public NameParser getNameParser(Name name) throws NamingException {
-		return getNameParser(name.toString());
-	}
-
-	public NameParser getNameParser(String arg0) throws NamingException {
-		return nameParser;
-	}
-
-	public NamingEnumeration list(Name name) throws NamingException {
-		return list(name.toString());
-	}
-
-	public NamingEnumeration list(String strName) throws NamingException {
-		if (strName.length() == 0) {
-			return new NamesEnum(namespace.keys());
-		}
-		Object target = namespace.get(strName);
-		if (target instanceof Context) {
-			return ((Context) target).list("");
-		} else {
-			throw new NotContextException();
-		}
-	}
-
-	public NamingEnumeration listBindings(Name name) throws NamingException {
-		return listBindings(name.toString());
-	}
-
-	public NamingEnumeration listBindings(String strName)
-			throws NamingException {
-		if (strName.length() == 0) {
-			return new BindingsEnum(namespace.keys());
-		}
-		Object target = namespace.get(strName);
-		if (target instanceof Context) {
-			return ((Context) target).listBindings("");
-		} else {
-			throw new NotContextException();
-		}
-	}
-
-	public Object lookup(Name name) throws NamingException {
-		return lookup(name.toString());
-	}
-
-	public Object lookup(String strName) throws NamingException {
-		if (strName.length() == 0) {
-			return new DazzleContext(environment);
-		}
-		Object result = namespace.get(strName);
-		if (result == null) {
-			throw new NameNotFoundException();
-		} else {
-			return result;
-		}
-	}
-
-	public Object lookupLink(Name name) throws NamingException {
-		return lookupLink(name.toString());
-	}
-
-	public Object lookupLink(String strName) throws NamingException {
-		return lookup(strName);
-	}
-
-	public void rebind(Name name, Object target) throws NamingException {
-		rebind(name.toString(), target);
-	}
-
-	public void rebind(String strName, Object target) throws NamingException {
-		if (strName.length() == 0) {
-			throw new InvalidNameException("Name cannot be empty!");
-		} else {
-			namespace.put(strName, target);
-			return;
-		}
-	}
-
-	public Object removeFromEnvironment(String propertyName)
-			throws NamingException {
-		return environment.remove(propertyName);
-	}
-
-	public void rename(Name fromName, Name toName) throws NamingException {
-		rename(fromName.toString(), toName.toString());
-	}
-
-	public void rename(String fromStrName, String toStrName)
-			throws NamingException {
-		if (fromStrName.length() == 0 || toStrName.length() == 0) {
-			throw new InvalidNameException("Name cannot be empty!");
-		}
-		if (namespace.containsKey(toStrName)) {
-			throw new NameAlreadyBoundException();
-		}
-		Object target = namespace.remove(fromStrName);
-		if (target == null) {
-			throw new NameNotFoundException();
-		} else {
-			namespace.put(toStrName, target);
-			return;
-		}
-	}
-
-	public void unbind(Name name) throws NamingException {
-		unbind(name.toString());
-	}
-
-	public void unbind(String strName) throws NamingException {
-		if (strName.length() == 0) {
-			throw new InvalidNameException("Name cannot be empty!");
-		} else {
-			namespace.remove(strName);
-			return;
-		}
-	}
-}
+/* 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 dazzle.jndi.testing.spi;
+
+import java.util.Enumeration;
+import java.util.Hashtable;
+
+import javax.naming.Binding;
+import javax.naming.CompositeName;
+import javax.naming.Context;
+import javax.naming.InvalidNameException;
+import javax.naming.Name;
+import javax.naming.NameAlreadyBoundException;
+import javax.naming.NameClassPair;
+import javax.naming.NameNotFoundException;
+import javax.naming.NameParser;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.NotContextException;
+import javax.naming.OperationNotSupportedException;
+
+public class DazzleContext implements Context {
+
+	class BindingsEnum extends NamesEnum {
+
+		BindingsEnum(Enumeration keysEnum) {
+			super(keysEnum);
+		}
+
+		public Object nextElement() {
+			String key = (String) super.keysEnum.nextElement();
+			return new Binding(key, namespace.get(key));
+		}
+	}
+
+	class NamesEnum implements NamingEnumeration {
+
+		Enumeration keysEnum;
+
+		NamesEnum(Enumeration keysEnum) {
+			this.keysEnum = keysEnum;
+		}
+
+		public void close() throws NamingException {
+		}
+
+		public boolean hasMore() throws NamingException {
+			return hasMoreElements();
+		}
+
+		public boolean hasMoreElements() {
+			return keysEnum.hasMoreElements();
+		}
+
+		public Object next() throws NamingException {
+			return nextElement();
+		}
+
+		public Object nextElement() {
+			String key = (String) keysEnum.nextElement();
+			return new NameClassPair(key, namespace.get(key).getClass()
+					.getName());
+		}
+	}
+
+	private static NameParser nameParser = new DazzleParser();
+
+	Hashtable environment;
+
+	Hashtable namespace;
+
+	DazzleContext(Hashtable environment) {
+		this.environment = new Hashtable();
+		namespace = new Hashtable();
+		this.environment = (Hashtable) environment.clone();
+	}
+
+	public Object addToEnvironment(String propertyName, Object propertyValue)
+			throws NamingException {
+		return environment.put(propertyName, propertyValue);
+	}
+
+	public void bind(Name name, Object target) throws NamingException {
+		bind(name.toString(), target);
+	}
+
+	public void bind(String strName, Object target) throws NamingException {
+		if (strName.length() == 0) {
+			throw new InvalidNameException("Name cannot be empty!");
+		}
+		if (namespace.get(strName) != null) {
+			throw new NameAlreadyBoundException();
+		} else {
+			namespace.put(strName, target);
+			return;
+		}
+	}
+
+	public void close() throws NamingException {
+		environment = namespace = null;
+	}
+
+	public Name composeName(Name name, Name prefix) throws NamingException {
+		Name composite = (Name) prefix.clone();
+		composite.addAll(name);
+		return composite;
+	}
+
+	public String composeName(String strName, String strPrefix)
+			throws NamingException {
+		return composeName(((Name) (new CompositeName(strName))),
+				((Name) (new CompositeName(strPrefix)))).toString();
+	}
+
+	public Context createSubcontext(Name name) throws NamingException {
+		return createSubcontext(name.toString());
+	}
+
+	public Context createSubcontext(String arg0) throws NamingException {
+		throw new OperationNotSupportedException();
+	}
+
+	public void destroySubcontext(Name name) throws NamingException {
+		destroySubcontext(name.toString());
+	}
+
+	public void destroySubcontext(String strName) throws NamingException {
+		throw new OperationNotSupportedException();
+	}
+
+	public Hashtable getEnvironment() throws NamingException {
+		return (Hashtable) environment.clone();
+	}
+
+	public String getNameInNamespace() throws NamingException {
+		return "";
+	}
+
+	public NameParser getNameParser(Name name) throws NamingException {
+		return getNameParser(name.toString());
+	}
+
+	public NameParser getNameParser(String arg0) throws NamingException {
+		return nameParser;
+	}
+
+	public NamingEnumeration list(Name name) throws NamingException {
+		return list(name.toString());
+	}
+
+	public NamingEnumeration list(String strName) throws NamingException {
+		if (strName.length() == 0) {
+			return new NamesEnum(namespace.keys());
+		}
+		Object target = namespace.get(strName);
+		if (target instanceof Context) {
+			return ((Context) target).list("");
+		} else {
+			throw new NotContextException();
+		}
+	}
+
+	public NamingEnumeration listBindings(Name name) throws NamingException {
+		return listBindings(name.toString());
+	}
+
+	public NamingEnumeration listBindings(String strName)
+			throws NamingException {
+		if (strName.length() == 0) {
+			return new BindingsEnum(namespace.keys());
+		}
+		Object target = namespace.get(strName);
+		if (target instanceof Context) {
+			return ((Context) target).listBindings("");
+		} else {
+			throw new NotContextException();
+		}
+	}
+
+	public Object lookup(Name name) throws NamingException {
+		return lookup(name.toString());
+	}
+
+	public Object lookup(String strName) throws NamingException {
+		if (strName.length() == 0) {
+			return new DazzleContext(environment);
+		}
+		Object result = namespace.get(strName);
+		if (result == null) {
+			throw new NameNotFoundException();
+		} else {
+			return result;
+		}
+	}
+
+	public Object lookupLink(Name name) throws NamingException {
+		return lookupLink(name.toString());
+	}
+
+	public Object lookupLink(String strName) throws NamingException {
+		return lookup(strName);
+	}
+
+	public void rebind(Name name, Object target) throws NamingException {
+		rebind(name.toString(), target);
+	}
+
+	public void rebind(String strName, Object target) throws NamingException {
+		if (strName.length() == 0) {
+			throw new InvalidNameException("Name cannot be empty!");
+		} else {
+			namespace.put(strName, target);
+			return;
+		}
+	}
+
+	public Object removeFromEnvironment(String propertyName)
+			throws NamingException {
+		return environment.remove(propertyName);
+	}
+
+	public void rename(Name fromName, Name toName) throws NamingException {
+		rename(fromName.toString(), toName.toString());
+	}
+
+	public void rename(String fromStrName, String toStrName)
+			throws NamingException {
+		if (fromStrName.length() == 0 || toStrName.length() == 0) {
+			throw new InvalidNameException("Name cannot be empty!");
+		}
+		if (namespace.containsKey(toStrName)) {
+			throw new NameAlreadyBoundException();
+		}
+		Object target = namespace.remove(fromStrName);
+		if (target == null) {
+			throw new NameNotFoundException();
+		} else {
+			namespace.put(toStrName, target);
+			return;
+		}
+	}
+
+	public void unbind(Name name) throws NamingException {
+		unbind(name.toString());
+	}
+
+	public void unbind(String strName) throws NamingException {
+		if (strName.length() == 0) {
+			throw new InvalidNameException("Name cannot be empty!");
+		} else {
+			namespace.remove(strName);
+			return;
+		}
+	}
+}

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/dazzle/jndi/testing/spi/DazzleContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/dazzle/jndi/testing/spi/DazzleContextFactory.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/dazzle/jndi/testing/spi/DazzleContextFactory.java?rev=437433&r1=437432&r2=437433&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/dazzle/jndi/testing/spi/DazzleContextFactory.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/dazzle/jndi/testing/spi/DazzleContextFactory.java Sun Aug 27 11:26:20 2006
@@ -1,34 +1,34 @@
-/* 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 dazzle.jndi.testing.spi;
-
-import java.util.Hashtable;
-
-import javax.naming.Context;
-import javax.naming.NamingException;
-import javax.naming.spi.InitialContextFactory;
-
-public class DazzleContextFactory implements InitialContextFactory {
-
-	public DazzleContextFactory() {
-		super();
-	}
-
-	public Context getInitialContext(Hashtable environment)
-			throws NamingException {
-		return new DazzleContext(environment);
-	}
-}
+/* 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 dazzle.jndi.testing.spi;
+
+import java.util.Hashtable;
+
+import javax.naming.Context;
+import javax.naming.NamingException;
+import javax.naming.spi.InitialContextFactory;
+
+public class DazzleContextFactory implements InitialContextFactory {
+
+	public DazzleContextFactory() {
+		super();
+	}
+
+	public Context getInitialContext(Hashtable environment)
+			throws NamingException {
+		return new DazzleContext(environment);
+	}
+}

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/dazzle/jndi/testing/spi/DazzleContextFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/dazzle/jndi/testing/spi/DazzleParser.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/dazzle/jndi/testing/spi/DazzleParser.java?rev=437433&r1=437432&r2=437433&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/dazzle/jndi/testing/spi/DazzleParser.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/dazzle/jndi/testing/spi/DazzleParser.java Sun Aug 27 11:26:20 2006
@@ -1,42 +1,42 @@
-/* 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 dazzle.jndi.testing.spi;
-
-import java.util.Properties;
-
-import javax.naming.CompoundName;
-import javax.naming.Name;
-import javax.naming.NameParser;
-import javax.naming.NamingException;
-
-class DazzleParser implements NameParser {
-
-	static Properties syntax;
-
-	static {
-		syntax = new Properties();
-		syntax.put("jndi.syntax.direction", "flat");
-		syntax.put("jndi.syntax.ignorecase", "false");
-	}
-
-	DazzleParser() {
-		super();
-	}
-
-	public Name parse(String strName) throws NamingException {
-		return new CompoundName(strName, syntax);
-	}
-}
+/* 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 dazzle.jndi.testing.spi;
+
+import java.util.Properties;
+
+import javax.naming.CompoundName;
+import javax.naming.Name;
+import javax.naming.NameParser;
+import javax.naming.NamingException;
+
+class DazzleParser implements NameParser {
+
+	static Properties syntax;
+
+	static {
+		syntax = new Properties();
+		syntax.put("jndi.syntax.direction", "flat");
+		syntax.put("jndi.syntax.ignorecase", "false");
+	}
+
+	DazzleParser() {
+		super();
+	}
+
+	public Name parse(String strName) throws NamingException {
+		return new CompoundName(strName, syntax);
+	}
+}

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/dazzle/jndi/testing/spi/DazzleParser.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/dazzle/jndi/testing/spi/jndi.properties
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/dazzle/jndi/testing/spi/jndi.properties?rev=437433&r1=437432&r2=437433&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/dazzle/jndi/testing/spi/jndi.properties (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/dazzle/jndi/testing/spi/jndi.properties Sun Aug 27 11:26:20 2006
@@ -1,13 +1,13 @@
-# 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
+# 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.

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/dazzle/jndi/testing/spi/jndi.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/jndiproperties/app1.properties
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/jndiproperties/app1.properties?rev=437433&r1=437432&r2=437433&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/jndiproperties/app1.properties (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/jndiproperties/app1.properties Sun Aug 27 11:26:20 2006
@@ -1,41 +1,41 @@
-# 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.
-#app1: classes/test
-
-# type==F
-
-java.naming.factory.initial=org.apache.harmony.jndi.tests.javax.naming.spi.mock.MockContextFactory
-java.naming.provider.url=java.naming.provider.url.app1
-#java.naming.applet=
-java.naming.authoritative=java.naming.authoritative.app1
-java.naming.batchsize=java.naming.batchsize.app1
-java.naming.dns.url=java.naming.dns.url.app1
-java.naming.language=java.naming.language.app1
-java.naming.referral=java.naming.referral.app1
-java.naming.security.authentication=java.naming.security.authentication.app1
-java.naming.security.credentials=java.naming.security.credentials.app1
-java.naming.security.principal=java.naming.security.principal.app1
-java.naming.security.protocol=java.naming.security.protocol.app1
-
-# type==C
-java.naming.factory.control=java.naming.factory.control.app1
-java.naming.factory.object=java.naming.factory.object.app1
-java.naming.factory.state=java.naming.factory.state.app1
-java.naming.factory.url.pkgs=java.naming.factory.url.pkgs.app1
-
-#other
-dazzle.jndi.testing.spi.app1=dazzle.jndi.testing.spi.app1.app1
-
-#junk
-app1.type=classes/test
+# 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.
+#app1: classes/test
+
+# type==F
+
+java.naming.factory.initial=org.apache.harmony.jndi.tests.javax.naming.spi.mock.MockContextFactory
+java.naming.provider.url=java.naming.provider.url.app1
+#java.naming.applet=
+java.naming.authoritative=java.naming.authoritative.app1
+java.naming.batchsize=java.naming.batchsize.app1
+java.naming.dns.url=java.naming.dns.url.app1
+java.naming.language=java.naming.language.app1
+java.naming.referral=java.naming.referral.app1
+java.naming.security.authentication=java.naming.security.authentication.app1
+java.naming.security.credentials=java.naming.security.credentials.app1
+java.naming.security.principal=java.naming.security.principal.app1
+java.naming.security.protocol=java.naming.security.protocol.app1
+
+# type==C
+java.naming.factory.control=java.naming.factory.control.app1
+java.naming.factory.object=java.naming.factory.object.app1
+java.naming.factory.state=java.naming.factory.state.app1
+java.naming.factory.url.pkgs=java.naming.factory.url.pkgs.app1
+
+#other
+dazzle.jndi.testing.spi.app1=dazzle.jndi.testing.spi.app1.app1
+
+#junk
+app1.type=classes/test

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/jndiproperties/app1.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/jndiproperties/app2.properties
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/jndiproperties/app2.properties?rev=437433&r1=437432&r2=437433&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/jndiproperties/app2.properties (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/jndiproperties/app2.properties Sun Aug 27 11:26:20 2006
@@ -1,40 +1,40 @@
-# 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.
-#app2: ext-classes
-
-# type==F
-java.naming.factory.initial=org.apache.harmony.jndi.tests.javax.naming.spi.mock.MockContextFactory
-java.naming.provider.url=java.naming.provider.url.app2
-#java.naming.applet=
-java.naming.authoritative=java.naming.authoritative.app2
-java.naming.batchsize=java.naming.batchsize.app2
-java.naming.dns.url=java.naming.dns.url.app2
-java.naming.language=java.naming.language.app2
-java.naming.referral=java.naming.referral.app2
-java.naming.security.authentication=java.naming.security.authentication.app2
-java.naming.security.credentials=java.naming.security.credentials.app2
-java.naming.security.principal=java.naming.security.principal.app2
-java.naming.security.protocol=java.naming.security.protocol.app2
-
-# type==C
-java.naming.factory.control=java.naming.factory.control.app2
-java.naming.factory.object=java.naming.factory.object.app2
-java.naming.factory.state=java.naming.factory.state.app2
-java.naming.factory.url.pkgs=java.naming.factory.url.pkgs.app2
-
-#other
-dazzle.jndi.testing.spi.app2=dazzle.jndi.testing.spi.app2.app2
-
-#junk
-app2.type=ext-classes
+# 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.
+#app2: ext-classes
+
+# type==F
+java.naming.factory.initial=org.apache.harmony.jndi.tests.javax.naming.spi.mock.MockContextFactory
+java.naming.provider.url=java.naming.provider.url.app2
+#java.naming.applet=
+java.naming.authoritative=java.naming.authoritative.app2
+java.naming.batchsize=java.naming.batchsize.app2
+java.naming.dns.url=java.naming.dns.url.app2
+java.naming.language=java.naming.language.app2
+java.naming.referral=java.naming.referral.app2
+java.naming.security.authentication=java.naming.security.authentication.app2
+java.naming.security.credentials=java.naming.security.credentials.app2
+java.naming.security.principal=java.naming.security.principal.app2
+java.naming.security.protocol=java.naming.security.protocol.app2
+
+# type==C
+java.naming.factory.control=java.naming.factory.control.app2
+java.naming.factory.object=java.naming.factory.object.app2
+java.naming.factory.state=java.naming.factory.state.app2
+java.naming.factory.url.pkgs=java.naming.factory.url.pkgs.app2
+
+#other
+dazzle.jndi.testing.spi.app2=dazzle.jndi.testing.spi.app2.app2
+
+#junk
+app2.type=ext-classes

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/jndiproperties/app2.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/jndiproperties/app3.properties
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/jndiproperties/app3.properties?rev=437433&r1=437432&r2=437433&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/jndiproperties/app3.properties (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/jndiproperties/app3.properties Sun Aug 27 11:26:20 2006
@@ -1,40 +1,40 @@
-# 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.
-#app1: /temp/cls1
-
-# type==F
-java.naming.factory.initial=org.apache.harmony.jndi.tests.javax.naming.spi.mock.MockContextFactory
-java.naming.provider.url=java.naming.provider.url.app3
-#java.naming.applet=
-java.naming.authoritative=java.naming.authoritative.app3
-java.naming.batchsize=java.naming.batchsize.app3
-java.naming.dns.url=java.naming.dns.url.app3
-java.naming.language=java.naming.language.app3
-java.naming.referral=java.naming.referral.app3
-java.naming.security.authentication=java.naming.security.authentication.app3
-java.naming.security.credentials=java.naming.security.credentials.app3
-java.naming.security.principal=java.naming.security.principal.app3
-java.naming.security.protocol=java.naming.security.protocol.app3
-
-# type==C
-java.naming.factory.control=java.naming.factory.control.app3
-java.naming.factory.object=java.naming.factory.object.app3
-java.naming.factory.state=java.naming.factory.state.app3
-java.naming.factory.url.pkgs=java.naming.factory.url.pkgs.app3
-
-#other
-dazzle.jndi.testing.spi.app3=dazzle.jndi.testing.spi.app3.app3
-
-#junk
-app3.type=/temp/cls1
+# 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.
+#app1: /temp/cls1
+
+# type==F
+java.naming.factory.initial=org.apache.harmony.jndi.tests.javax.naming.spi.mock.MockContextFactory
+java.naming.provider.url=java.naming.provider.url.app3
+#java.naming.applet=
+java.naming.authoritative=java.naming.authoritative.app3
+java.naming.batchsize=java.naming.batchsize.app3
+java.naming.dns.url=java.naming.dns.url.app3
+java.naming.language=java.naming.language.app3
+java.naming.referral=java.naming.referral.app3
+java.naming.security.authentication=java.naming.security.authentication.app3
+java.naming.security.credentials=java.naming.security.credentials.app3
+java.naming.security.principal=java.naming.security.principal.app3
+java.naming.security.protocol=java.naming.security.protocol.app3
+
+# type==C
+java.naming.factory.control=java.naming.factory.control.app3
+java.naming.factory.object=java.naming.factory.object.app3
+java.naming.factory.state=java.naming.factory.state.app3
+java.naming.factory.url.pkgs=java.naming.factory.url.pkgs.app3
+
+#other
+dazzle.jndi.testing.spi.app3=dazzle.jndi.testing.spi.app3.app3
+
+#junk
+app3.type=/temp/cls1

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/jndiproperties/app3.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/jndiproperties/lib.properties
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/jndiproperties/lib.properties?rev=437433&r1=437432&r2=437433&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/jndiproperties/lib.properties (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/jndiproperties/lib.properties Sun Aug 27 11:26:20 2006
@@ -1,40 +1,40 @@
-# 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.
-#app1: java.home/lib
-
-# type==F
-java.naming.factory.initial=org.apache.harmony.jndi.tests.javax.naming.spi.mock.MockContextFactory
-java.naming.provider.url=java.naming.provider.url.lib
-#java.naming.applet=
-java.naming.authoritative=java.naming.authoritative.lib
-java.naming.batchsize=java.naming.batchsize.lib
-java.naming.dns.url=java.naming.dns.url.lib
-java.naming.language=java.naming.language.lib
-java.naming.referral=java.naming.referral.lib
-java.naming.security.authentication=java.naming.security.authentication.lib
-java.naming.security.credentials=java.naming.security.credentials.lib
-java.naming.security.principal=java.naming.security.principal.lib
-java.naming.security.protocol=java.naming.security.protocol.lib
-
-# type==C
-java.naming.factory.control=java.naming.factory.control.lib
-java.naming.factory.object=java.naming.factory.object.lib
-java.naming.factory.state=java.naming.factory.state.lib
-java.naming.factory.url.pkgs=java.naming.factory.url.pkgs.lib
-
-#other
-dazzle.jndi.testing.spi.lib=dazzle.jndi.testing.spi.lib.lib
-
-#junk
-lib.type=java.home.lib
+# 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.
+#app1: java.home/lib
+
+# type==F
+java.naming.factory.initial=org.apache.harmony.jndi.tests.javax.naming.spi.mock.MockContextFactory
+java.naming.provider.url=java.naming.provider.url.lib
+#java.naming.applet=
+java.naming.authoritative=java.naming.authoritative.lib
+java.naming.batchsize=java.naming.batchsize.lib
+java.naming.dns.url=java.naming.dns.url.lib
+java.naming.language=java.naming.language.lib
+java.naming.referral=java.naming.referral.lib
+java.naming.security.authentication=java.naming.security.authentication.lib
+java.naming.security.credentials=java.naming.security.credentials.lib
+java.naming.security.principal=java.naming.security.principal.lib
+java.naming.security.protocol=java.naming.security.protocol.lib
+
+# type==C
+java.naming.factory.control=java.naming.factory.control.lib
+java.naming.factory.object=java.naming.factory.object.lib
+java.naming.factory.state=java.naming.factory.state.lib
+java.naming.factory.url.pkgs=java.naming.factory.url.pkgs.lib
+
+#other
+dazzle.jndi.testing.spi.lib=dazzle.jndi.testing.spi.lib.lib
+
+#junk
+lib.type=java.home.lib

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/jndiproperties/lib.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/jndiproperties/spi1.properties
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/jndiproperties/spi1.properties?rev=437433&r1=437432&r2=437433&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/jndiproperties/spi1.properties (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/jndiproperties/spi1.properties Sun Aug 27 11:26:20 2006
@@ -1,40 +1,40 @@
-# 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.
-#app1: classes/test/dazzle/jndi/testing/spi/jndiprovider.properties
-
-# type==F
-java.naming.factory.initial=org.apache.harmony.jndi.tests.javax.naming.spi.mock.MockFiveContextFactory
-java.naming.provider.url=java.naming.provider.url.spi1
-#java.naming.applet=
-java.naming.authoritative=java.naming.authoritative.spi1
-java.naming.batchsize=java.naming.batchsize.spi1
-java.naming.dns.url=java.naming.dns.url.spi1
-java.naming.language=java.naming.language.spi1
-java.naming.referral=java.naming.referral.spi1
-java.naming.security.authentication=java.naming.security.authentication.spi1
-java.naming.security.credentials=java.naming.security.credentials.spi1
-java.naming.security.principal=java.naming.security.principal.spi1
-java.naming.security.protocol=java.naming.security.protocol.spi1
-
-# type==C
-java.naming.factory.control=org.apache.harmony.jndi.tests.javax.naming.ldap.MockControlFactory$ControlFactorySPI1
-java.naming.factory.object=java.naming.factory.object.spi1
-java.naming.factory.state=java.naming.factory.state.spi1
-java.naming.factory.url.pkgs=java.naming.factory.url.pkgs.spi1
-
-#other
-dazzle.jndi.testing.spi.spi1=dazzle.jndi.testing.spi.spi1.spi1
-
-#junk
-spi1.type=spi1.type.spi1
+# 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.
+#app1: classes/test/dazzle/jndi/testing/spi/jndiprovider.properties
+
+# type==F
+java.naming.factory.initial=org.apache.harmony.jndi.tests.javax.naming.spi.mock.MockFiveContextFactory
+java.naming.provider.url=java.naming.provider.url.spi1
+#java.naming.applet=
+java.naming.authoritative=java.naming.authoritative.spi1
+java.naming.batchsize=java.naming.batchsize.spi1
+java.naming.dns.url=java.naming.dns.url.spi1
+java.naming.language=java.naming.language.spi1
+java.naming.referral=java.naming.referral.spi1
+java.naming.security.authentication=java.naming.security.authentication.spi1
+java.naming.security.credentials=java.naming.security.credentials.spi1
+java.naming.security.principal=java.naming.security.principal.spi1
+java.naming.security.protocol=java.naming.security.protocol.spi1
+
+# type==C
+java.naming.factory.control=org.apache.harmony.jndi.tests.javax.naming.ldap.MockControlFactory$ControlFactorySPI1
+java.naming.factory.object=java.naming.factory.object.spi1
+java.naming.factory.state=java.naming.factory.state.spi1
+java.naming.factory.url.pkgs=java.naming.factory.url.pkgs.spi1
+
+#other
+dazzle.jndi.testing.spi.spi1=dazzle.jndi.testing.spi.spi1.spi1
+
+#junk
+spi1.type=spi1.type.spi1

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/jndiproperties/spi1.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/jndiproperties/spi2.properties
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/jndiproperties/spi2.properties?rev=437433&r1=437432&r2=437433&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/jndiproperties/spi2.properties (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/jndiproperties/spi2.properties Sun Aug 27 11:26:20 2006
@@ -1,40 +1,40 @@
-# 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.
-#app1: ext-classes/dazzle/jndi/testing/spi/jndiprovider.properties
-
-# type==F
-java.naming.factory.initial=org.apache.harmony.jndi.tests.javax.naming.spi.mock.MockSixContextFactory
-java.naming.provider.url=java.naming.provider.url.spi2
-#java.naming.applet=
-java.naming.authoritative=java.naming.authoritative.spi2
-java.naming.batchsize=java.naming.batchsize.spi2
-java.naming.dns.url=java.naming.dns.url.spi2
-java.naming.language=java.naming.language.spi2
-java.naming.referral=java.naming.referral.spi2
-java.naming.security.authentication=java.naming.security.authentication.spi2
-java.naming.security.credentials=java.naming.security.credentials.spi2
-java.naming.security.principal=java.naming.security.principal.spi2
-java.naming.security.protocol=java.naming.security.protocol.spi2
-
-# type==C
-java.naming.factory.control=org.apache.harmony.jndi.tests.javax.naming.ldap.MockControlFactory$ControlFactorySPI2
-java.naming.factory.object=java.naming.factory.object.spi2
-java.naming.factory.state=java.naming.factory.state.spi2
-java.naming.factory.url.pkgs=java.naming.factory.url.pkgs.spi2
-
-#other
-dazzle.jndi.testing.spi.spi2=dazzle.jndi.testing.spi.spi2.spi2
-
-#junk
+# 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.
+#app1: ext-classes/dazzle/jndi/testing/spi/jndiprovider.properties
+
+# type==F
+java.naming.factory.initial=org.apache.harmony.jndi.tests.javax.naming.spi.mock.MockSixContextFactory
+java.naming.provider.url=java.naming.provider.url.spi2
+#java.naming.applet=
+java.naming.authoritative=java.naming.authoritative.spi2
+java.naming.batchsize=java.naming.batchsize.spi2
+java.naming.dns.url=java.naming.dns.url.spi2
+java.naming.language=java.naming.language.spi2
+java.naming.referral=java.naming.referral.spi2
+java.naming.security.authentication=java.naming.security.authentication.spi2
+java.naming.security.credentials=java.naming.security.credentials.spi2
+java.naming.security.principal=java.naming.security.principal.spi2
+java.naming.security.protocol=java.naming.security.protocol.spi2
+
+# type==C
+java.naming.factory.control=org.apache.harmony.jndi.tests.javax.naming.ldap.MockControlFactory$ControlFactorySPI2
+java.naming.factory.object=java.naming.factory.object.spi2
+java.naming.factory.state=java.naming.factory.state.spi2
+java.naming.factory.url.pkgs=java.naming.factory.url.pkgs.spi2
+
+#other
+dazzle.jndi.testing.spi.spi2=dazzle.jndi.testing.spi.spi2.spi2
+
+#junk
 spi2.type=spi2.type.spi2

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/jndiproperties/spi2.properties
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message