[kaffe] CVS kaffe (dalibor): Resynced javax/naming/ with GNU Classpath
Kaffe CVS
cvs-commits at kaffe.org
Mon Apr 19 09:48:04 PDT 2004
PatchSet 4665
Date: 2004/04/19 14:16:01
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Resynced javax/naming/ with GNU Classpath
2004-04-19 Dalibor Topic <robilad at kaffe.org>
* libraries/javalib/javax/naming/NamingException.java:
Resynced with GNU Classpath.
2004-04-18 Michael Koch <konqueror at gmx.de>
*javax/naming/NamingException.java:
Fixed HTML tags in javadocs.
* libraries/javalib/javax/naming/directory/SearchControls.java:
Resynced with GNU Classpath.
2004-04-02 Tom Tromey <tromey at redhat.com>
* javax/naming/directory/SearchControls.java (SearchControls):
Removed redundant extends.
* libraries/javalib/javax/naming/directory/BasicAttribute.java,
libraries/javalib/javax/naming/directory/BasicAttributes.java,
libraries/javalib/javax/naming/directory/InitialDirContext.java,
libraries/javalib/javax/naming/event/NamingEvent.java:
Reverted back to GNU Classpath's versions since the differences were
just due to whitespace.
Members:
ChangeLog:1.2241->1.2242
libraries/javalib/javax/naming/NamingException.java:1.2->1.3
libraries/javalib/javax/naming/directory/BasicAttribute.java:1.3->1.4
libraries/javalib/javax/naming/directory/BasicAttributes.java:1.3->1.4
libraries/javalib/javax/naming/directory/InitialDirContext.java:1.3->1.4
libraries/javalib/javax/naming/directory/SearchControls.java:1.1->1.2
libraries/javalib/javax/naming/event/NamingEvent.java:1.3->1.4
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2241 kaffe/ChangeLog:1.2242
--- kaffe/ChangeLog:1.2241 Mon Apr 19 13:44:06 2004
+++ kaffe/ChangeLog Mon Apr 19 14:16:01 2004
@@ -1,5 +1,30 @@
2004-04-19 Dalibor Topic <robilad at kaffe.org>
+ * libraries/javalib/javax/naming/NamingException.java:
+ Resynced with GNU Classpath.
+
+ 2004-04-18 Michael Koch <konqueror at gmx.de>
+
+ *javax/naming/NamingException.java:
+ Fixed HTML tags in javadocs.
+
+ * libraries/javalib/javax/naming/directory/SearchControls.java:
+ Resynced with GNU Classpath.
+
+ 2004-04-02 Tom Tromey <tromey at redhat.com>
+
+ * javax/naming/directory/SearchControls.java (SearchControls):
+ Removed redundant `extends'.
+
+ * libraries/javalib/javax/naming/directory/BasicAttribute.java,
+ libraries/javalib/javax/naming/directory/BasicAttributes.java,
+ libraries/javalib/javax/naming/directory/InitialDirContext.java,
+ libraries/javalib/javax/naming/event/NamingEvent.java:
+ Reverted back to GNU Classpath's versions since the differences were
+ just due to whitespace.
+
+2004-04-19 Dalibor Topic <robilad at kaffe.org>
+
* libraries/javalib/javax/naming/ldap/ControlFactory.java,
libraries/javalib/javax/naming/ldap/ExtendedRequest.java,
libraries/javalib/javax/naming/ldap/InitialLdapContext.java,
Index: kaffe/libraries/javalib/javax/naming/NamingException.java
diff -u kaffe/libraries/javalib/javax/naming/NamingException.java:1.2 kaffe/libraries/javalib/javax/naming/NamingException.java:1.3
--- kaffe/libraries/javalib/javax/naming/NamingException.java:1.2 Sun Aug 10 18:47:56 2003
+++ kaffe/libraries/javalib/javax/naming/NamingException.java Mon Apr 19 14:16:03 2004
@@ -93,7 +93,7 @@
/**
* Creates a new NamingException without a message. Does not set any of the
* <code>rootException</code>, <code>resolvedName</code>,
- * <code>resolvedObj</code> or <code>remainingObject,<code> fields.
+ * <code>resolvedObj</code> or <code>remainingObject</code> fields.
* These fields can be set later.
*/
public NamingException ()
@@ -104,7 +104,7 @@
/**
* Creates a new NamingException with a detailed message. Does not set
* the <code>rootException</code>, <code>resolvedName</code>,
- * <code>resolvedObj</code> or <code>remainingObject,<code> fields.
+ * <code>resolvedObj</code> or <code>remainingObject,</code> fields.
* These fields can be set later.
*/
public NamingException (String msg)
Index: kaffe/libraries/javalib/javax/naming/directory/BasicAttribute.java
diff -u kaffe/libraries/javalib/javax/naming/directory/BasicAttribute.java:1.3 kaffe/libraries/javalib/javax/naming/directory/BasicAttribute.java:1.4
--- kaffe/libraries/javalib/javax/naming/directory/BasicAttribute.java:1.3 Mon Mar 22 11:25:15 2004
+++ kaffe/libraries/javalib/javax/naming/directory/BasicAttribute.java Mon Apr 19 14:16:04 2004
@@ -40,7 +40,6 @@
import java.util.NoSuchElementException;
import java.util.Vector;
-
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
import javax.naming.OperationNotSupportedException;
Index: kaffe/libraries/javalib/javax/naming/directory/BasicAttributes.java
diff -u kaffe/libraries/javalib/javax/naming/directory/BasicAttributes.java:1.3 kaffe/libraries/javalib/javax/naming/directory/BasicAttributes.java:1.4
--- kaffe/libraries/javalib/javax/naming/directory/BasicAttributes.java:1.3 Mon Mar 22 11:25:15 2004
+++ kaffe/libraries/javalib/javax/naming/directory/BasicAttributes.java Mon Apr 19 14:16:04 2004
@@ -40,7 +40,6 @@
import java.util.NoSuchElementException;
import java.util.Vector;
-
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
Index: kaffe/libraries/javalib/javax/naming/directory/InitialDirContext.java
diff -u kaffe/libraries/javalib/javax/naming/directory/InitialDirContext.java:1.3 kaffe/libraries/javalib/javax/naming/directory/InitialDirContext.java:1.4
--- kaffe/libraries/javalib/javax/naming/directory/InitialDirContext.java:1.3 Mon Mar 22 11:25:15 2004
+++ kaffe/libraries/javalib/javax/naming/directory/InitialDirContext.java Mon Apr 19 14:16:04 2004
@@ -39,7 +39,6 @@
package javax.naming.directory;
import java.util.Hashtable;
-
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.Name;
Index: kaffe/libraries/javalib/javax/naming/directory/SearchControls.java
diff -u kaffe/libraries/javalib/javax/naming/directory/SearchControls.java:1.1 kaffe/libraries/javalib/javax/naming/directory/SearchControls.java:1.2
--- kaffe/libraries/javalib/javax/naming/directory/SearchControls.java:1.1 Thu Nov 28 10:23:18 2002
+++ kaffe/libraries/javalib/javax/naming/directory/SearchControls.java Mon Apr 19 14:16:04 2004
@@ -1,5 +1,5 @@
/* SearchControls.java --
- Copyright (C) 2001 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -44,7 +44,7 @@
* @date June 5, 2001
*/
-public class SearchControls extends Object implements Serializable
+public class SearchControls implements Serializable
{
public static final int OBJECT_SCOPE = 0;
public static final int ONELEVEL_SCOPE = 1;
Index: kaffe/libraries/javalib/javax/naming/event/NamingEvent.java
diff -u kaffe/libraries/javalib/javax/naming/event/NamingEvent.java:1.3 kaffe/libraries/javalib/javax/naming/event/NamingEvent.java:1.4
--- kaffe/libraries/javalib/javax/naming/event/NamingEvent.java:1.3 Mon Mar 22 11:25:15 2004
+++ kaffe/libraries/javalib/javax/naming/event/NamingEvent.java Mon Apr 19 14:16:04 2004
@@ -39,7 +39,6 @@
package javax.naming.event;
import java.util.EventObject;
-
import javax.naming.Binding;
/**
More information about the kaffe
mailing list