o Moved ServerDNConstants class from shared-ldap to core-constants (the contained constants are not LDAP related, but ADS related)
o Cleaned some imports
git-svn-id: https://svn.apache.org/repos/asf/directory/apacheds/branches/bigbang@602753 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java b/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
index eb138fd..6702441 100644
--- a/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
+++ b/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
@@ -27,15 +27,37 @@
import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore;
import org.apache.directory.server.schema.SerializableComparator;
-import org.apache.directory.server.schema.bootstrap.*;
-import org.apache.directory.server.schema.registries.*;
+import org.apache.directory.server.schema.bootstrap.ApacheSchema;
+import org.apache.directory.server.schema.bootstrap.ApachemetaSchema;
+import org.apache.directory.server.schema.bootstrap.BootstrapSchema;
+import org.apache.directory.server.schema.bootstrap.BootstrapSchemaLoader;
+import org.apache.directory.server.schema.bootstrap.CoreSchema;
+import org.apache.directory.server.schema.bootstrap.Schema;
+import org.apache.directory.server.schema.bootstrap.SystemSchema;
+import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
+import org.apache.directory.server.schema.registries.ComparatorRegistry;
+import org.apache.directory.server.schema.registries.DefaultOidRegistry;
+import org.apache.directory.server.schema.registries.DefaultRegistries;
+import org.apache.directory.server.schema.registries.MatchingRuleRegistry;
+import org.apache.directory.server.schema.registries.NormalizerRegistry;
+import org.apache.directory.server.schema.registries.ObjectClassRegistry;
+import org.apache.directory.server.schema.registries.Registries;
+import org.apache.directory.server.schema.registries.SyntaxCheckerRegistry;
+import org.apache.directory.server.schema.registries.SyntaxRegistry;
+//import org.apache.directory.server.schema.bootstrap.*;
+//import org.apache.directory.server.schema.registries.*;
import org.apache.directory.server.utils.AttributesFactory;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.message.AttributeImpl;
import org.apache.directory.shared.ldap.message.AttributesImpl;
import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.schema.*;
+//import org.apache.directory.shared.ldap.schema.*;
+import org.apache.directory.shared.ldap.schema.AttributeType;
+import org.apache.directory.shared.ldap.schema.MatchingRule;
+import org.apache.directory.shared.ldap.schema.ObjectClass;
+import org.apache.directory.shared.ldap.schema.SchemaObject;
+import org.apache.directory.shared.ldap.schema.Syntax;
import org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker;
import org.apache.directory.shared.ldap.util.DateUtils;
import org.apache.maven.plugin.AbstractMojo;
@@ -54,7 +76,14 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
/**
@@ -714,7 +743,7 @@
{
try
{
- Class schemaClass = cl.loadClass( bootstrapSchemaClasses[ii] );
+ Class<?> schemaClass = cl.loadClass( bootstrapSchemaClasses[ii] );
schema = ( BootstrapSchema ) schemaClass.newInstance();
schemas.put( schema.getSchemaName(), schema );
}
diff --git a/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java b/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java
index 203c731..10c652b 100644
--- a/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java
@@ -20,14 +20,13 @@
package org.apache.directory.server.core.authz;
+import org.apache.directory.server.constants.ServerDNConstants;
import org.apache.directory.server.core.DefaultDirectoryService;
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.integ.DirectoryServiceFactory;
import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
-import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.server.core.subtree.SubentryInterceptor;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.constants.ServerDNConstants;
import org.apache.directory.shared.ldap.message.AttributeImpl;
import org.apache.directory.shared.ldap.message.AttributesImpl;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -203,7 +202,9 @@
group.put( objectClass );
objectClass.add( "top" );
objectClass.add( "groupOfUniqueNames" );
- group.put( "uniqueMember", PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED );
+
+ // TODO might be ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED
+ group.put( "uniqueMember", "uid=admin, ou=system" );
adminCtx.createSubcontext( "cn=" + groupName + ",ou=groups", group );
return new LdapDN( "cn=" + groupName + ",ou=groups,ou=system" );
}
diff --git a/core-shared/pom.xml b/core-shared/pom.xml
index 2b738bd..bb42f4c 100644
--- a/core-shared/pom.xml
+++ b/core-shared/pom.xml
@@ -30,6 +30,14 @@
Shared classes between the core plugin and the core to prevent cyclic
dependencies since the core uses the core plugin.
</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-core-constants</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ </dependencies>
<packaging>jar</packaging>
</project>
diff --git a/core-shared/src/main/java/org/apache/directory/server/schema/bootstrap/AbstractBootstrapSchema.java b/core-shared/src/main/java/org/apache/directory/server/schema/bootstrap/AbstractBootstrapSchema.java
index 628f71d..1e7a9de 100755
--- a/core-shared/src/main/java/org/apache/directory/server/schema/bootstrap/AbstractBootstrapSchema.java
+++ b/core-shared/src/main/java/org/apache/directory/server/schema/bootstrap/AbstractBootstrapSchema.java
@@ -20,6 +20,7 @@
package org.apache.directory.server.schema.bootstrap;
+import org.apache.directory.server.constants.ServerDNConstants;
import org.apache.directory.shared.ldap.util.ArrayUtils;
import org.apache.directory.shared.ldap.util.ClassUtils;
@@ -33,7 +34,7 @@
public class AbstractBootstrapSchema implements BootstrapSchema
{
protected static final String[] DEFAULT_DEPS = ArrayUtils.EMPTY_STRING_ARRAY;
- private static final String DEFAULT_OWNER = "uid=admin,ou=system";
+ private static final String DEFAULT_OWNER = ServerDNConstants.ADMIN_SYSTEM_DN;
private static final String DEFAULT_SCHEMA_NAME = "default";
private static final String DEFAULT_PACKAGE_NAME = AbstractBootstrapSchema.class.getPackage().getName();
diff --git a/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java b/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
index 95d1f89..4c3751b 100644
--- a/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
+++ b/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
@@ -20,18 +20,27 @@
package org.apache.directory.server.core;
+import org.apache.directory.server.constants.ServerDNConstants;
import org.apache.directory.server.core.authn.AuthenticationInterceptor;
import org.apache.directory.server.core.authn.LdapPrincipal;
import org.apache.directory.server.core.authz.AciAuthorizationInterceptor;
import org.apache.directory.server.core.authz.DefaultAuthorizationInterceptor;
-import org.apache.directory.server.core.changelog.*;
+import org.apache.directory.server.core.changelog.ChangeLog;
+import org.apache.directory.server.core.changelog.ChangeLogEvent;
+import org.apache.directory.server.core.changelog.ChangeLogInterceptor;
+import org.apache.directory.server.core.changelog.DefaultChangeLog;
+import org.apache.directory.server.core.changelog.Tag;
import org.apache.directory.server.core.collective.CollectiveAttributeInterceptor;
import org.apache.directory.server.core.cursor.Cursor;
import org.apache.directory.server.core.event.EventInterceptor;
import org.apache.directory.server.core.exception.ExceptionInterceptor;
import org.apache.directory.server.core.interceptor.Interceptor;
import org.apache.directory.server.core.interceptor.InterceptorChain;
-import org.apache.directory.server.core.interceptor.context.*;
+import org.apache.directory.server.core.interceptor.context.AddContextPartitionOperationContext;
+import org.apache.directory.server.core.interceptor.context.AddOperationContext;
+import org.apache.directory.server.core.interceptor.context.EntryOperationContext;
+import org.apache.directory.server.core.interceptor.context.LookupOperationContext;
+import org.apache.directory.server.core.interceptor.context.RemoveContextPartitionOperationContext;
import org.apache.directory.server.core.jndi.DeadContext;
import org.apache.directory.server.core.jndi.ServerLdapContext;
import org.apache.directory.server.core.normalization.NormalizationInterceptor;
@@ -44,11 +53,20 @@
import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
import org.apache.directory.server.core.referral.ReferralInterceptor;
-import org.apache.directory.server.core.schema.*;
+import org.apache.directory.server.core.schema.PartitionSchemaLoader;
+import org.apache.directory.server.core.schema.SchemaInterceptor;
+import org.apache.directory.server.core.schema.SchemaOperationControl;
+import org.apache.directory.server.core.schema.SchemaPartitionDao;
+import org.apache.directory.server.core.schema.SchemaService;
import org.apache.directory.server.core.subtree.SubentryInterceptor;
import org.apache.directory.server.core.trigger.TriggerInterceptor;
import org.apache.directory.server.schema.SerializableComparator;
-import org.apache.directory.server.schema.bootstrap.*;
+import org.apache.directory.server.schema.bootstrap.ApacheSchema;
+import org.apache.directory.server.schema.bootstrap.ApachemetaSchema;
+import org.apache.directory.server.schema.bootstrap.BootstrapSchemaLoader;
+import org.apache.directory.server.schema.bootstrap.CoreSchema;
+import org.apache.directory.server.schema.bootstrap.Schema;
+import org.apache.directory.server.schema.bootstrap.SystemSchema;
import org.apache.directory.server.schema.bootstrap.partition.DbFileListing;
import org.apache.directory.server.schema.bootstrap.partition.SchemaPartitionExtractor;
import org.apache.directory.server.schema.registries.DefaultOidRegistry;
@@ -58,7 +76,6 @@
import org.apache.directory.shared.ldap.NotImplementedException;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.constants.ServerDNConstants;
import org.apache.directory.shared.ldap.exception.LdapAuthenticationNotSupportedException;
import org.apache.directory.shared.ldap.exception.LdapConfigurationException;
import org.apache.directory.shared.ldap.exception.LdapNamingException;
@@ -82,7 +99,12 @@
import javax.naming.ldap.LdapContext;
import java.io.File;
import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
/**
@@ -528,7 +550,6 @@
return new DeadContext();
}
- //noinspection unchecked
Hashtable<String, Object> environment = new Hashtable<String, Object>();
environment.remove( Context.SECURITY_PRINCIPAL );
environment.remove( Context.SECURITY_CREDENTIALS );
@@ -709,7 +730,7 @@
showSecurityWarnings();
started = true;
- adminDn = new LdapDN( DefaultPartitionNexus.ADMIN_PRINCIPAL_NORMALIZED );
+ adminDn = new LdapDN( ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED );
adminDn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
if ( !testEntries.isEmpty() )
@@ -915,7 +936,7 @@
attributes.put( SchemaConstants.DISPLAY_NAME_AT, "Directory Superuser" );
attributes.put( SchemaConstants.CN_AT, "system administrator" );
attributes.put( SchemaConstants.SN_AT, "administrator" );
- attributes.put( SchemaConstants.CREATORS_NAME_AT, PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED );
+ attributes.put( SchemaConstants.CREATORS_NAME_AT, ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED );
attributes.put( SchemaConstants.CREATE_TIMESTAMP_AT, DateUtils.getGeneralizedTime() );
attributes.put( SchemaConstants.DISPLAY_NAME_AT, "Directory Superuser" );
@@ -942,7 +963,7 @@
attributes.put( objectClass );
attributes.put( SchemaConstants.OU_AT, "users" );
- attributes.put( SchemaConstants.CREATORS_NAME_AT, PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED );
+ attributes.put( SchemaConstants.CREATORS_NAME_AT, ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED );
attributes.put( SchemaConstants.CREATE_TIMESTAMP_AT, DateUtils.getGeneralizedTime() );
partitionNexus.add( new AddOperationContext( userDn, attributes ) );
@@ -966,7 +987,7 @@
attributes.put( objectClass );
attributes.put( SchemaConstants.OU_AT, "groups" );
- attributes.put( SchemaConstants.CREATORS_NAME_AT, PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED );
+ attributes.put( SchemaConstants.CREATORS_NAME_AT, ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED );
attributes.put( SchemaConstants.CREATE_TIMESTAMP_AT, DateUtils.getGeneralizedTime() );
partitionNexus.add( new AddOperationContext( groupDn, attributes ) );
@@ -989,8 +1010,8 @@
objectClass.add( SchemaConstants.GROUP_OF_UNIQUE_NAMES_OC );
attributes.put( objectClass );
attributes.put( SchemaConstants.CN_AT, "Administrators" );
- attributes.put( SchemaConstants.UNIQUE_MEMBER_AT, PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED );
- attributes.put( SchemaConstants.CREATORS_NAME_AT, PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED );
+ attributes.put( SchemaConstants.UNIQUE_MEMBER_AT, ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED );
+ attributes.put( SchemaConstants.CREATORS_NAME_AT, ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED );
attributes.put( SchemaConstants.CREATE_TIMESTAMP_AT, DateUtils.getGeneralizedTime() );
partitionNexus.add( new AddOperationContext( name, attributes ) );
@@ -1034,7 +1055,7 @@
attributes.put( objectClass );
attributes.put( SchemaConstants.OU_AT, "configuration" );
- attributes.put( SchemaConstants.CREATORS_NAME_AT, PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED );
+ attributes.put( SchemaConstants.CREATORS_NAME_AT, ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED );
attributes.put( SchemaConstants.CREATE_TIMESTAMP_AT, DateUtils.getGeneralizedTime() );
partitionNexus.add( new AddOperationContext( configurationDn, attributes ) );
@@ -1058,7 +1079,7 @@
attributes.put( objectClass );
attributes.put( SchemaConstants.OU_AT, "partitions" );
- attributes.put( SchemaConstants.CREATORS_NAME_AT, PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED );
+ attributes.put( SchemaConstants.CREATORS_NAME_AT, ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED );
attributes.put( SchemaConstants.CREATE_TIMESTAMP_AT, DateUtils.getGeneralizedTime() );
partitionNexus.add( new AddOperationContext( partitionsDn, attributes ) );
@@ -1082,7 +1103,7 @@
attributes.put( objectClass );
attributes.put( SchemaConstants.OU_AT, "services" );
- attributes.put( SchemaConstants.CREATORS_NAME_AT, PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED );
+ attributes.put( SchemaConstants.CREATORS_NAME_AT, ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED );
attributes.put( SchemaConstants.CREATE_TIMESTAMP_AT, DateUtils.getGeneralizedTime() );
partitionNexus.add( new AddOperationContext( servicesDn, attributes ) );
@@ -1106,7 +1127,7 @@
attributes.put( objectClass );
attributes.put( SchemaConstants.OU_AT, "interceptors" );
- attributes.put( SchemaConstants.CREATORS_NAME_AT, PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED );
+ attributes.put( SchemaConstants.CREATORS_NAME_AT, ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED );
attributes.put( SchemaConstants.CREATE_TIMESTAMP_AT, DateUtils.getGeneralizedTime() );
partitionNexus.add( new AddOperationContext( interceptorsDn, attributes ) );
@@ -1131,7 +1152,7 @@
attributes.put( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.EXTENSIBLE_OBJECT_OC );
attributes.put( "prefNodeName", "sysPrefRoot" );
- attributes.put( SchemaConstants.CREATORS_NAME_AT, PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED );
+ attributes.put( SchemaConstants.CREATORS_NAME_AT, ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED );
attributes.put( SchemaConstants.CREATE_TIMESTAMP_AT, DateUtils.getGeneralizedTime() );
partitionNexus.add( new AddOperationContext( sysPrefRootDn, attributes ) );
diff --git a/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java b/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
index 5d45be2..6fcd869 100644
--- a/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
+++ b/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
@@ -20,11 +20,34 @@
package org.apache.directory.server.core.authn;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.interceptor.BaseInterceptor;
import org.apache.directory.server.core.interceptor.Interceptor;
import org.apache.directory.server.core.interceptor.NextInterceptor;
-import org.apache.directory.server.core.interceptor.context.*;
+import org.apache.directory.server.core.interceptor.context.AddOperationContext;
+import org.apache.directory.server.core.interceptor.context.BindOperationContext;
+import org.apache.directory.server.core.interceptor.context.DeleteOperationContext;
+import org.apache.directory.server.core.interceptor.context.EntryOperationContext;
+import org.apache.directory.server.core.interceptor.context.GetMatchedNameOperationContext;
+import org.apache.directory.server.core.interceptor.context.GetRootDSEOperationContext;
+import org.apache.directory.server.core.interceptor.context.GetSuffixOperationContext;
+import org.apache.directory.server.core.interceptor.context.ListOperationContext;
+import org.apache.directory.server.core.interceptor.context.ListSuffixOperationContext;
+import org.apache.directory.server.core.interceptor.context.LookupOperationContext;
+import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
+import org.apache.directory.server.core.interceptor.context.MoveAndRenameOperationContext;
+import org.apache.directory.server.core.interceptor.context.MoveOperationContext;
+import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
+import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
import org.apache.directory.server.core.invocation.InvocationStack;
import org.apache.directory.server.core.jndi.LdapJndiProperties;
import org.apache.directory.server.core.jndi.ServerContext;
@@ -41,7 +64,6 @@
import javax.naming.NamingException;
import javax.naming.directory.Attributes;
import javax.naming.directory.SearchResult;
-import java.util.*;
/**
diff --git a/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java b/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
index 06c1343..3cad96c 100644
--- a/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
+++ b/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
@@ -20,6 +20,7 @@
package org.apache.directory.server.core.authz;
+import org.apache.directory.server.constants.ServerDNConstants;
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.authn.LdapPrincipal;
import org.apache.directory.server.core.authz.support.ACDFEngine;
@@ -28,13 +29,23 @@
import org.apache.directory.server.core.interceptor.BaseInterceptor;
import org.apache.directory.server.core.interceptor.InterceptorChain;
import org.apache.directory.server.core.interceptor.NextInterceptor;
-import org.apache.directory.server.core.interceptor.context.*;
+import org.apache.directory.server.core.interceptor.context.AddOperationContext;
+import org.apache.directory.server.core.interceptor.context.CompareOperationContext;
+import org.apache.directory.server.core.interceptor.context.DeleteOperationContext;
+import org.apache.directory.server.core.interceptor.context.EntryOperationContext;
+import org.apache.directory.server.core.interceptor.context.GetMatchedNameOperationContext;
+import org.apache.directory.server.core.interceptor.context.ListOperationContext;
+import org.apache.directory.server.core.interceptor.context.LookupOperationContext;
+import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
+import org.apache.directory.server.core.interceptor.context.MoveAndRenameOperationContext;
+import org.apache.directory.server.core.interceptor.context.MoveOperationContext;
+import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
+import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
import org.apache.directory.server.core.invocation.Invocation;
import org.apache.directory.server.core.invocation.InvocationStack;
import org.apache.directory.server.core.jndi.ServerContext;
import org.apache.directory.server.core.jndi.ServerLdapContext;
import org.apache.directory.server.core.partition.PartitionNexusProxy;
-import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.server.core.subtree.SubentryInterceptor;
import org.apache.directory.server.schema.ConcreteNameComponentNormalizer;
import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
@@ -58,10 +69,18 @@
import javax.naming.Name;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
-import javax.naming.directory.*;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
import java.text.ParseException;
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
/**
@@ -480,7 +499,7 @@
private boolean isTheAdministrator( LdapDN normalizedDn )
{
- return normalizedDn.getNormName().equals( PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED );
+ return normalizedDn.getNormName().equals( ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED );
}
diff --git a/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java b/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java
index 6639f5c..9ec2bf6 100644
--- a/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java
+++ b/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java
@@ -20,20 +20,27 @@
package org.apache.directory.server.core.authz;
+import org.apache.directory.server.constants.ServerDNConstants;
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.enumeration.SearchResultFilter;
import org.apache.directory.server.core.enumeration.SearchResultFilteringEnumeration;
import org.apache.directory.server.core.interceptor.BaseInterceptor;
import org.apache.directory.server.core.interceptor.Interceptor;
import org.apache.directory.server.core.interceptor.NextInterceptor;
-import org.apache.directory.server.core.interceptor.context.*;
+import org.apache.directory.server.core.interceptor.context.DeleteOperationContext;
+import org.apache.directory.server.core.interceptor.context.ListOperationContext;
+import org.apache.directory.server.core.interceptor.context.LookupOperationContext;
+import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
+import org.apache.directory.server.core.interceptor.context.MoveAndRenameOperationContext;
+import org.apache.directory.server.core.interceptor.context.MoveOperationContext;
+import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
+import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
import org.apache.directory.server.core.invocation.Invocation;
import org.apache.directory.server.core.invocation.InvocationStack;
import org.apache.directory.server.core.jndi.ServerContext;
import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.constants.ServerDNConstants;
import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
import org.apache.directory.shared.ldap.message.ServerSearchResult;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -230,7 +237,7 @@
private boolean isTheAdministrator( LdapDN normalizedDn )
{
- return normalizedDn.getNormName().equals( PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED );
+ return normalizedDn.getNormName().equals( ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED );
}
@@ -293,7 +300,7 @@
return;
}
- if ( dn.getNormName().equals( PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED ) )
+ if ( dn.getNormName().equals( ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED ) )
{
String msg = "User " + principalDn.getUpName();
msg += " does not have permission to modify the account of the";
diff --git a/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java b/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java
index c24beb8..ea8a86a 100644
--- a/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java
+++ b/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java
@@ -19,12 +19,19 @@
*/
package org.apache.directory.server.core.authz;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.directory.server.constants.ServerDNConstants;
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.constants.ServerDNConstants;
import org.apache.directory.shared.ldap.filter.BranchNode;
import org.apache.directory.shared.ldap.filter.EqualityNode;
import org.apache.directory.shared.ldap.filter.OrNode;
@@ -40,8 +47,12 @@
import javax.naming.Name;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
-import javax.naming.directory.*;
-import java.util.*;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.ModificationItem;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
/**
@@ -447,7 +458,7 @@
*/
public final boolean isPrincipalAnAdministrator( LdapDN principalDn )
{
- if ( principalDn.getNormName().equals( PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED ) )
+ if ( principalDn.getNormName().equals( ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED ) )
{
return true;
}
diff --git a/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java b/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
index f58606f..c700350 100644
--- a/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
+++ b/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
@@ -51,7 +51,12 @@
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
import java.text.ParseException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
/**
diff --git a/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java b/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
index d2203d6..2086797 100755
--- a/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
+++ b/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
@@ -23,7 +23,13 @@
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.interceptor.BaseInterceptor;
import org.apache.directory.server.core.interceptor.NextInterceptor;
-import org.apache.directory.server.core.interceptor.context.*;
+import org.apache.directory.server.core.interceptor.context.AddOperationContext;
+import org.apache.directory.server.core.interceptor.context.DeleteOperationContext;
+import org.apache.directory.server.core.interceptor.context.LookupOperationContext;
+import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
+import org.apache.directory.server.core.interceptor.context.MoveAndRenameOperationContext;
+import org.apache.directory.server.core.interceptor.context.MoveOperationContext;
+import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
import org.apache.directory.server.core.invocation.Invocation;
import org.apache.directory.server.core.invocation.InvocationStack;
import org.apache.directory.server.core.partition.PartitionNexusProxy;
@@ -92,11 +98,13 @@
Entry forward = new Entry();
forward.setChangeType( ChangeType.Add );
forward.setDn( opContext.getDn().getUpName() );
- NamingEnumeration list = opContext.getEntry().getAll();
+ NamingEnumeration<? extends Attribute> list = opContext.getEntry().getAll();
+
while ( list.hasMore() )
{
forward.addAttribute( ( Attribute ) list.next() );
}
+
Entry reverse = LdifUtils.reverseAdd( opContext.getDn() );
changeLog.log( getPrincipal(), forward, reverse );
}
diff --git a/core/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java b/core/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java
index 70aea59..547f439 100644
--- a/core/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java
+++ b/core/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java
@@ -18,6 +18,24 @@
*/
package org.apache.directory.server.core.changelog;
+import java.io.BufferedReader;
+import java.io.EOFException;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.authn.LdapPrincipal;
import org.apache.directory.server.core.cursor.Cursor;
@@ -26,8 +44,6 @@
import org.apache.directory.shared.ldap.util.DateUtils;
import javax.naming.NamingException;
-import java.io.*;
-import java.util.*;
/**
diff --git a/core/src/main/java/org/apache/directory/server/core/changelog/OriginalChangeLogInterceptor.java b/core/src/main/java/org/apache/directory/server/core/changelog/OriginalChangeLogInterceptor.java
index 5f0343e..c103f30 100755
--- a/core/src/main/java/org/apache/directory/server/core/changelog/OriginalChangeLogInterceptor.java
+++ b/core/src/main/java/org/apache/directory/server/core/changelog/OriginalChangeLogInterceptor.java
@@ -21,7 +21,12 @@
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.interceptor.BaseInterceptor;
import org.apache.directory.server.core.interceptor.NextInterceptor;
-import org.apache.directory.server.core.interceptor.context.*;
+import org.apache.directory.server.core.interceptor.context.AddOperationContext;
+import org.apache.directory.server.core.interceptor.context.DeleteOperationContext;
+import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
+import org.apache.directory.server.core.interceptor.context.MoveAndRenameOperationContext;
+import org.apache.directory.server.core.interceptor.context.MoveOperationContext;
+import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
import org.apache.directory.server.core.invocation.InvocationStack;
import org.apache.directory.server.core.jndi.ServerContext;
import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
diff --git a/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java b/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
index 3f9b532..102faee 100644
--- a/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
+++ b/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
@@ -20,8 +20,27 @@
package org.apache.directory.server.core.partition;
+import org.apache.directory.server.constants.ServerDNConstants;
import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.interceptor.context.*;
+import org.apache.directory.server.core.interceptor.context.AddContextPartitionOperationContext;
+import org.apache.directory.server.core.interceptor.context.AddOperationContext;
+import org.apache.directory.server.core.interceptor.context.BindOperationContext;
+import org.apache.directory.server.core.interceptor.context.CompareOperationContext;
+import org.apache.directory.server.core.interceptor.context.DeleteOperationContext;
+import org.apache.directory.server.core.interceptor.context.EntryOperationContext;
+import org.apache.directory.server.core.interceptor.context.GetMatchedNameOperationContext;
+import org.apache.directory.server.core.interceptor.context.GetRootDSEOperationContext;
+import org.apache.directory.server.core.interceptor.context.GetSuffixOperationContext;
+import org.apache.directory.server.core.interceptor.context.ListOperationContext;
+import org.apache.directory.server.core.interceptor.context.ListSuffixOperationContext;
+import org.apache.directory.server.core.interceptor.context.LookupOperationContext;
+import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
+import org.apache.directory.server.core.interceptor.context.MoveAndRenameOperationContext;
+import org.apache.directory.server.core.interceptor.context.MoveOperationContext;
+import org.apache.directory.server.core.interceptor.context.RemoveContextPartitionOperationContext;
+import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
+import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
+import org.apache.directory.server.core.interceptor.context.UnbindOperationContext;
import org.apache.directory.server.core.partition.impl.btree.Index;
import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
@@ -33,14 +52,20 @@
import org.apache.directory.shared.ldap.MultiException;
import org.apache.directory.shared.ldap.NotImplementedException;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.constants.ServerDNConstants;
import org.apache.directory.shared.ldap.constants.SupportedSASLMechanisms;
import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeIdentifierException;
import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
import org.apache.directory.shared.ldap.exception.LdapNoSuchAttributeException;
import org.apache.directory.shared.ldap.filter.ExprNode;
import org.apache.directory.shared.ldap.filter.PresenceNode;
-import org.apache.directory.shared.ldap.message.*;
+import org.apache.directory.shared.ldap.message.AttributeImpl;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.CascadeControl;
+import org.apache.directory.shared.ldap.message.EntryChangeControl;
+import org.apache.directory.shared.ldap.message.ManageDsaITControl;
+import org.apache.directory.shared.ldap.message.PersistentSearchControl;
+import org.apache.directory.shared.ldap.message.ServerSearchResult;
+import org.apache.directory.shared.ldap.message.SubentriesControl;
import org.apache.directory.shared.ldap.message.extended.NoticeOfDisconnect;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -63,7 +88,17 @@
import javax.naming.directory.SearchResult;
import javax.naming.ldap.LdapContext;
import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
/**
@@ -128,7 +163,7 @@
// setup that root DSE
this.rootDSE = rootDSE;
Attribute attr = new AttributeImpl( SchemaConstants.SUBSCHEMA_SUBENTRY_AT );
- attr.add( GLOBAL_SCHEMA_SUBENTRY_DN );
+ attr.add( ServerDNConstants.SCHEMA_DN );
rootDSE.put( attr );
attr = new AttributeImpl( "supportedLDAPVersion" );
diff --git a/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java b/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java
index bca5c0b..782b7f4 100755
--- a/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java
+++ b/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java
@@ -30,6 +30,7 @@
import javax.naming.directory.Attributes;
import javax.naming.ldap.LdapContext;
+import org.apache.directory.server.constants.ServerDNConstants;
import org.apache.directory.server.core.interceptor.context.AddContextPartitionOperationContext;
import org.apache.directory.server.core.interceptor.context.CompareOperationContext;
import org.apache.directory.server.core.interceptor.context.GetMatchedNameOperationContext;
@@ -38,7 +39,6 @@
import org.apache.directory.server.core.interceptor.context.ListSuffixOperationContext;
import org.apache.directory.server.core.interceptor.context.RemoveContextPartitionOperationContext;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.constants.ServerDNConstants;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.NoOpNormalizer;
import org.apache.directory.shared.ldap.schema.OidNormalizer;
@@ -55,27 +55,13 @@
*/
public abstract class PartitionNexus implements Partition
{
- /** the default user principal or DN */
- //public final static String ADMIN_PRINCIPAL = "uid=admin,ou=system";
-
- /** the DN for the global schema subentry */
- public final static String GLOBAL_SCHEMA_SUBENTRY_DN = "cn=schema";
-
- /** the normalized user principal or DN */
- public final static String ADMIN_PRINCIPAL_NORMALIZED = "0.9.2342.19200300.100.1.1=admin,2.5.4.11=system";
-
/** the admin super user uid */
public final static String ADMIN_UID = "admin";
/** the initial admin passwd set on startup */
public static final String ADMIN_PASSWORD = "secret";
- /** the base dn under which all users reside */
- public final static String USERS_BASE_NAME = "ou=users,ou=system";
-
- /** the base dn under which all groups reside */
- public final static String GROUPS_BASE_NAME = "ou=groups,ou=system";
-
+
/**
* Gets the DN for the admin user.
*
@@ -132,7 +118,7 @@
try
{
- groupsBaseDn = new LdapDN( GROUPS_BASE_NAME );
+ groupsBaseDn = new LdapDN( ServerDNConstants.GROUPS_SYSTEM_DN );
}
catch ( NamingException e )
{
@@ -154,7 +140,7 @@
try
{
- usersBaseDn = new LdapDN( USERS_BASE_NAME );
+ usersBaseDn = new LdapDN( ServerDNConstants.USERS_SYSTEM_DN );
}
catch ( NamingException e )
{
diff --git a/core/src/main/java/org/apache/directory/server/core/schema/AbstractSchema.java b/core/src/main/java/org/apache/directory/server/core/schema/AbstractSchema.java
index d425a64..e849944 100644
--- a/core/src/main/java/org/apache/directory/server/core/schema/AbstractSchema.java
+++ b/core/src/main/java/org/apache/directory/server/core/schema/AbstractSchema.java
@@ -20,6 +20,7 @@
package org.apache.directory.server.core.schema;
+import org.apache.directory.server.constants.ServerDNConstants;
import org.apache.directory.server.schema.bootstrap.Schema;
@@ -32,7 +33,7 @@
public abstract class AbstractSchema implements Schema
{
private static final String[] NONE = new String[0];
- private static final String DEFAULT_OWNER = "uid=admin,ou=system";
+ private static final String DEFAULT_OWNER = ServerDNConstants.ADMIN_SYSTEM_DN;
private boolean disabled;
private String[] dependencies;
diff --git a/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java b/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java
index d665b8c..a977f81 100644
--- a/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java
+++ b/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java
@@ -20,19 +20,31 @@
package org.apache.directory.server.core.schema;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
import org.apache.directory.server.constants.MetaSchemaConstants;
+import org.apache.directory.server.constants.ServerDNConstants;
import org.apache.directory.server.core.interceptor.context.LookupOperationContext;
import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
import org.apache.directory.server.core.partition.Partition;
-import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.server.schema.bootstrap.Schema;
import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
import org.apache.directory.server.schema.registries.OidRegistry;
import org.apache.directory.server.schema.registries.Registries;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.constants.ServerDNConstants;
-import org.apache.directory.shared.ldap.filter.*;
+import org.apache.directory.shared.ldap.filter.AndNode;
+import org.apache.directory.shared.ldap.filter.BranchNode;
+import org.apache.directory.shared.ldap.filter.EqualityNode;
+import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.filter.OrNode;
+import org.apache.directory.shared.ldap.filter.PresenceNode;
+import org.apache.directory.shared.ldap.filter.SimpleNode;
import org.apache.directory.shared.ldap.message.AttributeImpl;
import org.apache.directory.shared.ldap.message.AliasDerefMode;
import org.apache.directory.shared.ldap.message.ModificationItemImpl;
@@ -49,8 +61,11 @@
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
-import javax.naming.directory.*;
-import java.util.*;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
/**
@@ -677,7 +692,7 @@
}
- public NamingEnumeration listAllNames() throws NamingException
+ public NamingEnumeration<SearchResult> listAllNames() throws NamingException
{
SearchControls searchControls = new SearchControls();
searchControls.setSearchScope( SearchControls.SUBTREE_SCOPE );
diff --git a/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java b/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
index c62fdc6..9620f5a 100644
--- a/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
+++ b/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
@@ -20,27 +20,32 @@
import org.apache.directory.server.constants.ApacheSchemaConstants;
+import org.apache.directory.server.constants.ServerDNConstants;
import org.apache.directory.server.core.interceptor.context.LookupOperationContext;
-import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
import org.apache.directory.server.schema.registries.Registries;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.constants.ServerDNConstants;
import org.apache.directory.shared.ldap.message.AttributeImpl;
import org.apache.directory.shared.ldap.message.AttributesImpl;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.schema.*;
+import org.apache.directory.shared.ldap.schema.AttributeType;
+import org.apache.directory.shared.ldap.schema.DITContentRule;
+import org.apache.directory.shared.ldap.schema.DITStructureRule;
+import org.apache.directory.shared.ldap.schema.MatchingRule;
+import org.apache.directory.shared.ldap.schema.MatchingRuleUse;
+import org.apache.directory.shared.ldap.schema.NameForm;
+import org.apache.directory.shared.ldap.schema.ObjectClass;
+import org.apache.directory.shared.ldap.schema.SchemaUtils;
+import org.apache.directory.shared.ldap.schema.Syntax;
import org.apache.directory.shared.ldap.schema.syntax.ComparatorDescription;
import org.apache.directory.shared.ldap.schema.syntax.NormalizerDescription;
import org.apache.directory.shared.ldap.schema.syntax.SyntaxCheckerDescription;
import org.apache.directory.shared.ldap.util.AttributeUtils;
-import org.apache.directory.shared.ldap.util.DateUtils;
import org.apache.directory.shared.ldap.util.ImmutableAttributesWrapper;
import javax.naming.NamingException;
import javax.naming.directory.Attribute;
import javax.naming.directory.Attributes;
-import java.util.Date;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
@@ -54,8 +59,6 @@
*/
public class SchemaService
{
- public static final String SCHEMA_SUBENTRY_DN = "cn=schema";
- public static final String SCHEMA_SUBENTRY_DN_NORMALIZED = "2.5.4.3=schema";
public static final String SCHEMA_AREA_DN = "ou=schema";
public static final String SCHEMA_AREA_DN_NORMALIZED = "2.5.4.11=schema";
@@ -96,14 +99,14 @@
public boolean isSchemaSubentry( String dnString ) throws NamingException
{
- if ( dnString.equalsIgnoreCase( SCHEMA_SUBENTRY_DN ) ||
- dnString.equalsIgnoreCase( SCHEMA_SUBENTRY_DN_NORMALIZED ) )
+ if ( dnString.equalsIgnoreCase( ServerDNConstants.SCHEMA_DN ) ||
+ dnString.equalsIgnoreCase( ServerDNConstants.SCHEMA_DN_NORMALIZED ) )
{
return true;
}
LdapDN dn = new LdapDN( dnString ).normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
- return dn.getNormName().equals( SCHEMA_SUBENTRY_DN_NORMALIZED );
+ return dn.getNormName().equals( ServerDNConstants.SCHEMA_DN_NORMALIZED );
}
diff --git a/core/src/main/java/org/apache/directory/server/core/trigger/SimpleTriggerExecutionAuthorizer.java b/core/src/main/java/org/apache/directory/server/core/trigger/SimpleTriggerExecutionAuthorizer.java
index 721d2b4..afdadb5 100644
--- a/core/src/main/java/org/apache/directory/server/core/trigger/SimpleTriggerExecutionAuthorizer.java
+++ b/core/src/main/java/org/apache/directory/server/core/trigger/SimpleTriggerExecutionAuthorizer.java
@@ -24,10 +24,10 @@
import javax.naming.InvalidNameException;
import javax.naming.NamingException;
+import org.apache.directory.server.constants.ServerDNConstants;
import org.apache.directory.server.core.invocation.Invocation;
import org.apache.directory.server.core.invocation.InvocationStack;
import org.apache.directory.server.core.jndi.ServerContext;
-import org.apache.directory.server.core.partition.PartitionNexusProxy;
import org.apache.directory.shared.ldap.name.LdapDN;
public class SimpleTriggerExecutionAuthorizer implements TriggerExecutionAuthorizer
@@ -38,7 +38,7 @@
{
try
{
- adminName = new LdapDN( PartitionNexusProxy.ADMIN_PRINCIPAL_NORMALIZED );
+ adminName = new LdapDN( ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED );
}
catch ( InvalidNameException e )
{
diff --git a/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/DefaultBindHandler.java b/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/DefaultBindHandler.java
index 6400c50..c97d9bd 100644
--- a/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/DefaultBindHandler.java
+++ b/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/DefaultBindHandler.java
@@ -20,6 +20,7 @@
package org.apache.directory.server.ldap.support;
+import org.apache.directory.server.constants.ServerDNConstants;
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.authn.LdapPrincipal;
import org.apache.directory.server.core.jndi.ServerLdapContext;
@@ -36,10 +37,14 @@
import org.apache.directory.server.ldap.support.bind.SaslFilter;
import org.apache.directory.server.protocol.shared.ServiceConfigurationException;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
-import org.apache.directory.shared.ldap.constants.ServerDNConstants;
import org.apache.directory.shared.ldap.constants.SupportedSASLMechanisms;
import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.message.*;
+import org.apache.directory.shared.ldap.message.BindRequest;
+import org.apache.directory.shared.ldap.message.BindResponse;
+import org.apache.directory.shared.ldap.message.LdapResult;
+import org.apache.directory.shared.ldap.message.ManageDsaITControl;
+import org.apache.directory.shared.ldap.message.MutableControl;
+import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.util.ExceptionUtils;
import org.apache.mina.common.IoFilterChain;
diff --git a/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/DefaultSearchHandler.java b/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/DefaultSearchHandler.java
index f4a526e..2a858b4 100644
--- a/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/DefaultSearchHandler.java
+++ b/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/DefaultSearchHandler.java
@@ -20,15 +20,25 @@
package org.apache.directory.server.ldap.support;
+import org.apache.directory.server.constants.ServerDNConstants;
import org.apache.directory.server.core.jndi.ServerLdapContext;
-import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.server.ldap.LdapServer;
import org.apache.directory.shared.ldap.constants.JndiPropertyConstants;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.exception.LdapException;
import org.apache.directory.shared.ldap.exception.OperationAbandonedException;
import org.apache.directory.shared.ldap.filter.PresenceNode;
-import org.apache.directory.shared.ldap.message.*;
+import org.apache.directory.shared.ldap.message.AbandonListener;
+import org.apache.directory.shared.ldap.message.LdapResult;
+import org.apache.directory.shared.ldap.message.ManageDsaITControl;
+import org.apache.directory.shared.ldap.message.PersistentSearchControl;
+import org.apache.directory.shared.ldap.message.ReferralImpl;
+import org.apache.directory.shared.ldap.message.Response;
+import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.message.ResultResponse;
+import org.apache.directory.shared.ldap.message.ScopeEnum;
+import org.apache.directory.shared.ldap.message.SearchRequest;
+import org.apache.directory.shared.ldap.message.SearchResponseDone;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.util.ArrayUtils;
import org.apache.directory.shared.ldap.util.ExceptionUtils;
@@ -249,7 +259,7 @@
controls = getSearchControls( req, ids, false, maxSize, maxTime );
}
else if ( ctx.getPrincipal().getName()
- .trim().equals( PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED ) )
+ .trim().equals( ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED ) )
{
controls = getSearchControls( req, ids, true, maxSize, maxTime );
}
diff --git a/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/AbstractSaslCallbackHandler.java b/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/AbstractSaslCallbackHandler.java
index 2f0ac0d..3f73753 100644
--- a/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/AbstractSaslCallbackHandler.java
+++ b/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/AbstractSaslCallbackHandler.java
@@ -20,6 +20,7 @@
package org.apache.directory.server.ldap.support.bind;
+import org.apache.directory.server.constants.ServerDNConstants;
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
import org.apache.directory.shared.ldap.exception.LdapException;
@@ -264,7 +265,7 @@
Hashtable<String, Object> env = new Hashtable<String, Object>();
env.put( Context.PROVIDER_URL, session.getAttribute( "baseDn" ) );
env.put( Context.INITIAL_CONTEXT_FACTORY, "org.apache.directory.server.core.jndi.CoreContextFactory" );
- env.put( Context.SECURITY_PRINCIPAL, "uid=admin,ou=system" );
+ env.put( Context.SECURITY_PRINCIPAL, ServerDNConstants.ADMIN_SYSTEM_DN );
env.put( Context.SECURITY_CREDENTIALS, "secret" );
env.put( Context.SECURITY_AUTHENTICATION, AuthenticationLevel.SIMPLE.toString() );
diff --git a/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/GracefulShutdownHandler.java b/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/GracefulShutdownHandler.java
index 99617a4..3437a32 100644
--- a/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/GracefulShutdownHandler.java
+++ b/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/GracefulShutdownHandler.java
@@ -20,9 +20,16 @@
package org.apache.directory.server.ldap.support.extended;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.directory.server.constants.ServerDNConstants;
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.jndi.ServerLdapContext;
-import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.server.ldap.ExtendedOperationHandler;
import org.apache.directory.server.ldap.LdapServer;
import org.apache.directory.server.ldap.SessionRegistry;
@@ -40,7 +47,6 @@
import javax.naming.NamingException;
import javax.naming.ldap.LdapContext;
-import java.util.*;
/**
@@ -95,7 +101,7 @@
// make sue only the administrator can issue this shutdown request if
// not we respond to the requestor with with insufficientAccessRights(50)
- if ( !slc.getPrincipal().getName().equalsIgnoreCase( PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED ) )
+ if ( !slc.getPrincipal().getName().equalsIgnoreCase( ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED ) )
{
if ( LOG.isInfoEnabled() )
{
diff --git a/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/LaunchDiagnosticUiHandler.java b/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/LaunchDiagnosticUiHandler.java
index 6a99e0c..156ebbc 100644
--- a/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/LaunchDiagnosticUiHandler.java
+++ b/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/LaunchDiagnosticUiHandler.java
@@ -32,6 +32,7 @@
import javax.naming.ldap.LdapContext;
import javax.swing.JFrame;
+import org.apache.directory.server.constants.ServerDNConstants;
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.interceptor.context.ListSuffixOperationContext;
import org.apache.directory.server.core.jndi.ServerLdapContext;
@@ -86,7 +87,7 @@
ServerLdapContext slc = ( ServerLdapContext ) ctx;
DirectoryService service = slc.getService();
- if ( !slc.getPrincipal().getName().equalsIgnoreCase( PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED ) )
+ if ( !slc.getPrincipal().getName().equalsIgnoreCase( ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED ) )
{
requestor.write( new LaunchDiagnosticUiResponse( req.getMessageId(),
ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS ) );
diff --git a/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java b/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
index a416a53..ce0e81a 100644
--- a/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
+++ b/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
@@ -22,6 +22,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.directory.server.constants.ApacheSchemaConstants;
+import org.apache.directory.server.constants.ServerDNConstants;
import org.apache.directory.server.core.DefaultDirectoryService;
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.authn.LdapPrincipal;
@@ -30,7 +31,6 @@
import org.apache.directory.server.protocol.shared.store.LdifLoadFilter;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.constants.ServerDNConstants;
import org.apache.directory.shared.ldap.message.AttributesImpl;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.util.StringTools;
diff --git a/server-tools/src/main/java/org/apache/directory/server/tools/CapacityTestCommand.java b/server-tools/src/main/java/org/apache/directory/server/tools/CapacityTestCommand.java
index 29d45f9..97b2e48 100644
--- a/server-tools/src/main/java/org/apache/directory/server/tools/CapacityTestCommand.java
+++ b/server-tools/src/main/java/org/apache/directory/server/tools/CapacityTestCommand.java
@@ -34,6 +34,7 @@
import org.apache.commons.cli.Options;
import org.apache.commons.lang.RandomStringUtils;
import org.apache.directory.daemon.AvailablePortFinder;
+import org.apache.directory.server.constants.ServerDNConstants;
import org.apache.directory.shared.ldap.constants.JndiPropertyConstants;
import org.apache.directory.shared.ldap.message.AttributesImpl;
@@ -92,7 +93,7 @@
Hashtable<String, Object> env = new Hashtable<String, Object>();
env.put( JndiPropertyConstants.JNDI_FACTORY_INITIAL, "com.sun.jndi.ldap.LdapCtxFactory" );
env.put( JndiPropertyConstants.JNDI_PROVIDER_URL, "ldap://" + host + ":" + port );
- env.put( "java.naming.security.principal", "uid=admin,ou=system" );
+ env.put( "java.naming.security.principal", ServerDNConstants.ADMIN_SYSTEM_DN );
env.put( JndiPropertyConstants.JNDI_SECURITY_CREDENTIALS, password );
env.put( JndiPropertyConstants.JNDI_SECURITY_AUTHENTICATION, "simple" );
diff --git a/server-tools/src/main/java/org/apache/directory/server/tools/ToolCommand.java b/server-tools/src/main/java/org/apache/directory/server/tools/ToolCommand.java
index f543c55..fee25ad 100644
--- a/server-tools/src/main/java/org/apache/directory/server/tools/ToolCommand.java
+++ b/server-tools/src/main/java/org/apache/directory/server/tools/ToolCommand.java
@@ -19,6 +19,8 @@
*/
package org.apache.directory.server.tools;
+import org.apache.directory.server.constants.ServerDNConstants;
+
/**
* Interface that must be extended by every type of command.
@@ -29,6 +31,6 @@
public final static int DEFAULT_PORT = 10389;
public final static String DEFAULT_HOST = "localhost";
public final static String DEFAULT_PASSWORD = "secret";
- public final static String DEFAULT_USER = "uid=admin,ou=system";
+ public final static String DEFAULT_USER = ServerDNConstants.ADMIN_SYSTEM_DN;
public final static String DEFAULT_AUTH = "simple";
}
diff --git a/server-tools/src/main/java/org/apache/directory/server/tools/commands/diagnosticcmd/DiagnosticCommandExecutor.java b/server-tools/src/main/java/org/apache/directory/server/tools/commands/diagnosticcmd/DiagnosticCommandExecutor.java
index 8517430..70842c5 100644
--- a/server-tools/src/main/java/org/apache/directory/server/tools/commands/diagnosticcmd/DiagnosticCommandExecutor.java
+++ b/server-tools/src/main/java/org/apache/directory/server/tools/commands/diagnosticcmd/DiagnosticCommandExecutor.java
@@ -21,6 +21,7 @@
import org.apache.directory.server.configuration.ApacheDS;
+import org.apache.directory.server.constants.ServerDNConstants;
import org.apache.directory.server.tools.ToolCommandListener;
import org.apache.directory.server.tools.execution.BaseToolCommandExecutor;
import org.apache.directory.server.tools.util.ListenerParameter;
@@ -107,7 +108,7 @@
Hashtable<String, Object> env = new Hashtable<String, Object>();
env.put( JndiPropertyConstants.JNDI_FACTORY_INITIAL, "com.sun.jndi.ldap.LdapCtxFactory" );
env.put( JndiPropertyConstants.JNDI_PROVIDER_URL, "ldap://" + host + ":" + port );
- env.put( "java.naming.security.principal", "uid=admin,ou=system" );
+ env.put( "java.naming.security.principal", ServerDNConstants.ADMIN_SYSTEM_DN );
env.put( JndiPropertyConstants.JNDI_SECURITY_CREDENTIALS, password );
env.put( JndiPropertyConstants.JNDI_SECURITY_AUTHENTICATION, "simple" );
diff --git a/server-tools/src/main/java/org/apache/directory/server/tools/commands/disconnectnotificationcmd/DisconnectNotificationCommandCL.java b/server-tools/src/main/java/org/apache/directory/server/tools/commands/disconnectnotificationcmd/DisconnectNotificationCommandCL.java
index f8eead3..02ff078 100644
--- a/server-tools/src/main/java/org/apache/directory/server/tools/commands/disconnectnotificationcmd/DisconnectNotificationCommandCL.java
+++ b/server-tools/src/main/java/org/apache/directory/server/tools/commands/disconnectnotificationcmd/DisconnectNotificationCommandCL.java
@@ -24,6 +24,7 @@
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.directory.daemon.AvailablePortFinder;
+import org.apache.directory.server.constants.ServerDNConstants;
import org.apache.directory.server.tools.execution.ToolCommandExecutorStub;
import org.apache.directory.server.tools.request.BaseToolCommandCL;
import org.apache.directory.server.tools.util.Parameter;
@@ -39,7 +40,7 @@
*/
public class DisconnectNotificationCommandCL extends BaseToolCommandCL
{
- private String bindDN = "uid=admin,ou=system";
+ private String bindDN = ServerDNConstants.ADMIN_SYSTEM_DN;
public DisconnectNotificationCommandCL()
diff --git a/server-tools/src/main/java/org/apache/directory/server/tools/commands/disconnectnotificationcmd/DisconnectNotificationCommandExecutor.java b/server-tools/src/main/java/org/apache/directory/server/tools/commands/disconnectnotificationcmd/DisconnectNotificationCommandExecutor.java
index eeee95f..662ff48 100644
--- a/server-tools/src/main/java/org/apache/directory/server/tools/commands/disconnectnotificationcmd/DisconnectNotificationCommandExecutor.java
+++ b/server-tools/src/main/java/org/apache/directory/server/tools/commands/disconnectnotificationcmd/DisconnectNotificationCommandExecutor.java
@@ -21,6 +21,7 @@
import org.apache.directory.server.configuration.ApacheDS;
+import org.apache.directory.server.constants.ServerDNConstants;
import org.apache.directory.server.tools.ToolCommandListener;
import org.apache.directory.server.tools.execution.BaseToolCommandExecutor;
import org.apache.directory.server.tools.util.ListenerParameter;
@@ -55,7 +56,7 @@
public static final String BINDDN_PARAMETER = "bindDN";
private String bindDN;
- public static final String DEFAULT_BINDDN = "uid=admin,ou=system";
+ public static final String DEFAULT_BINDDN = ServerDNConstants.ADMIN_SYSTEM_DN;
UnsolicitedNotification notification;
boolean canceled;
diff --git a/server-tools/src/main/java/org/apache/directory/server/tools/commands/gracefulshutdowncmd/GracefulShutdownCommandExecutor.java b/server-tools/src/main/java/org/apache/directory/server/tools/commands/gracefulshutdowncmd/GracefulShutdownCommandExecutor.java
index 2f7ba0c..1c44291 100644
--- a/server-tools/src/main/java/org/apache/directory/server/tools/commands/gracefulshutdowncmd/GracefulShutdownCommandExecutor.java
+++ b/server-tools/src/main/java/org/apache/directory/server/tools/commands/gracefulshutdowncmd/GracefulShutdownCommandExecutor.java
@@ -21,6 +21,7 @@
import org.apache.directory.server.configuration.ApacheDS;
+import org.apache.directory.server.constants.ServerDNConstants;
import org.apache.directory.server.tools.ToolCommandListener;
import org.apache.directory.server.tools.execution.BaseToolCommandExecutor;
import org.apache.directory.server.tools.util.ListenerParameter;
@@ -130,7 +131,7 @@
Hashtable<String, Object> env = new Hashtable<String, Object>();
env.put( JndiPropertyConstants.JNDI_FACTORY_INITIAL, "com.sun.jndi.ldap.LdapCtxFactory" );
env.put( JndiPropertyConstants.JNDI_PROVIDER_URL, "ldap://" + host + ":" + port );
- env.put( "java.naming.security.principal", "uid=admin,ou=system" );
+ env.put( "java.naming.security.principal", ServerDNConstants.ADMIN_SYSTEM_DN );
env.put( JndiPropertyConstants.JNDI_SECURITY_CREDENTIALS, password );
env.put( JndiPropertyConstants.JNDI_SECURITY_AUTHENTICATION, "simple" );
diff --git a/server-tools/src/main/java/org/apache/directory/server/tools/commands/storedprocedurecmd/StoredProcedureCommandExecutor.java b/server-tools/src/main/java/org/apache/directory/server/tools/commands/storedprocedurecmd/StoredProcedureCommandExecutor.java
index 7e349ee..251b5f4 100644
--- a/server-tools/src/main/java/org/apache/directory/server/tools/commands/storedprocedurecmd/StoredProcedureCommandExecutor.java
+++ b/server-tools/src/main/java/org/apache/directory/server/tools/commands/storedprocedurecmd/StoredProcedureCommandExecutor.java
@@ -20,6 +20,7 @@
package org.apache.directory.server.tools.commands.storedprocedurecmd;
import org.apache.directory.server.configuration.ApacheDS;
+import org.apache.directory.server.constants.ServerDNConstants;
import org.apache.directory.server.tools.ToolCommandListener;
import org.apache.directory.server.tools.execution.BaseToolCommandExecutor;
import org.apache.directory.server.tools.util.ListenerParameter;
@@ -105,7 +106,7 @@
Hashtable<String, Object> env = new Hashtable<String, Object>();
env.put( JndiPropertyConstants.JNDI_FACTORY_INITIAL, "com.sun.jndi.ldap.LdapCtxFactory" );
env.put( JndiPropertyConstants.JNDI_PROVIDER_URL, "ldap://" + host + ":" + port );
- env.put( "java.naming.security.principal", "uid=admin,ou=system" );
+ env.put( "java.naming.security.principal", ServerDNConstants.ADMIN_SYSTEM_DN );
env.put( JndiPropertyConstants.JNDI_SECURITY_CREDENTIALS, password );
env.put( JndiPropertyConstants.JNDI_SECURITY_AUTHENTICATION, "simple" );
diff --git a/server-unit/src/main/java/org/apache/directory/server/unit/AbstractServerTest.java b/server-unit/src/main/java/org/apache/directory/server/unit/AbstractServerTest.java
index e0d8d91..44199d0 100644
--- a/server-unit/src/main/java/org/apache/directory/server/unit/AbstractServerTest.java
+++ b/server-unit/src/main/java/org/apache/directory/server/unit/AbstractServerTest.java
@@ -23,12 +23,12 @@
import junit.framework.AssertionFailedError;
import junit.framework.TestCase;
import org.apache.commons.io.FileUtils;
+import org.apache.directory.server.constants.ServerDNConstants;
import org.apache.directory.server.core.DefaultDirectoryService;
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.jndi.CoreContextFactory;
import org.apache.directory.server.ldap.LdapServer;
import org.apache.directory.server.protocol.shared.SocketAcceptor;
-import org.apache.directory.shared.ldap.constants.ServerDNConstants;
import org.apache.directory.shared.ldap.exception.LdapConfigurationException;
import org.apache.directory.shared.ldap.ldif.Entry;
import org.apache.directory.shared.ldap.ldif.LdifReader;
@@ -170,7 +170,7 @@
*/
protected LdapContext getWiredContext() throws NamingException
{
- return getWiredContext( "uid=admin,ou=system", "secret" );
+ return getWiredContext( ServerDNConstants.ADMIN_SYSTEM_DN, "secret" );
}
diff --git a/server-unit/src/test/java/org/apache/directory/server/ChangeListener.java b/server-unit/src/test/java/org/apache/directory/server/ChangeListener.java
index 3cfce14..20c8eb0 100644
--- a/server-unit/src/test/java/org/apache/directory/server/ChangeListener.java
+++ b/server-unit/src/test/java/org/apache/directory/server/ChangeListener.java
@@ -29,7 +29,7 @@
import javax.naming.ldap.HasControls;
import javax.naming.ldap.InitialLdapContext;
-import org.apache.directory.shared.ldap.codec.search.controls.EntryChangeControl;
+import org.apache.directory.shared.ldap.codec.search.controls.EntryChangeControlCodec;
import org.apache.directory.shared.ldap.codec.search.controls.EntryChangeControlDecoder;
import org.apache.directory.shared.ldap.message.PersistentSearchControl;
@@ -65,7 +65,7 @@
{
Control[] respCtls;
ctx.setRequestControls( ctxCtls );
- EntryChangeControl ecCtl = null;
+ EntryChangeControlCodec ecCtl = null;
NamingEnumeration list = ctx.search( "", "objectClass=*", null );
while ( list.hasMore() )
{
@@ -81,7 +81,7 @@
org.apache.directory.shared.ldap.message.EntryChangeControl.CONTROL_OID ) )
{
EntryChangeControlDecoder decoder = new EntryChangeControlDecoder();
- ecCtl = ( EntryChangeControl ) decoder.decode( respCtls[ii].getEncodedValue() );
+ ecCtl = ( EntryChangeControlCodec ) decoder.decode( respCtls[ii].getEncodedValue() );
}
}
}
diff --git a/server-unit/src/test/java/org/apache/directory/server/PersistentSearchTest.java b/server-unit/src/test/java/org/apache/directory/server/PersistentSearchTest.java
index f2ebb5e..249790a 100644
--- a/server-unit/src/test/java/org/apache/directory/server/PersistentSearchTest.java
+++ b/server-unit/src/test/java/org/apache/directory/server/PersistentSearchTest.java
@@ -43,7 +43,7 @@
import org.apache.directory.server.unit.AbstractServerTest;
import org.apache.directory.shared.ldap.codec.search.controls.ChangeType;
-import org.apache.directory.shared.ldap.codec.search.controls.EntryChangeControl;
+import org.apache.directory.shared.ldap.codec.search.controls.EntryChangeControlCodec;
import org.apache.directory.shared.ldap.codec.search.controls.EntryChangeControlDecoder;
import org.apache.directory.shared.ldap.message.AttributeImpl;
import org.apache.directory.shared.ldap.message.AttributesImpl;
@@ -691,7 +691,7 @@
ctx.setRequestControls( ctxCtls );
isReady = true;
list = ctx.search( "", "objectClass=*", null );
- EntryChangeControl ecControl = null;
+ EntryChangeControlCodec ecControl = null;
while ( list.hasMore() )
{
@@ -709,7 +709,7 @@
org.apache.directory.shared.ldap.message.EntryChangeControl.CONTROL_OID ) )
{
EntryChangeControlDecoder decoder = new EntryChangeControlDecoder();
- ecControl = ( EntryChangeControl ) decoder.decode( controls[ii].getEncodedValue() );
+ ecControl = ( EntryChangeControlCodec ) decoder.decode( controls[ii].getEncodedValue() );
}
}
}
@@ -742,10 +742,10 @@
class PSearchNotification extends SearchResult
{
private static final long serialVersionUID = 1L;
- final EntryChangeControl control;
+ final EntryChangeControlCodec control;
- public PSearchNotification(SearchResult result, EntryChangeControl control)
+ public PSearchNotification(SearchResult result, EntryChangeControlCodec control)
{
super( result.getName(), result.getClassName(), result.getObject(), result.getAttributes(), result
.isRelative() );
