You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by tr...@apache.org on 2005/06/24 05:08:39 UTC
svn commit: r201550 [5/5] - in /directory/apacheds/trunk/core: ./
src/main/aspects/ src/main/java/org/apache/ldap/server/
src/main/java/org/apache/ldap/server/authn/
src/main/java/org/apache/ldap/server/authz/
src/main/java/org/apache/ldap/server/confi...
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxRegistry.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxRegistry.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxRegistry.java Thu Jun 23 20:08:31 2005
@@ -17,16 +17,16 @@
package org.apache.ldap.server.schema;
-import org.apache.ldap.common.schema.Syntax;
-import org.apache.ldap.common.util.JoinIterator;
-import org.apache.ldap.server.SystemPartition;
-import org.apache.ldap.server.schema.bootstrap.BootstrapSyntaxRegistry;
-
-import javax.naming.NamingException;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+import javax.naming.NamingException;
+
+import org.apache.ldap.common.schema.Syntax;
+import org.apache.ldap.common.util.JoinIterator;
+import org.apache.ldap.server.schema.bootstrap.BootstrapSyntaxRegistry;
+
/**
* A plain old java object implementation of an SyntaxRegistry.
@@ -46,8 +46,6 @@
private SyntaxRegistryMonitor monitor;
/** the underlying bootstrap registry to delegate on misses to */
private BootstrapSyntaxRegistry bootstrap;
- /** the system partition where we keep attributeType updates */
- private SystemPartition systemPartition;
// ------------------------------------------------------------------------
@@ -58,8 +56,7 @@
/**
* Creates an empty BootstrapSyntaxRegistry.
*/
- public GlobalSyntaxRegistry( SystemPartition systemPartition,
- BootstrapSyntaxRegistry bootstrap, OidRegistry oidRegistry )
+ public GlobalSyntaxRegistry( BootstrapSyntaxRegistry bootstrap, OidRegistry oidRegistry )
{
this.byOid = new HashMap();
this.oidToSchema = new HashMap();
@@ -70,12 +67,6 @@
if ( this.bootstrap == null )
{
throw new NullPointerException( "the bootstrap registry cannot be null" ) ;
- }
-
- this.systemPartition = systemPartition;
- if ( this.systemPartition == null )
- {
- throw new NullPointerException( "the system partition cannot be null" ) ;
}
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistry.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistry.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistry.java Thu Jun 23 20:08:31 2005
@@ -17,10 +17,11 @@
package org.apache.ldap.server.schema;
-import org.apache.ldap.common.schema.MatchingRule;
+import java.util.Iterator;
import javax.naming.NamingException;
-import java.util.Iterator;
+
+import org.apache.ldap.common.schema.MatchingRule;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistryMonitor.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistryMonitor.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistryMonitor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistryMonitor.java Thu Jun 23 20:08:31 2005
@@ -17,9 +17,9 @@
package org.apache.ldap.server.schema;
-import org.apache.ldap.common.schema.MatchingRule;
-
import javax.naming.NamingException;
+
+import org.apache.ldap.common.schema.MatchingRule;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistryMonitorAdapter.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistryMonitorAdapter.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistryMonitorAdapter.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistryMonitorAdapter.java Thu Jun 23 20:08:31 2005
@@ -17,9 +17,9 @@
package org.apache.ldap.server.schema;
-import org.apache.ldap.common.schema.MatchingRule;
-
import javax.naming.NamingException;
+
+import org.apache.ldap.common.schema.MatchingRule;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleUseRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleUseRegistry.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleUseRegistry.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleUseRegistry.java Thu Jun 23 20:08:31 2005
@@ -17,10 +17,11 @@
package org.apache.ldap.server.schema;
-import org.apache.ldap.common.schema.MatchingRuleUse;
+import java.util.Iterator;
import javax.naming.NamingException;
-import java.util.Iterator;
+
+import org.apache.ldap.common.schema.MatchingRuleUse;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/NameFormRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/NameFormRegistry.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/NameFormRegistry.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/NameFormRegistry.java Thu Jun 23 20:08:31 2005
@@ -17,10 +17,11 @@
package org.apache.ldap.server.schema;
-import org.apache.ldap.common.schema.NameForm;
+import java.util.Iterator;
import javax.naming.NamingException;
-import java.util.Iterator;
+
+import org.apache.ldap.common.schema.NameForm;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistry.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistry.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistry.java Thu Jun 23 20:08:31 2005
@@ -17,9 +17,9 @@
package org.apache.ldap.server.schema;
-import org.apache.ldap.common.schema.Normalizer;
-
import javax.naming.NamingException;
+
+import org.apache.ldap.common.schema.Normalizer;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistryMonitor.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistryMonitor.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistryMonitor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistryMonitor.java Thu Jun 23 20:08:31 2005
@@ -17,9 +17,9 @@
package org.apache.ldap.server.schema;
-import org.apache.ldap.common.schema.Normalizer;
-
import javax.naming.NamingException;
+
+import org.apache.ldap.common.schema.Normalizer;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistryMonitorAdapter.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistryMonitorAdapter.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistryMonitorAdapter.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistryMonitorAdapter.java Thu Jun 23 20:08:31 2005
@@ -17,9 +17,9 @@
package org.apache.ldap.server.schema;
-import org.apache.ldap.common.schema.Normalizer;
-
import javax.naming.NamingException;
+
+import org.apache.ldap.common.schema.Normalizer;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/ObjectClassRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/ObjectClassRegistry.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/ObjectClassRegistry.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/ObjectClassRegistry.java Thu Jun 23 20:08:31 2005
@@ -17,10 +17,11 @@
package org.apache.ldap.server.schema;
-import org.apache.ldap.common.schema.ObjectClass;
+import java.util.Iterator;
import javax.naming.NamingException;
-import java.util.Iterator;
+
+import org.apache.ldap.common.schema.ObjectClass;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/ObjectFactoryRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/ObjectFactoryRegistry.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/ObjectFactoryRegistry.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/ObjectFactoryRegistry.java Thu Jun 23 20:08:31 2005
@@ -17,10 +17,10 @@
package org.apache.ldap.server.schema;
-import org.apache.ldap.server.jndi.ServerDirObjectFactory;
-
import javax.naming.NamingException;
import javax.naming.ldap.LdapContext;
+
+import org.apache.ldap.server.jndi.ServerDirObjectFactory;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistry.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistry.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistry.java Thu Jun 23 20:08:31 2005
@@ -17,9 +17,10 @@
package org.apache.ldap.server.schema;
-import javax.naming.NamingException;
import java.util.Iterator;
import java.util.List;
+
+import javax.naming.NamingException;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistryMonitor.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistryMonitor.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistryMonitor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistryMonitor.java Thu Jun 23 20:08:31 2005
@@ -17,8 +17,9 @@
package org.apache.ldap.server.schema;
-import javax.naming.NamingException;
import java.util.List;
+
+import javax.naming.NamingException;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistryMonitorAdapter.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistryMonitorAdapter.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistryMonitorAdapter.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/OidRegistryMonitorAdapter.java Thu Jun 23 20:08:31 2005
@@ -16,8 +16,9 @@
*/
package org.apache.ldap.server.schema;
-import javax.naming.NamingException;
import java.util.List;
+
+import javax.naming.NamingException;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java Thu Jun 23 20:08:31 2005
@@ -17,39 +17,45 @@
package org.apache.ldap.server.schema;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+import javax.naming.Name;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
+import javax.naming.ldap.LdapContext;
+
import org.apache.ldap.common.filter.ExprNode;
import org.apache.ldap.common.filter.PresenceNode;
import org.apache.ldap.common.filter.SimpleNode;
import org.apache.ldap.common.message.LockableAttributeImpl;
import org.apache.ldap.common.message.LockableAttributesImpl;
import org.apache.ldap.common.name.LdapName;
-import org.apache.ldap.common.schema.*;
+import org.apache.ldap.common.schema.AttributeType;
+import org.apache.ldap.common.schema.DITContentRule;
+import org.apache.ldap.common.schema.DITStructureRule;
+import org.apache.ldap.common.schema.MatchingRule;
+import org.apache.ldap.common.schema.MatchingRuleUse;
+import org.apache.ldap.common.schema.NameForm;
+import org.apache.ldap.common.schema.ObjectClass;
+import org.apache.ldap.common.schema.SchemaUtils;
+import org.apache.ldap.common.schema.Syntax;
import org.apache.ldap.common.util.SingletonEnumeration;
-import org.apache.ldap.server.RootNexus;
+import org.apache.ldap.server.configuration.InterceptorConfiguration;
+import org.apache.ldap.server.enumeration.SearchResultFilteringEnumeration;
+import org.apache.ldap.server.enumeration.SearchResultFilter;
import org.apache.ldap.server.interceptor.BaseInterceptor;
-import org.apache.ldap.server.interceptor.InterceptorContext;
import org.apache.ldap.server.interceptor.NextInterceptor;
-import org.apache.ldap.server.db.ResultFilteringEnumeration;
-import org.apache.ldap.server.db.SearchResultFilter;
-import org.apache.ldap.server.invocation.List;
-import org.apache.ldap.server.invocation.Lookup;
-import org.apache.ldap.server.invocation.LookupWithAttrIds;
-import org.apache.ldap.server.invocation.Search;
+import org.apache.ldap.server.jndi.ContextFactoryConfiguration;
import org.apache.ldap.server.jndi.ServerLdapContext;
-import org.apache.ldap.server.schema.AttributeTypeRegistry;
-import org.apache.ldap.server.schema.GlobalRegistries;
-
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-import javax.naming.directory.Attribute;
-import javax.naming.directory.Attributes;
-import javax.naming.directory.SearchControls;
-import javax.naming.directory.SearchResult;
-import javax.naming.ldap.LdapContext;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
+import org.apache.ldap.server.partition.ContextPartitionNexus;
/**
@@ -66,7 +72,7 @@
/**
* the root nexus to all database partitions
*/
- private RootNexus nexus;
+ private ContextPartitionNexus nexus;
/**
* a binary attribute tranforming filter: String -> byte[]
@@ -94,10 +100,10 @@
}
- public void init( InterceptorContext ctx ) throws NamingException
+ public void init( ContextFactoryConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException
{
- this.nexus = ctx.getRootNexus();
- this.globalRegistries = ctx.getGlobalRegistries();
+ this.nexus = factoryCfg.getPartitionNexus();
+ this.globalRegistries = factoryCfg.getGlobalRegistries();
attributeRegistry = globalRegistries.getAttributeTypeRegistry();
binaryAttributeFilter = new BinaryAttributeFilter();
@@ -112,32 +118,25 @@
}
- protected void process( NextInterceptor nextInterceptor, List call ) throws NamingException
+ public NamingEnumeration list( NextInterceptor nextInterceptor, Name base ) throws NamingException
{
- nextInterceptor.process( call );
-
- NamingEnumeration e;
- ResultFilteringEnumeration retval;
- LdapContext ctx = ( LdapContext ) call.getContextStack().peek();
- e = ( NamingEnumeration ) call.getReturnValue();
- retval = new ResultFilteringEnumeration( e, new SearchControls(), ctx, binaryAttributeFilter );
- call.setReturnValue( retval );
+ NamingEnumeration e = nextInterceptor.list( base );
+ LdapContext ctx = getContext();
+ return new SearchResultFilteringEnumeration( e, new SearchControls(), ctx, binaryAttributeFilter );
}
- protected void process( NextInterceptor nextInterceptor, Search call ) throws NamingException
+ public NamingEnumeration search( NextInterceptor nextInterceptor,
+ Name base, Map env, ExprNode filter,
+ SearchControls searchCtls ) throws NamingException
{
// check to make sure the DN searched for is a subentry
- if ( !subentryDn.equals( call.getBaseName().toString() ) )
+ if ( !subentryDn.equals( base.toString() ) )
{
- nextInterceptor.process( call );
- return;
+ return nextInterceptor.search( base, env, filter, searchCtls );
}
- boolean bypass = false;
- SearchControls searchControls = call.getControls();
- ExprNode filter = call.getFilter();
- if ( searchControls.getSearchScope() == SearchControls.OBJECT_SCOPE &&
+ if ( searchCtls.getSearchScope() == SearchControls.OBJECT_SCOPE &&
filter instanceof SimpleNode )
{
SimpleNode node = ( SimpleNode ) filter;
@@ -148,14 +147,12 @@
)
{
// call.setBypass( true );
- Attributes attrs = getSubschemaEntry( searchControls.getReturningAttributes() );
- SearchResult result = new SearchResult( call.getBaseName().toString(), null, attrs );
- SingletonEnumeration e = new SingletonEnumeration( result );
- call.setReturnValue( e );
- bypass = true;
+ Attributes attrs = getSubschemaEntry( searchCtls.getReturningAttributes() );
+ SearchResult result = new SearchResult( base.toString(), null, attrs );
+ return new SingletonEnumeration( result );
}
}
- else if ( searchControls.getSearchScope() == SearchControls.OBJECT_SCOPE &&
+ else if ( searchCtls.getSearchScope() == SearchControls.OBJECT_SCOPE &&
filter instanceof PresenceNode )
{
PresenceNode node = ( PresenceNode ) filter;
@@ -163,30 +160,21 @@
if ( node.getAttribute().equalsIgnoreCase( "objectClass" ) )
{
// call.setBypass( true );
- Attributes attrs = getSubschemaEntry( searchControls.getReturningAttributes() );
- SearchResult result = new SearchResult( call.getBaseName().toString(), null, attrs );
- SingletonEnumeration e = new SingletonEnumeration( result );
- call.setReturnValue( e );
- bypass = true;
+ Attributes attrs = getSubschemaEntry( searchCtls.getReturningAttributes() );
+ SearchResult result = new SearchResult( base.toString(), null, attrs );
+ return new SingletonEnumeration( result );
}
}
- if ( !bypass )
- {
- nextInterceptor.process( call );
- }
+ NamingEnumeration e = nextInterceptor.search( base, env, filter, searchCtls );
- if ( searchControls.getReturningAttributes() != null )
+ if ( searchCtls.getReturningAttributes() != null )
{
- return;
+ return e;
}
- NamingEnumeration e;
- ResultFilteringEnumeration retval;
- LdapContext ctx = ( LdapContext ) call.getContextStack().peek();
- e = ( NamingEnumeration ) call.getReturnValue();
- retval = new ResultFilteringEnumeration( e, searchControls, ctx, binaryAttributeFilter );
- call.setReturnValue( retval );
+ LdapContext ctx = getContext();
+ return new SearchResultFilteringEnumeration( e, searchCtls, ctx, binaryAttributeFilter );
}
@@ -316,32 +304,27 @@
}
- protected void process( NextInterceptor nextInterceptor, Lookup call ) throws NamingException
+ public Attributes lookup( NextInterceptor nextInterceptor, Name name ) throws NamingException
{
- nextInterceptor.process( call );
+ Attributes result = nextInterceptor.lookup( name );
- ServerLdapContext ctx = ( ServerLdapContext ) call.getContextStack().peek();
- Attributes attributes = ( Attributes ) call.getReturnValue();
- Attributes retval = ( Attributes ) attributes.clone();
- doFilter( ctx, retval );
- call.setReturnValue( retval );
+ ServerLdapContext ctx = ( ServerLdapContext ) getContext();
+ doFilter( ctx, result );
+ return result;
}
- protected void process( NextInterceptor nextInterceptor, LookupWithAttrIds call ) throws NamingException
+ public Attributes lookup( NextInterceptor nextInterceptor, Name name, String[] attrIds ) throws NamingException
{
- nextInterceptor.process( call );
-
- ServerLdapContext ctx = ( ServerLdapContext ) call.getContextStack().peek();
- Attributes attributes = ( Attributes ) call.getReturnValue();
- if ( attributes == null )
+ Attributes result = nextInterceptor.lookup( name, attrIds );
+ if ( result == null )
{
- return;
+ return null;
}
- Attributes retval = ( Attributes ) attributes.clone();
- doFilter( ctx, retval );
- call.setReturnValue( retval );
+ ServerLdapContext ctx = ( ServerLdapContext ) getContext();
+ doFilter( ctx, result );
+ return result;
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SerializableComparator.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SerializableComparator.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SerializableComparator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SerializableComparator.java Thu Jun 23 20:08:31 2005
@@ -17,9 +17,10 @@
package org.apache.ldap.server.schema;
-import javax.naming.NamingException;
import java.io.Serializable;
import java.util.Comparator;
+
+import javax.naming.NamingException;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/StateFactoryRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/StateFactoryRegistry.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/StateFactoryRegistry.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/StateFactoryRegistry.java Thu Jun 23 20:08:31 2005
@@ -17,9 +17,9 @@
package org.apache.ldap.server.schema;
-import org.apache.ldap.server.jndi.ServerDirStateFactory;
-
import javax.naming.NamingException;
+
+import org.apache.ldap.server.jndi.ServerDirStateFactory;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistry.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistry.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistry.java Thu Jun 23 20:08:31 2005
@@ -17,9 +17,9 @@
package org.apache.ldap.server.schema;
-import org.apache.ldap.common.schema.SyntaxChecker;
-
import javax.naming.NamingException;
+
+import org.apache.ldap.common.schema.SyntaxChecker;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistryMonitor.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistryMonitor.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistryMonitor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistryMonitor.java Thu Jun 23 20:08:31 2005
@@ -17,9 +17,9 @@
package org.apache.ldap.server.schema;
-import org.apache.ldap.common.schema.SyntaxChecker;
-
import javax.naming.NamingException;
+
+import org.apache.ldap.common.schema.SyntaxChecker;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistryMonitorAdapter.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistryMonitorAdapter.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistryMonitorAdapter.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistryMonitorAdapter.java Thu Jun 23 20:08:31 2005
@@ -17,9 +17,9 @@
package org.apache.ldap.server.schema;
-import org.apache.ldap.common.schema.SyntaxChecker;
-
import javax.naming.NamingException;
+
+import org.apache.ldap.common.schema.SyntaxChecker;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistry.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistry.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistry.java Thu Jun 23 20:08:31 2005
@@ -17,10 +17,11 @@
package org.apache.ldap.server.schema;
-import org.apache.ldap.common.schema.Syntax;
+import java.util.Iterator;
import javax.naming.NamingException;
-import java.util.Iterator;
+
+import org.apache.ldap.common.schema.Syntax;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistryMonitor.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistryMonitor.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistryMonitor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistryMonitor.java Thu Jun 23 20:08:31 2005
@@ -17,9 +17,9 @@
package org.apache.ldap.server.schema;
-import org.apache.ldap.common.schema.Syntax;
-
import javax.naming.NamingException;
+
+import org.apache.ldap.common.schema.Syntax;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistryMonitorAdapter.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistryMonitorAdapter.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistryMonitorAdapter.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistryMonitorAdapter.java Thu Jun 23 20:08:31 2005
@@ -17,9 +17,9 @@
package org.apache.ldap.server.schema;
-import org.apache.ldap.common.schema.Syntax;
-
import javax.naming.NamingException;
+
+import org.apache.ldap.common.schema.Syntax;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/AbstractBootstrapProducer.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/AbstractBootstrapProducer.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/AbstractBootstrapProducer.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/AbstractBootstrapProducer.java Thu Jun 23 20:08:31 2005
@@ -17,11 +17,29 @@
package org.apache.ldap.server.schema.bootstrap;
-import org.apache.ldap.common.schema.*;
-import org.apache.ldap.server.schema.*;
+import java.util.Comparator;
import javax.naming.NamingException;
-import java.util.Comparator;
+
+import org.apache.ldap.common.schema.AbstractAttributeType;
+import org.apache.ldap.common.schema.AbstractMatchingRule;
+import org.apache.ldap.common.schema.AbstractSchemaObject;
+import org.apache.ldap.common.schema.AbstractSyntax;
+import org.apache.ldap.common.schema.AttributeType;
+import org.apache.ldap.common.schema.MatchingRule;
+import org.apache.ldap.common.schema.Normalizer;
+import org.apache.ldap.common.schema.ObjectClass;
+import org.apache.ldap.common.schema.ObjectClassTypeEnum;
+import org.apache.ldap.common.schema.Syntax;
+import org.apache.ldap.common.schema.SyntaxChecker;
+import org.apache.ldap.common.schema.UsageEnum;
+import org.apache.ldap.server.schema.AttributeTypeRegistry;
+import org.apache.ldap.server.schema.ComparatorRegistry;
+import org.apache.ldap.server.schema.MatchingRuleRegistry;
+import org.apache.ldap.server.schema.NormalizerRegistry;
+import org.apache.ldap.server.schema.ObjectClassRegistry;
+import org.apache.ldap.server.schema.SyntaxCheckerRegistry;
+import org.apache.ldap.server.schema.SyntaxRegistry;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/ApacheComparatorProducer.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/ApacheComparatorProducer.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/ApacheComparatorProducer.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/ApacheComparatorProducer.java Thu Jun 23 20:08:31 2005
@@ -17,12 +17,14 @@
package org.apache.ldap.server.schema.bootstrap;
+import java.util.Comparator;
+
+import javax.naming.NamingException;
+
import jdbm.helper.StringComparator;
+
import org.apache.ldap.common.schema.ComparableComparator;
import org.apache.ldap.common.util.BigIntegerComparator;
-
-import javax.naming.NamingException;
-import java.util.Comparator;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/ApacheNormalizerProducer.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/ApacheNormalizerProducer.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/ApacheNormalizerProducer.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/ApacheNormalizerProducer.java Thu Jun 23 20:08:31 2005
@@ -17,10 +17,10 @@
package org.apache.ldap.server.schema.bootstrap;
+import javax.naming.NamingException;
+
import org.apache.ldap.common.schema.NoOpNormalizer;
import org.apache.ldap.common.schema.Normalizer;
-
-import javax.naming.NamingException;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapAttributeTypeRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapAttributeTypeRegistry.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapAttributeTypeRegistry.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapAttributeTypeRegistry.java Thu Jun 23 20:08:31 2005
@@ -17,16 +17,17 @@
package org.apache.ldap.server.schema.bootstrap;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.naming.NamingException;
+
import org.apache.ldap.common.schema.AttributeType;
import org.apache.ldap.server.schema.AttributeTypeRegistry;
import org.apache.ldap.server.schema.AttributeTypeRegistryMonitor;
import org.apache.ldap.server.schema.AttributeTypeRegistryMonitorAdapter;
import org.apache.ldap.server.schema.OidRegistry;
-
-import javax.naming.NamingException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapComparatorRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapComparatorRegistry.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapComparatorRegistry.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapComparatorRegistry.java Thu Jun 23 20:08:31 2005
@@ -17,15 +17,16 @@
package org.apache.ldap.server.schema.bootstrap;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.naming.NamingException;
+
import org.apache.ldap.server.schema.ComparatorRegistry;
import org.apache.ldap.server.schema.ComparatorRegistryMonitor;
import org.apache.ldap.server.schema.ComparatorRegistryMonitorAdapter;
import org.apache.ldap.server.schema.SerializableComparator;
-
-import javax.naming.NamingException;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Map;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapDitContentRuleRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapDitContentRuleRegistry.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapDitContentRuleRegistry.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapDitContentRuleRegistry.java Thu Jun 23 20:08:31 2005
@@ -17,16 +17,17 @@
package org.apache.ldap.server.schema.bootstrap;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.naming.NamingException;
+
import org.apache.ldap.common.schema.DITContentRule;
import org.apache.ldap.server.schema.DITContentRuleRegistry;
import org.apache.ldap.server.schema.DITContentRuleRegistryMonitor;
import org.apache.ldap.server.schema.DITContentRuleRegistryMonitorAdapter;
import org.apache.ldap.server.schema.OidRegistry;
-
-import javax.naming.NamingException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapDitStructureRuleRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapDitStructureRuleRegistry.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapDitStructureRuleRegistry.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapDitStructureRuleRegistry.java Thu Jun 23 20:08:31 2005
@@ -17,16 +17,17 @@
package org.apache.ldap.server.schema.bootstrap;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.naming.NamingException;
+
import org.apache.ldap.common.schema.DITStructureRule;
import org.apache.ldap.server.schema.DITStructureRuleRegistry;
import org.apache.ldap.server.schema.DITStructureRuleRegistryMonitor;
import org.apache.ldap.server.schema.DITStructureRuleRegistryMonitorAdapter;
import org.apache.ldap.server.schema.OidRegistry;
-
-import javax.naming.NamingException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapMatchingRuleRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapMatchingRuleRegistry.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapMatchingRuleRegistry.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapMatchingRuleRegistry.java Thu Jun 23 20:08:31 2005
@@ -17,16 +17,17 @@
package org.apache.ldap.server.schema.bootstrap;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.naming.NamingException;
+
import org.apache.ldap.common.schema.MatchingRule;
import org.apache.ldap.server.schema.MatchingRuleRegistry;
import org.apache.ldap.server.schema.MatchingRuleRegistryMonitor;
import org.apache.ldap.server.schema.MatchingRuleRegistryMonitorAdapter;
import org.apache.ldap.server.schema.OidRegistry;
-
-import javax.naming.NamingException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapMatchingRuleUseRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapMatchingRuleUseRegistry.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapMatchingRuleUseRegistry.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapMatchingRuleUseRegistry.java Thu Jun 23 20:08:31 2005
@@ -17,15 +17,16 @@
package org.apache.ldap.server.schema.bootstrap;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.naming.NamingException;
+
import org.apache.ldap.common.schema.MatchingRuleUse;
import org.apache.ldap.server.schema.MatchingRuleUseRegistry;
import org.apache.ldap.server.schema.MatchingRuleUseRegistryMonitor;
import org.apache.ldap.server.schema.MatchingRuleUseRegistryMonitorAdapter;
-
-import javax.naming.NamingException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapNameFormRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapNameFormRegistry.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapNameFormRegistry.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapNameFormRegistry.java Thu Jun 23 20:08:31 2005
@@ -17,16 +17,17 @@
package org.apache.ldap.server.schema.bootstrap;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.naming.NamingException;
+
import org.apache.ldap.common.schema.NameForm;
import org.apache.ldap.server.schema.NameFormRegistry;
import org.apache.ldap.server.schema.NameFormRegistryMonitor;
import org.apache.ldap.server.schema.NameFormRegistryMonitorAdapter;
import org.apache.ldap.server.schema.OidRegistry;
-
-import javax.naming.NamingException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapNormalizerRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapNormalizerRegistry.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapNormalizerRegistry.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapNormalizerRegistry.java Thu Jun 23 20:08:31 2005
@@ -17,14 +17,15 @@
package org.apache.ldap.server.schema.bootstrap;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.naming.NamingException;
+
import org.apache.ldap.common.schema.Normalizer;
import org.apache.ldap.server.schema.NormalizerRegistry;
import org.apache.ldap.server.schema.NormalizerRegistryMonitor;
import org.apache.ldap.server.schema.NormalizerRegistryMonitorAdapter;
-
-import javax.naming.NamingException;
-import java.util.HashMap;
-import java.util.Map;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapObjectClassRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapObjectClassRegistry.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapObjectClassRegistry.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapObjectClassRegistry.java Thu Jun 23 20:08:31 2005
@@ -17,16 +17,17 @@
package org.apache.ldap.server.schema.bootstrap;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.naming.NamingException;
+
import org.apache.ldap.common.schema.ObjectClass;
import org.apache.ldap.server.schema.ObjectClassRegistry;
import org.apache.ldap.server.schema.ObjectClassRegistryMonitor;
import org.apache.ldap.server.schema.ObjectClassRegistryMonitorAdapter;
import org.apache.ldap.server.schema.OidRegistry;
-
-import javax.naming.NamingException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapObjectFactoryRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapObjectFactoryRegistry.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapObjectFactoryRegistry.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapObjectFactoryRegistry.java Thu Jun 23 20:08:31 2005
@@ -17,14 +17,15 @@
package org.apache.ldap.server.schema.bootstrap;
-import org.apache.ldap.server.jndi.ServerDirObjectFactory;
-import org.apache.ldap.server.schema.ObjectFactoryRegistry;
-import org.apache.ldap.server.schema.OidRegistry;
+import java.util.HashMap;
import javax.naming.NamingException;
import javax.naming.directory.Attribute;
import javax.naming.ldap.LdapContext;
-import java.util.HashMap;
+
+import org.apache.ldap.server.jndi.ServerDirObjectFactory;
+import org.apache.ldap.server.schema.ObjectFactoryRegistry;
+import org.apache.ldap.server.schema.OidRegistry;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapOidRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapOidRegistry.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapOidRegistry.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapOidRegistry.java Thu Jun 23 20:08:31 2005
@@ -17,12 +17,17 @@
package org.apache.ldap.server.schema.bootstrap;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.naming.NamingException;
+
import org.apache.ldap.server.schema.OidRegistry;
import org.apache.ldap.server.schema.OidRegistryMonitor;
import org.apache.ldap.server.schema.OidRegistryMonitorAdapter;
-
-import javax.naming.NamingException;
-import java.util.*;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapRegistries.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapRegistries.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapRegistries.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapRegistries.java Thu Jun 23 20:08:31 2005
@@ -17,16 +17,31 @@
package org.apache.ldap.server.schema.bootstrap;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.naming.NamingException;
+
import org.apache.ldap.common.schema.AttributeType;
import org.apache.ldap.common.schema.MatchingRule;
import org.apache.ldap.common.schema.ObjectClass;
import org.apache.ldap.common.schema.Syntax;
-import org.apache.ldap.server.schema.*;
-
-import javax.naming.NamingException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
+import org.apache.ldap.server.schema.AttributeTypeRegistry;
+import org.apache.ldap.server.schema.ComparatorRegistry;
+import org.apache.ldap.server.schema.DITContentRuleRegistry;
+import org.apache.ldap.server.schema.DITStructureRuleRegistry;
+import org.apache.ldap.server.schema.MatchingRuleRegistry;
+import org.apache.ldap.server.schema.MatchingRuleUseRegistry;
+import org.apache.ldap.server.schema.NameFormRegistry;
+import org.apache.ldap.server.schema.NormalizerRegistry;
+import org.apache.ldap.server.schema.ObjectClassRegistry;
+import org.apache.ldap.server.schema.ObjectFactoryRegistry;
+import org.apache.ldap.server.schema.OidRegistry;
+import org.apache.ldap.server.schema.Registries;
+import org.apache.ldap.server.schema.StateFactoryRegistry;
+import org.apache.ldap.server.schema.SyntaxCheckerRegistry;
+import org.apache.ldap.server.schema.SyntaxRegistry;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapStateFactoryRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapStateFactoryRegistry.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapStateFactoryRegistry.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapStateFactoryRegistry.java Thu Jun 23 20:08:31 2005
@@ -17,11 +17,12 @@
package org.apache.ldap.server.schema.bootstrap;
-import org.apache.ldap.server.jndi.ServerDirStateFactory;
-import org.apache.ldap.server.schema.StateFactoryRegistry;
+import java.util.HashMap;
import javax.naming.NamingException;
-import java.util.HashMap;
+
+import org.apache.ldap.server.jndi.ServerDirStateFactory;
+import org.apache.ldap.server.schema.StateFactoryRegistry;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxCheckerRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxCheckerRegistry.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxCheckerRegistry.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxCheckerRegistry.java Thu Jun 23 20:08:31 2005
@@ -17,14 +17,15 @@
package org.apache.ldap.server.schema.bootstrap;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.naming.NamingException;
+
import org.apache.ldap.common.schema.SyntaxChecker;
import org.apache.ldap.server.schema.SyntaxCheckerRegistry;
import org.apache.ldap.server.schema.SyntaxCheckerRegistryMonitor;
import org.apache.ldap.server.schema.SyntaxCheckerRegistryMonitorAdapter;
-
-import javax.naming.NamingException;
-import java.util.HashMap;
-import java.util.Map;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxRegistry.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxRegistry.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxRegistry.java Thu Jun 23 20:08:31 2005
@@ -17,16 +17,17 @@
package org.apache.ldap.server.schema.bootstrap;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.naming.NamingException;
+
import org.apache.ldap.common.schema.Syntax;
import org.apache.ldap.server.schema.OidRegistry;
import org.apache.ldap.server.schema.SyntaxRegistry;
import org.apache.ldap.server.schema.SyntaxRegistryMonitor;
import org.apache.ldap.server.schema.SyntaxRegistryMonitorAdapter;
-
-import javax.naming.NamingException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonComparatorProducer.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonComparatorProducer.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonComparatorProducer.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonComparatorProducer.java Thu Jun 23 20:08:31 2005
@@ -17,10 +17,15 @@
package org.apache.ldap.server.schema.bootstrap;
-import org.apache.ldap.common.schema.*;
+import java.util.Comparator;
import javax.naming.NamingException;
-import java.util.Comparator;
+
+import org.apache.ldap.common.schema.CachingNormalizer;
+import org.apache.ldap.common.schema.ComparableComparator;
+import org.apache.ldap.common.schema.DeepTrimNormalizer;
+import org.apache.ldap.common.schema.DeepTrimToLowerNormalizer;
+import org.apache.ldap.common.schema.NormalizingComparator;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonNormalizerProducer.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonNormalizerProducer.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonNormalizerProducer.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/InetorgpersonNormalizerProducer.java Thu Jun 23 20:08:31 2005
@@ -17,12 +17,12 @@
package org.apache.ldap.server.schema.bootstrap;
+import javax.naming.NamingException;
+
import org.apache.ldap.common.schema.CachingNormalizer;
import org.apache.ldap.common.schema.DeepTrimNormalizer;
import org.apache.ldap.common.schema.DeepTrimToLowerNormalizer;
import org.apache.ldap.common.schema.Normalizer;
-
-import javax.naming.NamingException;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisComparatorProducer.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisComparatorProducer.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisComparatorProducer.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisComparatorProducer.java Thu Jun 23 20:08:31 2005
@@ -17,13 +17,14 @@
package org.apache.ldap.server.schema.bootstrap;
+import java.util.Comparator;
+
+import javax.naming.NamingException;
+
import org.apache.ldap.common.schema.CachingNormalizer;
import org.apache.ldap.common.schema.ComparableComparator;
import org.apache.ldap.common.schema.DeepTrimNormalizer;
import org.apache.ldap.common.schema.NormalizingComparator;
-
-import javax.naming.NamingException;
-import java.util.Comparator;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisNormalizerProducer.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisNormalizerProducer.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisNormalizerProducer.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisNormalizerProducer.java Thu Jun 23 20:08:31 2005
@@ -17,11 +17,11 @@
package org.apache.ldap.server.schema.bootstrap;
+import javax.naming.NamingException;
+
import org.apache.ldap.common.schema.CachingNormalizer;
import org.apache.ldap.common.schema.DeepTrimNormalizer;
import org.apache.ldap.common.schema.Normalizer;
-
-import javax.naming.NamingException;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisSyntaxCheckerProducer.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisSyntaxCheckerProducer.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisSyntaxCheckerProducer.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisSyntaxCheckerProducer.java Thu Jun 23 20:08:31 2005
@@ -17,10 +17,10 @@
package org.apache.ldap.server.schema.bootstrap;
+import javax.naming.NamingException;
+
import org.apache.ldap.common.schema.AcceptAllSyntaxChecker;
import org.apache.ldap.common.schema.SyntaxChecker;
-
-import javax.naming.NamingException;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisSyntaxProducer.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisSyntaxProducer.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisSyntaxProducer.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/NisSyntaxProducer.java Thu Jun 23 20:08:31 2005
@@ -17,9 +17,9 @@
package org.apache.ldap.server.schema.bootstrap;
-import org.apache.ldap.server.schema.SyntaxCheckerRegistry;
-
import javax.naming.NamingException;
+
+import org.apache.ldap.server.schema.SyntaxCheckerRegistry;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemComparatorProducer.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemComparatorProducer.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemComparatorProducer.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemComparatorProducer.java Thu Jun 23 20:08:31 2005
@@ -17,11 +17,17 @@
package org.apache.ldap.server.schema.bootstrap;
-import org.apache.ldap.common.schema.*;
-import org.apache.ldap.server.schema.ConcreteNameComponentNormalizer;
+import java.util.Comparator;
import javax.naming.NamingException;
-import java.util.Comparator;
+
+import org.apache.ldap.common.schema.CachingNormalizer;
+import org.apache.ldap.common.schema.ComparableComparator;
+import org.apache.ldap.common.schema.DeepTrimNormalizer;
+import org.apache.ldap.common.schema.DeepTrimToLowerNormalizer;
+import org.apache.ldap.common.schema.DnComparator;
+import org.apache.ldap.common.schema.NormalizingComparator;
+import org.apache.ldap.server.schema.ConcreteNameComponentNormalizer;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemNormalizerProducer.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemNormalizerProducer.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemNormalizerProducer.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemNormalizerProducer.java Thu Jun 23 20:08:31 2005
@@ -17,10 +17,15 @@
package org.apache.ldap.server.schema.bootstrap;
-import org.apache.ldap.common.schema.*;
-import org.apache.ldap.server.schema.ConcreteNameComponentNormalizer;
-
import javax.naming.NamingException;
+
+import org.apache.ldap.common.schema.CachingNormalizer;
+import org.apache.ldap.common.schema.DeepTrimNormalizer;
+import org.apache.ldap.common.schema.DeepTrimToLowerNormalizer;
+import org.apache.ldap.common.schema.DnNormalizer;
+import org.apache.ldap.common.schema.NoOpNormalizer;
+import org.apache.ldap.common.schema.Normalizer;
+import org.apache.ldap.server.schema.ConcreteNameComponentNormalizer;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemSyntaxCheckerProducer.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemSyntaxCheckerProducer.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemSyntaxCheckerProducer.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemSyntaxCheckerProducer.java Thu Jun 23 20:08:31 2005
@@ -17,11 +17,11 @@
package org.apache.ldap.server.schema.bootstrap;
+import javax.naming.NamingException;
+
import org.apache.ldap.common.schema.AcceptAllSyntaxChecker;
import org.apache.ldap.common.schema.BinarySyntaxChecker;
import org.apache.ldap.common.schema.SyntaxChecker;
-
-import javax.naming.NamingException;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemSyntaxProducer.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemSyntaxProducer.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemSyntaxProducer.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemSyntaxProducer.java Thu Jun 23 20:08:31 2005
@@ -17,9 +17,9 @@
package org.apache.ldap.server.schema.bootstrap;
-import org.apache.ldap.server.schema.SyntaxCheckerRegistry;
-
import javax.naming.NamingException;
+
+import org.apache.ldap.server.schema.SyntaxCheckerRegistry;
/**
Modified: directory/apacheds/trunk/core/src/test/org/apache/ldap/server/authz/AuthorizationServiceAsAdminTest.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/test/org/apache/ldap/server/authz/AuthorizationServiceAsAdminTest.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/org/apache/ldap/server/authz/AuthorizationServiceAsAdminTest.java (original)
+++ directory/apacheds/trunk/core/src/test/org/apache/ldap/server/authz/AuthorizationServiceAsAdminTest.java Thu Jun 23 20:08:31 2005
@@ -24,11 +24,11 @@
import javax.naming.directory.Attributes;
import javax.naming.directory.DirContext;
import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
import org.apache.ldap.common.exception.LdapNoPermissionException;
import org.apache.ldap.common.message.LockableAttributesImpl;
import org.apache.ldap.server.AbstractAdminTestCase;
-import org.apache.ldap.server.db.DbSearchResult;
/**
@@ -110,7 +110,7 @@
while ( list.hasMore() )
{
- DbSearchResult result = ( DbSearchResult ) list.next();
+ SearchResult result = ( SearchResult ) list.next();
set.add( result.getName() );
}
Modified: directory/apacheds/trunk/core/src/test/org/apache/ldap/server/authz/AuthorizationServiceAsNonAdminTest.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/test/org/apache/ldap/server/authz/AuthorizationServiceAsNonAdminTest.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/org/apache/ldap/server/authz/AuthorizationServiceAsNonAdminTest.java (original)
+++ directory/apacheds/trunk/core/src/test/org/apache/ldap/server/authz/AuthorizationServiceAsNonAdminTest.java Thu Jun 23 20:08:31 2005
@@ -17,17 +17,18 @@
package org.apache.ldap.server.authz;
-import org.apache.ldap.common.exception.LdapNoPermissionException;
-import org.apache.ldap.common.message.LockableAttributesImpl;
-import org.apache.ldap.server.AbstractNonAdminTestCase;
-import org.apache.ldap.server.db.DbSearchResult;
+import java.util.HashSet;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
import javax.naming.directory.Attributes;
import javax.naming.directory.DirContext;
import javax.naming.directory.SearchControls;
-import java.util.HashSet;
+import javax.naming.directory.SearchResult;
+
+import org.apache.ldap.common.exception.LdapNoPermissionException;
+import org.apache.ldap.common.message.LockableAttributesImpl;
+import org.apache.ldap.server.AbstractNonAdminTestCase;
/**
@@ -109,7 +110,7 @@
"(objectClass=*)", controls );
while ( list.hasMore() )
{
- DbSearchResult result = ( DbSearchResult ) list.next();
+ SearchResult result = ( SearchResult ) list.next();
set.add( result.getName() );
}
Modified: directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/ListAsNonAdminTest.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/ListAsNonAdminTest.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/ListAsNonAdminTest.java (original)
+++ directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/ListAsNonAdminTest.java Thu Jun 23 20:08:31 2005
@@ -17,13 +17,13 @@
package org.apache.ldap.server.jndi;
+import java.util.HashSet;
+
import javax.naming.NameClassPair;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
import org.apache.ldap.server.AbstractNonAdminTestCase;
-
-import java.util.HashSet;
/**
Modified: directory/apacheds/trunk/core/src/test/org/apache/ldap/server/operational/OperationalAttributeServiceTest.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/test/org/apache/ldap/server/operational/OperationalAttributeServiceTest.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/org/apache/ldap/server/operational/OperationalAttributeServiceTest.java (original)
+++ directory/apacheds/trunk/core/src/test/org/apache/ldap/server/operational/OperationalAttributeServiceTest.java Thu Jun 23 20:08:31 2005
@@ -82,8 +82,6 @@
SearchResult result = ( SearchResult ) list.next();
list.close();
- System.out.println( result );
-
assertNotNull( result.getAttributes().get( "ou" ) );
assertNotNull( result.getAttributes().get( CREATORS_NAME ) );
assertNotNull( result.getAttributes().get( CREATE_TIMESTAMP ) );
Modified: directory/apacheds/trunk/core/src/test/org/apache/ldap/server/prefs/PreferencesUtilsTest.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/test/org/apache/ldap/server/prefs/PreferencesUtilsTest.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/org/apache/ldap/server/prefs/PreferencesUtilsTest.java (original)
+++ directory/apacheds/trunk/core/src/test/org/apache/ldap/server/prefs/PreferencesUtilsTest.java Thu Jun 23 20:08:31 2005
@@ -17,10 +17,10 @@
package org.apache.ldap.server.prefs;
-import junit.framework.TestCase;
-
import javax.naming.Name;
import javax.naming.NamingException;
+
+import junit.framework.TestCase;
/**