This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
FYI: javax.naming imported into Classpath
- From: Mark Wielaard <mark at klomp dot org>
- To: java-patches at gcc dot gnu dot org
- Date: 23 Nov 2002 22:49:32 +0100
- Subject: FYI: javax.naming imported into Classpath
Hi,
I imported the javax.naming package into Classpath. So I updated all
headers to mention that these files are now "merged". There was only one
code change to make things compile with jikes. (Other header updates
omitted from the patch since they are completely similar to this one -
times 88).
2002-11-23 Mark Wielaard <mark@klomp.org>
* javax/naming/AuthenticationException.java: Update copyright header.
* javax/naming/AuthenticationNotSupportedException.java: Likewise.
* javax/naming/Binding.java: Likewise.
* javax/naming/CannotProceedException.java: Likewise.
* javax/naming/CommunicationException.java: Likewise.
* javax/naming/CompositeName.java: Likewise.
* javax/naming/CompoundName.java: Likewise.
* javax/naming/ConfigurationException.java: Likewise.
* javax/naming/Context.java: Likewise.
* javax/naming/ContextNotEmptyException.java: Likewise.
* javax/naming/InitialContext.java: Likewise.
* javax/naming/InsufficientResourcesException.java: Likewise.
* javax/naming/InterruptedNamingException.java: Likewise.
* javax/naming/LimitExceededException.java: Likewise.
* javax/naming/LinkException.java: Likewise.
* javax/naming/LinkLoopException.java: Likewise.
* javax/naming/LinkRef.java: Likewise.
* javax/naming/MalformedLinkException.java: Likewise.
* javax/naming/NameAlreadyBoundException.java: Likewise.
* javax/naming/NameClassPair.java: Likewise.
* javax/naming/NameNotFoundException.java: Likewise.
* javax/naming/NameParser.java: Likewise.
* javax/naming/NamingEnumeration.java: Likewise.
* javax/naming/NamingSecurityException.java: Likewise.
* javax/naming/NoInitialContextException.java: Likewise.
* javax/naming/NoPermissionException.java: Likewise.
* javax/naming/NotContextException.java: Likewise.
* javax/naming/OperationNotSupportedException.java: Likewise.
* javax/naming/PartialResultException.java: Likewise.
* javax/naming/Reference.java: Likewise.
* javax/naming/Referenceable.java: Likewise.
* javax/naming/ReferralException.java: Likewise.
* javax/naming/ServiceUnavailableException.java: Likewise.
* javax/naming/SizeLimitExceededException.java: Likewise.
* javax/naming/TimeLimitExceededException.java: Likewise.
* javax/naming/directory/Attribute.java: Likewise.
* javax/naming/directory/AttributeInUseException.java: Likewise.
* javax/naming/directory/AttributeModificationException.java: Likewise.
* javax/naming/directory/Attributes.java: Likewise.
* javax/naming/directory/BasicAttribute.java: Likewise.
* javax/naming/directory/BasicAttributes.java: Likewise.
* javax/naming/directory/DirContext.java: Likewise.
* javax/naming/directory/InitialDirContext.java: Likewise.
* javax/naming/directory/InvalidAttributeIdentifierException.java:
Likewise.
* javax/naming/directory/InvalidAttributeValueException.java: Likewise.
* javax/naming/directory/InvalidAttributesException.java: Likewise.
* javax/naming/directory/InvalidSearchControlsException.java: Likewise.
* javax/naming/directory/InvalidSearchFilterException.java: Likewise.
* javax/naming/directory/ModificationItem.java: Likewise.
* javax/naming/directory/NoSuchAttributeException.java: Likewise.
* javax/naming/directory/SchemaViolationException.java: Likewise.
* javax/naming/directory/SearchControls.java: Likewise.
* javax/naming/directory/SearchResult.java: Likewise.
* javax/naming/event/EventContext.java: Likewise.
* javax/naming/event/EventDirContext.java: Likewise.
* javax/naming/event/NamespaceChangeListener.java: Likewise.
* javax/naming/event/NamingEvent.java: Likewise.
* javax/naming/event/NamingExceptionEvent.java: Likewise.
* javax/naming/event/NamingListener.java: Likewise.
* javax/naming/event/ObjectChangeListener.java: Likewise.
* javax/naming/ldap/Control.java: Likewise.
* javax/naming/ldap/ControlFactory.java: Likewise.
* javax/naming/ldap/ExtendedRequest.java: Likewise.
* javax/naming/ldap/ExtendedResponse.java: Likewise.
* javax/naming/ldap/HasControls.java: Likewise.
* javax/naming/ldap/InitialLdapContext.java: Likewise.
* javax/naming/ldap/LdapContext.java: Likewise.
* javax/naming/ldap/LdapReferralException.java: Likewise.
* javax/naming/ldap/UnsolicitedNotification.java: Likewise.
* javax/naming/ldap/UnsolicitedNotificationEvent.java: Likewise.
* javax/naming/ldap/UnsolicitedNotificationListener.java: Likewise.
* javax/naming/spi/DirObjectFactory.java: Likewise.
* javax/naming/spi/DirStateFactory.java: Likewise.
* javax/naming/spi/DirectoryManager.java: Likewise.
* javax/naming/spi/InitialContextFactory.java: Likewise.
* javax/naming/spi/InitialContextFactoryBuilder.java: Likewise.
* javax/naming/spi/NamingManager.java: Likewise.
* javax/naming/spi/ObjectFactory.java: Likewise.
* javax/naming/spi/ObjectFactoryBuilder.java: Likewise.
* javax/naming/spi/ResolveResult.java: Likewise.
* javax/naming/spi/Resolver.java: Likewise.
* javax/naming/spi/StateFactory.java: Likewise.
* javax/naming/spi/NamingManager.java (ofb): Package private.
Cheers,
mark
Index: javax/naming/spi/NamingManager.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/naming/spi/NamingManager.java,v
retrieving revision 1.3
diff -u -r1.3 NamingManager.java
--- javax/naming/spi/NamingManager.java 2 Jul 2002 02:46:27 -0000 1.3
+++ javax/naming/spi/NamingManager.java 23 Nov 2002 21:45:29 -0000
@@ -1,10 +1,40 @@
-/* Copyright (C) 2000, 2001, 2002 Free Software Foundation
-
- This file is part of libgcj.
-
- This software is copyrighted work licensed under the terms of the
- Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
- details. */
+/* NamingManager.java --
+ Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
+
package javax.naming.spi;
@@ -16,7 +46,9 @@
public static final String CPE = "java.naming.spi.CannotProceedException";
private static InitialContextFactoryBuilder icfb = null;
- private static ObjectFactoryBuilder ofb = null;
+
+ // Package private so DirectoryManager can access it.
+ static ObjectFactoryBuilder ofb = null;
// This class cannot be instantiated.
NamingManager ()