6dee3a2320
2001-10-24 Tom Tromey <tromey@redhat.com> Warren Levy <warrenl@redhat.com> * Makefile.in: Rebuilt. * Makefile.am (javax_source_files): New macro. (ordinary_java_source_files): Added javax_source_files. (libgcj.jar): Search javax for class files. * javax/naming/LinkException.java (toString): Wrote. (toString(boolean)): Likewise. * javax/naming/ldap/InitialLdapContext.java: New file. * javax/naming/directory/InitialDirContext.java: Wrote. * javax/naming/spi/NamingManager.java (getPlusPath): Now has package-private protection. (getURLContext): Likewise. (NamingManager): Likewise. * javax/naming/spi/DirectoryManager.java: New file. * javax/naming/directory/BasicAttributes.java: New file. * javax/naming/directory/BasicAttribute.java: New file. * javax/naming/spi/ResolveResult.java (ResolveResult(Object,String)): Wrote. (appendRemainingName): Uncommented body. (appendRemainingComponent): Likewise. * javax/naming/ldap/ControlFactory.java: New file. * javax/naming/directory/AttributeModificationException.java (toString): Wrote. * javax/naming/spi/NamingManager.java (NamingManager): New constructor. (setInitialContextFactoryBuilder): Wrote. (getInitialContext): Look in system properties for class name as well. Use Class.forName(). (getURLContext): Wrote. (ofb): New field. (setObjectFactoryBuilder): Wrote. (getObjectInstance): Wrote. (getContinuationContext): Wrote. (getPlusPath): New private method. (getStateToBind): Wrote. * javax/naming/CannotProceedException.java: Added missing methods & fields. * javax/naming/LinkException.java: Added missing methods & fields. * javax/naming/ReferralException.java (ReferralException): Made constructor protected per spec. Added missing abstract methods. * javax/naming/directory/Attribute.java: Updated copyright. * javax/naming/directory/AttributeModificationException.java: Ditto. * javax/naming/directory/Attributes.java: Ditto. * javax/naming/directory/DirContext.java: Ditto. * javax/naming/spi/NamingManager.java: Ditto. * javax/naming/spi/ResolveResult.java: Added comment. * javax/naming/directory/Attribute.java: Added missing interface methods. * javax/naming/directory/AttributeModificationException.java: Added missing methods & fields. * javax/naming/directory/directory/Attributes.java: Added missing interface methods. * javax/naming/directory/SearchControls.java: Maded serialized fields private. * javax/naming/event/NamingEvent.java: Added comment. * javax/naming/event/NamingExceptionEvent.java: Maded serialized field private. * javax/naming/ldap/UnsolicitedNotificationEvent.java: Maded serialized field private. * javax/naming/spi/NamingManager.java: Added missing field and stubbed missing methods. * javax/naming/directory/DirContext.java: Added missing interface fields & methods. * javax/naming/directory/InitialDirContext.java: Stubbed missing methods. * javax/naming/directory/ModificationItem.java: New class. * javax/naming/directory/SearchResult.java: New class. * javax/naming/directory/SearchControls.java: New class. * javax/naming/event/EventContext.java: New class. * javax/naming/event/EventDirContext.java: New class. * javax/naming/event/NamespaceChangeListener.java: New class. * javax/naming/event/NamingEvent.java: New class. * javax/naming/event/NamingExceptionEvent.java: New class. * javax/naming/event/NamingListener.java: New class. * javax/naming/event/ObjectChangeListener.java: New class. * javax/naming/ldap/Control.java: New class. * javax/naming/ldap/ExtendedRequest.java: New class. * javax/naming/ldap/ExtendedResponse.java: New class. * javax/naming/ldap/HasControls.java: New class. * javax/naming/ldap/LdapContext.java: New class. * javax/naming/ldap/LdapReferralException.java: New class. * javax/naming/ldap/UnsolicitedNotification.java: New class. * javax/naming/ldap/UnsolicitedNotificationEvent.java: New class. * javax/naming/ldap/UnsolicitedNotificationListener.java: New class. * javax/naming/spi/DirObjectFactory.java: New class. * javax/naming/spi/DirStateFactory.java: New class. * javax/naming/spi/ObjectFactoryBuilder.java: New class. * javax/naming/spi/ResolveResult.java: New class. * javax/naming/spi/Resolver.java: New class. * javax/naming/spi/StateFactory.java: New class. * javax/naming/spi/ObjectFactory.java: Made an interface per spec. * java/rmi/RemoteException.java: New class. * javax/transaction/HeuristicCommitException.java: New class. * javax/transaction/HeuristicMixedException.java: New class. * javax/transaction/HeuristicRollbackException.java: New class. * javax/transaction/NotSupportedException.java: New class. * javax/transaction/RollbackException.java: New class. * javax/transaction/Status.java: New class. * javax/transaction/Synchronization.java: New class. * javax/transaction/SystemException.java: New class. * javax/transaction/Transaction.java: New class. * javax/transaction/TransactionManager.java: New class. * javax/transaction/UserTransaction.java: New class. * javax/transaction/xa/XAException.java: Added public static fields. * javax/transaction/xa/XAResource.java: New class. * javax/transaction/xa/Xid.java: New class. * javax/naming/CompoundName.java (CompoundName(String)): Reverse elements if required. Handle case where quote is at end of string. * javax/naming/CompoundName.java (CompoundName(String)): Handle text left at end of parsing. (toString): Handle empty element at beginning. * javax/naming/CompositeName.java (toString): Handle empty element at beginning. (CompositeName(String)): Handle text left at end of parsing. Correctly compute boundary condition for quoting. * javax/naming/CompoundName.java: New file. * javax/naming/CompositeName.java: New file. * javax/naming/Binding.java: New file. * javax/naming/LinkRef.java: New file. * javax/naming/NameClassPair.java: New file. * javax/naming/Reference.java (addrs, classFactory, classFactoryLocation): New fields. (className): Now protected. (Reference): New constructors. (add): Now public. Implemented. (get(String)): Likewise. (add(int,RefAddr)): New method. (clear): Likewise. (clone): Likewise. (equals): Likewise. (get(int)): Likewise. (getAll): Likewise. (getFactoryClassLocation): Likewise. (getFactoryClassName): Likewise. (hashCode): Likewise. (remove): Likewise. (size): Likewise. (toString): Likewise. * javax/transaction/xa/XAException.java: New file. * javax/transaction/TransactionRolledbackException.java: New file. * javax/transaction/TransactionRequiredException.java: New file. * javax/transaction/InvalidTransactionException.java: New file. * javax/naming/directory/SchemaViolationException.java: Use correct package. Import NamingException. * javax/naming/directory/NoSuchAttributeException.java, javax/naming/directory/InvalidSearchFilterException.java, javax/naming/directory/InvalidSearchControlsException.java, javax/naming/directory/InvalidAttributesException.java, javax/naming/directory/InvalidAttributeValueException.java, javax/naming/directory/InvalidAttributeIdentifierException.java, javax/naming/directory/AttributeModificationException.java, javax/naming/directory/AttributeInUseException.java: Likewise. * javax/naming/directory/InitialDirContext.java (getAttributes): Stub implementation. * javax/naming/RefAddr.java (RefAddr): Reindented. (equals): Renamed and reindented. * javax/naming/BinaryRefAddr.java (equals): Renamed and reindented. Co-Authored-By: Warren Levy <warrenl@redhat.com> From-SVN: r46474
290 lines
6.4 KiB
Java
290 lines
6.4 KiB
Java
/* Copyright (C) 2001 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. */
|
|
|
|
package javax.naming;
|
|
|
|
import java.io.Serializable;
|
|
import java.util.Enumeration;
|
|
import java.util.NoSuchElementException;
|
|
import java.util.Vector;
|
|
|
|
/**
|
|
* @author Tom Tromey <tromey@redhat.com>
|
|
* @date May 16, 2001
|
|
*
|
|
* FIXME: must write readObject and writeObject to conform to
|
|
* serialization spec.
|
|
*/
|
|
public class CompositeName implements Name, Cloneable, Serializable
|
|
{
|
|
public CompositeName ()
|
|
{
|
|
elts = new Vector ();
|
|
}
|
|
|
|
protected CompositeName (Enumeration comps)
|
|
{
|
|
elts = new Vector ();
|
|
try
|
|
{
|
|
while (comps.hasMoreElements ())
|
|
elts.add (comps.nextElement ());
|
|
}
|
|
catch (NoSuchElementException ignore)
|
|
{
|
|
}
|
|
}
|
|
|
|
public CompositeName (String n) throws InvalidNameException
|
|
{
|
|
elts = new Vector ();
|
|
// Parse the string into its components.
|
|
final char no_quote = 'x'; // Use 'x' to mean no quoting.
|
|
char quote = no_quote;
|
|
boolean escaped = false;
|
|
StringBuffer new_element = new StringBuffer ();
|
|
for (int i = 0; i < n.length (); ++i)
|
|
{
|
|
char c = n.charAt (i);
|
|
if (escaped)
|
|
escaped = false;
|
|
else if (c == '\\')
|
|
{
|
|
escaped = true;
|
|
continue;
|
|
}
|
|
else if (quote != no_quote)
|
|
{
|
|
if (quote == c)
|
|
{
|
|
// The quotes must surround a complete component.
|
|
if (i + 1 < n.length () && n.charAt (i + 1) != '/')
|
|
throw new InvalidNameException ("close quote before end of component");
|
|
elts.add (new_element.toString ());
|
|
new_element.setLength (0);
|
|
quote = no_quote;
|
|
continue;
|
|
}
|
|
// Otherwise, fall through.
|
|
}
|
|
// Quotes are only special at the start of a component.
|
|
else if (new_element.length () == 0
|
|
&& (c == '\'' || c == '"'))
|
|
{
|
|
quote = c;
|
|
continue;
|
|
}
|
|
else if (c == '/')
|
|
{
|
|
elts.add (new_element.toString ());
|
|
new_element.setLength (0);
|
|
continue;
|
|
}
|
|
|
|
new_element.append (c);
|
|
}
|
|
|
|
if (new_element.length () != 0)
|
|
elts.add (new_element.toString ());
|
|
|
|
// Error checking.
|
|
if (quote != no_quote)
|
|
throw new InvalidNameException ("unterminated quote");
|
|
if (escaped)
|
|
throw new InvalidNameException ("trailing escape character");
|
|
}
|
|
|
|
public Name add (int posn, String comp) throws InvalidNameException
|
|
{
|
|
elts.add (posn, comp);
|
|
return this;
|
|
}
|
|
|
|
public Name add (String comp) throws InvalidNameException
|
|
{
|
|
elts.add (comp);
|
|
return this;
|
|
}
|
|
|
|
public Name addAll (int posn, Name n) throws InvalidNameException
|
|
{
|
|
Enumeration e = n.getAll ();
|
|
try
|
|
{
|
|
while (e.hasMoreElements ())
|
|
{
|
|
elts.add (posn, e.nextElement ());
|
|
++posn;
|
|
}
|
|
}
|
|
catch (NoSuchElementException ignore)
|
|
{
|
|
}
|
|
return this;
|
|
}
|
|
|
|
public Name addAll (Name suffix) throws InvalidNameException
|
|
{
|
|
Enumeration e = suffix.getAll ();
|
|
try
|
|
{
|
|
while (e.hasMoreElements ())
|
|
elts.add (e.nextElement ());
|
|
}
|
|
catch (NoSuchElementException ignore)
|
|
{
|
|
}
|
|
return this;
|
|
}
|
|
|
|
public Object clone ()
|
|
{
|
|
return new CompositeName (elts.elements ());
|
|
}
|
|
|
|
public int compareTo (Object obj)
|
|
{
|
|
if (obj == null || ! (obj instanceof CompositeName))
|
|
throw new ClassCastException ("CompositeName.compareTo() expected CompositeName");
|
|
CompositeName cn = (CompositeName) obj;
|
|
int last = Math.min (cn.elts.size (), elts.size ());
|
|
for (int i = 0; i < last; ++i)
|
|
{
|
|
String f = (String) elts.get (i);
|
|
int comp = f.compareTo ((String) cn.elts.get (i));
|
|
if (comp != 0)
|
|
return comp;
|
|
}
|
|
return elts.size () - cn.elts.size ();
|
|
}
|
|
|
|
public boolean endsWith (Name n)
|
|
{
|
|
if (! (n instanceof CompositeName))
|
|
return false;
|
|
CompositeName cn = (CompositeName) n;
|
|
if (cn.elts.size () > elts.size ())
|
|
return false;
|
|
int delta = elts.size () - cn.elts.size ();
|
|
for (int i = 0; i < cn.elts.size (); ++i)
|
|
{
|
|
if (! cn.elts.get (i).equals (elts.get (delta + i)))
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
public boolean equals (Object obj)
|
|
{
|
|
if (! (obj instanceof CompositeName))
|
|
return false;
|
|
CompositeName cn = (CompositeName) obj;
|
|
return elts.equals (cn.elts);
|
|
}
|
|
|
|
public String get (int posn)
|
|
{
|
|
return (String) elts.get (posn);
|
|
}
|
|
|
|
public Enumeration getAll ()
|
|
{
|
|
return elts.elements ();
|
|
}
|
|
|
|
public Name getPrefix (int posn)
|
|
{
|
|
CompositeName cn = new CompositeName ();
|
|
for (int i = 0; i < posn; ++i)
|
|
cn.elts.add ((String) elts.get (i));
|
|
return cn;
|
|
}
|
|
|
|
public Name getSuffix (int posn)
|
|
{
|
|
if (posn > elts.size ())
|
|
throw new ArrayIndexOutOfBoundsException (posn);
|
|
CompositeName cn = new CompositeName ();
|
|
for (int i = posn; i < elts.size (); ++i)
|
|
cn.elts.add ((String) elts.get (i));
|
|
return cn;
|
|
}
|
|
|
|
public int hashCode ()
|
|
{
|
|
// Specified in documentation.
|
|
int h = 0;
|
|
for (int i = 0; i < elts.size (); ++i)
|
|
h += elts.get (i).hashCode ();
|
|
return h;
|
|
}
|
|
|
|
public boolean isEmpty ()
|
|
{
|
|
return elts.isEmpty ();
|
|
}
|
|
|
|
public Object remove (int posn) throws InvalidNameException
|
|
{
|
|
return elts.remove (posn);
|
|
}
|
|
|
|
public int size ()
|
|
{
|
|
return elts.size ();
|
|
}
|
|
|
|
public boolean startsWith (Name n)
|
|
{
|
|
if (! (n instanceof CompositeName))
|
|
return false;
|
|
CompositeName cn = (CompositeName) n;
|
|
if (cn.elts.size () > elts.size ())
|
|
return false;
|
|
for (int i = 0; i < cn.elts.size (); ++i)
|
|
{
|
|
if (! cn.elts.get (i).equals (elts.get (i)))
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
public String toString ()
|
|
{
|
|
StringBuffer result = new StringBuffer ();
|
|
for (int i = 0; i < elts.size (); ++i)
|
|
{
|
|
// For simplicity we choose to always quote using escapes and
|
|
// never quotes.
|
|
String elt = (String) elts.get (i);
|
|
if (i > 0
|
|
|| (i == elts.size () - 1 && elt.equals ("")))
|
|
result.append ('/');
|
|
for (int k = 0; k < elt.length (); ++k)
|
|
{
|
|
char c = elt.charAt (k);
|
|
// We must quote
|
|
// ... a leading quote,
|
|
if ((k == 0 && (c == '"' || c == '\''))
|
|
// ... an escape preceding a meta character,
|
|
// or at the end of a component,
|
|
|| (c == '\\'
|
|
&& (k == elt.length () - 1
|
|
|| "\\'\"/".indexOf (elt.charAt (k + 1)) != -1))
|
|
// ... or a component separator.
|
|
|| c == '/')
|
|
result.append ('\\');
|
|
result.append (c);
|
|
}
|
|
}
|
|
return result.toString ();
|
|
}
|
|
|
|
private transient Vector elts;
|
|
}
|