You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2007/04/21 12:58:46 UTC
svn commit: r531016 - in /directory/apacheds/trunk:
core/src/main/java/org/apache/directory/server/core/
core/src/main/java/org/apache/directory/server/core/authn/
core/src/main/java/org/apache/directory/server/core/authz/
core/src/main/java/org/apache...
Author: elecharny
Date: Sat Apr 21 03:58:44 2007
New Revision: 531016
URL: http://svn.apache.org/viewvc?view=rev&rev=531016
Log:
Removed some useless imports
Don't use anymore strings into interceptor bypasses, but the service NAME constant.
Modified:
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationService.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationService.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/StartupConfiguration.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventService.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaManager.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerService.java
directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationService.java
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?view=diff&rev=531016&r1=531015&r2=531016
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Sat Apr 21 03:58:44 2007
@@ -557,7 +557,7 @@
partitionNexus.add( new AddOperationContext( normName, attributes ) );
- Interceptor authzInterceptor = interceptorChain.get( "authorizationService" );
+ Interceptor authzInterceptor = interceptorChain.get( AuthorizationService.NAME );
if ( authzInterceptor == null )
{
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationService.java?view=diff&rev=531016&r1=531015&r2=531016
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationService.java Sat Apr 21 03:58:44 2007
@@ -70,6 +70,10 @@
{
private static final Logger log = LoggerFactory.getLogger( AuthenticationService.class );
+ /** The service name */
+ public static final String NAME = "authenticationService";
+
+
/** Speedup for logs */
private static final boolean IS_DEBUG = log.isDebugEnabled();
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java?view=diff&rev=531016&r1=531015&r2=531016
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java Sat Apr 21 03:58:44 2007
@@ -36,11 +36,21 @@
import javax.naming.directory.Attributes;
import org.apache.commons.collections.map.LRUMap;
+import org.apache.directory.server.core.authz.AuthorizationService;
+import org.apache.directory.server.core.authz.DefaultAuthorizationService;
+import org.apache.directory.server.core.collective.CollectiveAttributeService;
+import org.apache.directory.server.core.event.EventService;
+import org.apache.directory.server.core.exception.ExceptionService;
import org.apache.directory.server.core.interceptor.context.LookupOperationContext;
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.normalization.NormalizationService;
+import org.apache.directory.server.core.operational.OperationalAttributeService;
import org.apache.directory.server.core.partition.PartitionNexusProxy;
+import org.apache.directory.server.core.referral.ReferralService;
+import org.apache.directory.server.core.schema.SchemaService;
+import org.apache.directory.server.core.subtree.SubentryService;
import org.apache.directory.server.core.trigger.TriggerService;
import org.apache.directory.shared.ldap.aci.AuthenticationLevel;
import org.apache.directory.shared.ldap.constants.LdapSecurityConstants;
@@ -102,18 +112,18 @@
static
{
Set<String> c = new HashSet<String>();
- c.add( "normalizationService" );
- c.add( "authenticationService" );
- c.add( "referralService" );
- c.add( "authorizationService" );
- c.add( "defaultAuthorizationService" );
- c.add( "exceptionService" );
- c.add( "operationalAttributeService" );
- c.add( "schemaService" );
- c.add( "subentryService" );
- c.add( "collectiveAttributeService" );
- c.add( "eventService" );
- c.add( TriggerService.SERVICE_NAME );
+ c.add( NormalizationService.NAME );
+ c.add( AuthenticationService.NAME );
+ c.add( ReferralService.NAME );
+ c.add( AuthorizationService.NAME );
+ c.add( DefaultAuthorizationService.NAME );
+ c.add( ExceptionService.NAME );
+ c.add( OperationalAttributeService.NAME );
+ c.add( SchemaService.NAME );
+ c.add( SubentryService.NAME );
+ c.add( CollectiveAttributeService.NAME );
+ c.add( EventService.NAME );
+ c.add( TriggerService.NAME );
USERLOOKUP_BYPASS = Collections.unmodifiableCollection( c );
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java?view=diff&rev=531016&r1=531015&r2=531016
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java Sat Apr 21 03:58:44 2007
@@ -87,6 +87,10 @@
{
/** the logger for this class */
private static final Logger log = LoggerFactory.getLogger( AuthorizationService.class );
+
+ /** The service name */
+ public static final String NAME = "authorizationService";
+
/** the entry ACI attribute string: entryACI */
private static final String ENTRYACI_ATTR = "entryACI";
/** the subentry ACI attribute string: subentryACI */
@@ -401,7 +405,7 @@
}
// perform checks below here for all non-admin users
- SubentryService subentryService = ( SubentryService ) chain.get( "subentryService" );
+ SubentryService subentryService = ( SubentryService ) chain.get( SubentryService.NAME );
Attributes subentryAttrs = subentryService.getSubentryAttributes( name, entry );
NamingEnumeration attrList = entry.getAll();
@@ -768,7 +772,7 @@
// we need to construct an entry to represent it
// at least with minimal requirements which are object class
// and access control subentry operational attributes.
- SubentryService subentryService = ( SubentryService ) chain.get( "subentryService" );
+ SubentryService subentryService = ( SubentryService ) chain.get( SubentryService.NAME );
Attributes subentryAttrs = subentryService.getSubentryAttributes( newName, importedEntry );
NamingEnumeration attrList = importedEntry.getAll();
@@ -843,7 +847,7 @@
// we need to construct an entry to represent it
// at least with minimal requirements which are object class
// and access control subentry operational attributes.
- SubentryService subentryService = ( SubentryService ) chain.get( "subentryService" );
+ SubentryService subentryService = ( SubentryService ) chain.get( SubentryService.NAME );
Attributes subentryAttrs = subentryService.getSubentryAttributes( newName, importedEntry );
NamingEnumeration attrList = importedEntry.getAll();
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationService.java?view=diff&rev=531016&r1=531015&r2=531016
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationService.java Sat Apr 21 03:58:44 2007
@@ -64,6 +64,9 @@
*/
public class DefaultAuthorizationService extends BaseInterceptor
{
+ /** The service name */
+ public static final String NAME = "defaultAuthorizationService";
+
/**
* the base distinguished {@link Name} for all users
*/
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java?view=diff&rev=531016&r1=531015&r2=531016
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java Sat Apr 21 03:58:44 2007
@@ -29,12 +29,20 @@
import javax.naming.NamingException;
import javax.naming.directory.Attributes;
+import org.apache.directory.server.core.authn.AuthenticationService;
+import org.apache.directory.server.core.authz.AuthorizationService;
+import org.apache.directory.server.core.authz.DefaultAuthorizationService;
import org.apache.directory.server.core.event.Evaluator;
+import org.apache.directory.server.core.event.EventService;
import org.apache.directory.server.core.event.ExpressionEvaluator;
import org.apache.directory.server.core.interceptor.context.LookupOperationContext;
+import org.apache.directory.server.core.normalization.NormalizationService;
+import org.apache.directory.server.core.operational.OperationalAttributeService;
import org.apache.directory.server.core.partition.PartitionNexusProxy;
+import org.apache.directory.server.core.schema.SchemaService;
import org.apache.directory.server.core.subtree.RefinementEvaluator;
import org.apache.directory.server.core.subtree.RefinementLeafEvaluator;
+import org.apache.directory.server.core.subtree.SubentryService;
import org.apache.directory.server.core.subtree.SubtreeEvaluator;
import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
import org.apache.directory.server.schema.registries.OidRegistry;
@@ -127,15 +135,15 @@
public static final Collection USER_LOOKUP_BYPASS;
static
{
- Collection c = new HashSet();
- c.add( "normalizationService" );
- c.add( "authenticationService" );
- c.add( "authorizationService" );
- c.add( "defaultAuthorizationService" );
- c.add( "schemaService" );
- c.add( "subentryService" );
- c.add( "operationalAttributeService" );
- c.add( "eventService" );
+ Collection<String> c = new HashSet<String>();
+ c.add( NormalizationService.NAME );
+ c.add( AuthenticationService.NAME );
+ c.add( AuthorizationService.NAME );
+ c.add( DefaultAuthorizationService.NAME );
+ c.add( SchemaService.NAME );
+ c.add( SubentryService.NAME );
+ c.add( OperationalAttributeService.NAME );
+ c.add( EventService.NAME );
USER_LOOKUP_BYPASS = Collections.unmodifiableCollection( c );
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java?view=diff&rev=531016&r1=531015&r2=531016
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java Sat Apr 21 03:58:44 2007
@@ -32,8 +32,16 @@
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
+import org.apache.directory.server.core.authn.AuthenticationService;
+import org.apache.directory.server.core.authz.AuthorizationService;
+import org.apache.directory.server.core.authz.DefaultAuthorizationService;
+import org.apache.directory.server.core.event.EventService;
import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
+import org.apache.directory.server.core.normalization.NormalizationService;
+import org.apache.directory.server.core.operational.OperationalAttributeService;
import org.apache.directory.server.core.partition.PartitionNexusProxy;
+import org.apache.directory.server.core.schema.SchemaService;
+import org.apache.directory.server.core.subtree.SubentryService;
import org.apache.directory.shared.ldap.aci.ACITuple;
import org.apache.directory.shared.ldap.aci.AuthenticationLevel;
import org.apache.directory.shared.ldap.aci.ProtectedItem;
@@ -121,14 +129,14 @@
static
{
Collection<String> c = new HashSet<String>();
- c.add( "normalizationService" );
- c.add( "authenticationService" );
- c.add( "authorizationService" );
- c.add( "defaultAuthorizationService" );
- c.add( "schemaService" );
- c.add( "subentryService" );
- c.add( "operationalAttributeService" );
- c.add( "eventService" );
+ c.add( NormalizationService.NAME );
+ c.add( AuthenticationService.NAME );
+ c.add( AuthorizationService.NAME );
+ c.add( DefaultAuthorizationService.NAME );
+ c.add( SchemaService.NAME );
+ c.add( SubentryService.NAME );
+ c.add( OperationalAttributeService.NAME );
+ c.add( EventService.NAME );
SEARCH_BYPASS = Collections.unmodifiableCollection( c );
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java?view=diff&rev=531016&r1=531015&r2=531016
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java Sat Apr 21 03:58:44 2007
@@ -22,7 +22,6 @@
import java.util.HashSet;
import java.util.Iterator;
-import java.util.Map;
import java.util.Set;
import javax.naming.NamingEnumeration;
@@ -47,7 +46,6 @@
import org.apache.directory.server.core.invocation.InvocationStack;
import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
-import org.apache.directory.shared.ldap.filter.ExprNode;
import org.apache.directory.shared.ldap.message.AttributeImpl;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -66,6 +64,9 @@
*/
public class CollectiveAttributeService extends BaseInterceptor
{
+ /** The service name */
+ public static final String NAME = "collectiveAttributeService";
+
public static final String COLLECTIVE_ATTRIBUTE_SUBENTRIES = "collectiveAttributeSubentries";
public static final String EXCLUDE_ALL_COLLECTIVE_ATTRIBUTES_OID = "2.5.18.0";
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/StartupConfiguration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/StartupConfiguration.java?view=diff&rev=531016&r1=531015&r2=531016
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/StartupConfiguration.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/StartupConfiguration.java Sat Apr 21 03:58:44 2007
@@ -40,7 +40,6 @@
import org.apache.directory.server.core.exception.ExceptionService;
import org.apache.directory.server.core.normalization.NormalizationService;
import org.apache.directory.server.core.operational.OperationalAttributeService;
-import org.apache.directory.server.core.partition.DefaultPartitionNexus;
import org.apache.directory.server.core.referral.ReferralService;
import org.apache.directory.server.core.schema.SchemaService;
import org.apache.directory.server.core.subtree.SubentryService;
@@ -128,12 +127,12 @@
List<InterceptorConfiguration> list = new ArrayList<InterceptorConfiguration>();
interceptorCfg = new MutableInterceptorConfiguration();
- interceptorCfg.setName( "normalizationService" );
+ interceptorCfg.setName( NormalizationService.NAME );
interceptorCfg.setInterceptor( new NormalizationService() );
list.add( interceptorCfg );
interceptorCfg = new MutableInterceptorConfiguration();
- interceptorCfg.setName( "authenticationService" );
+ interceptorCfg.setName( AuthenticationService.NAME );
interceptorCfg.setInterceptor( new AuthenticationService() );
list.add( interceptorCfg );
@@ -143,47 +142,47 @@
list.add( interceptorCfg );
interceptorCfg = new MutableInterceptorConfiguration();
- interceptorCfg.setName( "authorizationService" );
+ interceptorCfg.setName( AuthorizationService.NAME );
interceptorCfg.setInterceptor( new AuthorizationService() );
list.add( interceptorCfg );
interceptorCfg = new MutableInterceptorConfiguration();
- interceptorCfg.setName( "defaultAuthorizationService" );
+ interceptorCfg.setName( DefaultAuthorizationService.NAME );
interceptorCfg.setInterceptor( new DefaultAuthorizationService() );
list.add( interceptorCfg );
interceptorCfg = new MutableInterceptorConfiguration();
- interceptorCfg.setName( "exceptionService" );
+ interceptorCfg.setName( ExceptionService.NAME );
interceptorCfg.setInterceptor( new ExceptionService() );
list.add( interceptorCfg );
interceptorCfg = new MutableInterceptorConfiguration();
- interceptorCfg.setName( "operationalAttributeService" );
+ interceptorCfg.setName( OperationalAttributeService.NAME );
interceptorCfg.setInterceptor( new OperationalAttributeService() );
list.add( interceptorCfg );
interceptorCfg = new MutableInterceptorConfiguration();
- interceptorCfg.setName( "schemaService" );
+ interceptorCfg.setName( SchemaService.NAME );
interceptorCfg.setInterceptor( new SchemaService() );
list.add( interceptorCfg );
interceptorCfg = new MutableInterceptorConfiguration();
- interceptorCfg.setName( "subentryService" );
+ interceptorCfg.setName( SubentryService.NAME );
interceptorCfg.setInterceptor( new SubentryService() );
list.add( interceptorCfg );
interceptorCfg = new MutableInterceptorConfiguration();
- interceptorCfg.setName( "collectiveAttributeService" );
+ interceptorCfg.setName( CollectiveAttributeService.NAME );
interceptorCfg.setInterceptor( new CollectiveAttributeService() );
list.add( interceptorCfg );
interceptorCfg = new MutableInterceptorConfiguration();
- interceptorCfg.setName( "eventService" );
+ interceptorCfg.setName( EventService.NAME );
interceptorCfg.setInterceptor( new EventService() );
list.add( interceptorCfg );
interceptorCfg = new MutableInterceptorConfiguration();
- interceptorCfg.setName( "triggerService" );
+ interceptorCfg.setName( TriggerService.NAME );
interceptorCfg.setInterceptor( new TriggerService() );
list.add( interceptorCfg );
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventService.java?view=diff&rev=531016&r1=531015&r2=531016
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventService.java Sat Apr 21 03:58:44 2007
@@ -82,6 +82,10 @@
public class EventService extends BaseInterceptor
{
private static Logger log = LoggerFactory.getLogger( EventService.class );
+
+ /** The service name */
+ public static final String NAME = "eventService";
+
private PartitionNexus nexus;
private Map sources = new HashMap();
private Evaluator evaluator = null;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java?view=diff&rev=531016&r1=531015&r2=531016
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java Sat Apr 21 03:58:44 2007
@@ -72,6 +72,9 @@
*/
public class ExceptionService extends BaseInterceptor
{
+ /** The service name */
+ public static final String NAME = "exceptionService";
+
private PartitionNexus nexus;
private LdapDN subschemSubentryDn;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java?view=diff&rev=531016&r1=531015&r2=531016
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java Sat Apr 21 03:58:44 2007
@@ -26,7 +26,6 @@
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
import javax.naming.directory.Attributes;
-import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
import org.apache.directory.server.core.DirectoryServiceConfiguration;
@@ -71,6 +70,9 @@
{
/** logger used by this class */
private static final Logger log = LoggerFactory.getLogger( NormalizationService.class );
+
+ /** The service name */
+ public static final String NAME = "normalizationService";
/** a filter node value normalizer and undefined node remover */
private NormalizingVisitor normVisitor;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java?view=diff&rev=531016&r1=531015&r2=531016
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java Sat Apr 21 03:58:44 2007
@@ -77,6 +77,9 @@
*/
public class OperationalAttributeService extends BaseInterceptor
{
+ /** The service name */
+ public static final String NAME = "operationalAttributeService";
+
private final SearchResultFilter DENORMALIZING_SEARCH_FILTER = new SearchResultFilter()
{
public boolean accept( Invocation invocation, SearchResult result, SearchControls controls )
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java?view=diff&rev=531016&r1=531015&r2=531016
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java Sat Apr 21 03:58:44 2007
@@ -40,6 +40,9 @@
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.DirectoryServiceConfiguration;
+import org.apache.directory.server.core.authn.AuthenticationService;
+import org.apache.directory.server.core.authz.AuthorizationService;
+import org.apache.directory.server.core.authz.DefaultAuthorizationService;
import org.apache.directory.server.core.configuration.PartitionConfiguration;
import org.apache.directory.server.core.enumeration.SearchResultFilter;
import org.apache.directory.server.core.enumeration.SearchResultFilteringEnumeration;
@@ -49,6 +52,12 @@
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.normalization.NormalizationService;
+import org.apache.directory.server.core.operational.OperationalAttributeService;
+import org.apache.directory.server.core.referral.ReferralService;
+import org.apache.directory.server.core.schema.SchemaService;
+import org.apache.directory.server.core.subtree.SubentryService;
+import org.apache.directory.server.core.trigger.TriggerService;
import org.apache.directory.shared.ldap.exception.LdapSizeLimitExceededException;
import org.apache.directory.shared.ldap.exception.LdapTimeLimitExceededException;
import org.apache.directory.shared.ldap.filter.ExprNode;
@@ -89,38 +98,38 @@
static
{
Collection<String> c = new HashSet<String>();
- c.add( "normalizationService" );
- c.add( "authenticationService" );
- c.add( "authorizationService" );
- c.add( "defaultAuthorizationService" );
- c.add( "schemaService" );
- c.add( "subentryService" );
- c.add( "operationalAttributeService" );
- c.add( "referralService" );
- c.add( "eventService" );
+ c.add( NormalizationService.NAME );
+ c.add( AuthenticationService.NAME );
+ c.add( AuthorizationService.NAME );
+ c.add( DefaultAuthorizationService.NAME );
+ c.add( SchemaService.NAME );
+ c.add( SubentryService.NAME );
+ c.add( OperationalAttributeService.NAME );
+ c.add( ReferralService.NAME );
+ c.add( EventService.NAME );
LOOKUP_BYPASS = Collections.unmodifiableCollection( c );
c = new HashSet<String>();
- c.add( "authenticationService" );
- c.add( "authorizationService" );
- c.add( "defaultAuthorizationService" );
- c.add( "schemaService" );
- c.add( "subentryService" );
- c.add( "operationalAttributeService" );
- c.add( "referralService" );
- c.add( "eventService" );
+ c.add( AuthenticationService.NAME );
+ c.add( AuthorizationService.NAME );
+ c.add( DefaultAuthorizationService.NAME );
+ c.add( SchemaService.NAME );
+ c.add( SubentryService.NAME );
+ c.add( OperationalAttributeService.NAME );
+ c.add( ReferralService.NAME );
+ c.add( EventService.NAME );
GETMATCHEDDN_BYPASS = Collections.unmodifiableCollection( c );
c = new HashSet<String>();
- c.add( "normalizationService" );
- c.add( "authenticationService" );
- c.add( "authorizationService" );
- c.add( "defaultAuthorizationService" );
- c.add( "schemaService" );
- c.add( "subentryService" );
- c.add( "referralService" );
- c.add( "eventService" );
- c.add( "triggerService" );
+ c.add( NormalizationService.NAME );
+ c.add( AuthenticationService.NAME );
+ c.add( AuthorizationService.NAME );
+ c.add( DefaultAuthorizationService.NAME );
+ c.add( SchemaService.NAME );
+ c.add( SubentryService.NAME );
+ c.add( ReferralService.NAME );
+ c.add( EventService.NAME );
+ c.add( TriggerService.NAME );
LOOKUP_EXCLUDING_OPR_ATTRS_BYPASS = Collections.unmodifiableCollection( c );
}
@@ -723,7 +732,7 @@
NamingListener namingListener ) throws NamingException
{
InterceptorChain chain = this.configuration.getInterceptorChain();
- EventService interceptor = ( EventService ) chain.get( "eventService" );
+ EventService interceptor = ( EventService ) chain.get( EventService.NAME );
interceptor.addNamingListener( ctx, name, filter, searchControls, namingListener );
}
@@ -735,7 +744,7 @@
{
return;
}
- EventService interceptor = ( EventService ) chain.get( "eventService" );
+ EventService interceptor = ( EventService ) chain.get( EventService.NAME );
interceptor.removeNamingListener( ctx, namingListener );
}
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java?view=diff&rev=531016&r1=531015&r2=531016
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java Sat Apr 21 03:58:44 2007
@@ -38,10 +38,14 @@
import javax.naming.directory.SearchResult;
import org.apache.directory.server.core.DirectoryServiceConfiguration;
+import org.apache.directory.server.core.authn.AuthenticationService;
+import org.apache.directory.server.core.authz.AuthorizationService;
+import org.apache.directory.server.core.authz.DefaultAuthorizationService;
import org.apache.directory.server.core.configuration.InterceptorConfiguration;
import org.apache.directory.server.core.enumeration.ReferralHandlingEnumeration;
import org.apache.directory.server.core.enumeration.SearchResultFilter;
import org.apache.directory.server.core.enumeration.SearchResultFilteringEnumeration;
+import org.apache.directory.server.core.event.EventService;
import org.apache.directory.server.core.interceptor.BaseInterceptor;
import org.apache.directory.server.core.interceptor.NextInterceptor;
import org.apache.directory.server.core.interceptor.context.AddContextPartitionOperationContext;
@@ -56,9 +60,14 @@
import org.apache.directory.server.core.invocation.Invocation;
import org.apache.directory.server.core.invocation.InvocationStack;
import org.apache.directory.server.core.jndi.ServerLdapContext;
+import org.apache.directory.server.core.normalization.NormalizationService;
+import org.apache.directory.server.core.operational.OperationalAttributeService;
import org.apache.directory.server.core.partition.Partition;
import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.server.core.partition.PartitionNexusProxy;
+import org.apache.directory.server.core.schema.SchemaService;
+import org.apache.directory.server.core.subtree.SubentryService;
+import org.apache.directory.server.core.trigger.TriggerService;
import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
import org.apache.directory.server.schema.registries.OidRegistry;
import org.apache.directory.shared.ldap.NotImplementedException;
@@ -89,7 +98,9 @@
*/
public class ReferralService extends BaseInterceptor
{
+ /** The service name */
public static final String NAME = "referralService";
+
private static final Logger log = LoggerFactory.getLogger( ReferralService.class );
private static final String IGNORE = "ignore";
private static final String THROW_FINDING_BASE = "throw-finding-base";
@@ -113,16 +124,16 @@
* partitions of the system during startup and during add/remove partition ops
*/
Collection<String> c = new HashSet<String>();
- c.add( "normalizationService" );
- c.add( "authenticationService" );
- c.add( "authorizationService" );
- c.add( "defaultAuthorizationService" );
- c.add( "schemaService" );
- c.add( "subentryService" );
- c.add( "operationalAttributeService" );
- c.add( "referralService" );
- c.add( "eventService" );
- c.add( "triggerService" );
+ c.add( NormalizationService.NAME );
+ c.add( AuthenticationService.NAME );
+ c.add( AuthorizationService.NAME );
+ c.add( DefaultAuthorizationService.NAME );
+ c.add( SchemaService.NAME );
+ c.add( SubentryService.NAME );
+ c.add( OperationalAttributeService.NAME );
+ c.add( ReferralService.NAME );
+ c.add( EventService.NAME );
+ c.add( TriggerService.NAME );
SEARCH_BYPASS = Collections.unmodifiableCollection( c );
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaManager.java?view=diff&rev=531016&r1=531015&r2=531016
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaManager.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaManager.java Sat Apr 21 03:58:44 2007
@@ -35,10 +35,17 @@
import org.apache.directory.server.constants.ApacheSchemaConstants;
import org.apache.directory.server.constants.MetaSchemaConstants;
+import org.apache.directory.server.core.authn.AuthenticationService;
+import org.apache.directory.server.core.authz.AuthorizationService;
+import org.apache.directory.server.core.authz.DefaultAuthorizationService;
+import org.apache.directory.server.core.collective.CollectiveAttributeService;
+import org.apache.directory.server.core.exception.ExceptionService;
import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
import org.apache.directory.server.core.invocation.Invocation;
import org.apache.directory.server.core.invocation.InvocationStack;
import org.apache.directory.server.core.jndi.ServerLdapContext;
+import org.apache.directory.server.core.normalization.NormalizationService;
+import org.apache.directory.server.core.referral.ReferralService;
import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
import org.apache.directory.server.schema.registries.ObjectClassRegistry;
import org.apache.directory.server.schema.registries.OidRegistry;
@@ -171,14 +178,14 @@
VALID_OU_VALUES.add( SchemaConstants.DIT_STRUCTURE_RULES_AT.toLowerCase() );
HashSet<String> set = new HashSet<String>();
- set.add( "normalizationService" );
- set.add( "authenticationService" );
- set.add( "referralService" );
- set.add( "authorizationService" );
- set.add( "defaultAuthorizationService" );
- set.add( "exceptionService" );
- set.add( "schemaService" );
- set.add( "collectiveAttributeService" );
+ set.add( NormalizationService.NAME );
+ set.add( AuthenticationService.NAME );
+ set.add( ReferralService.NAME );
+ set.add( AuthorizationService.NAME );
+ set.add( DefaultAuthorizationService.NAME );
+ set.add( ExceptionService.NAME );
+ set.add( SchemaService.NAME );
+ set.add( CollectiveAttributeService.NAME );
SCHEMA_MODIFICATION_ATTRIBUTES_UPDATE_BYPASS = Collections.unmodifiableCollection( set );
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java?view=diff&rev=531016&r1=531015&r2=531016
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java Sat Apr 21 03:58:44 2007
@@ -111,11 +111,15 @@
*/
public class SchemaService extends BaseInterceptor
{
+ /** The LoggerFactory used by this Interceptor */
+ private static Logger log = LoggerFactory.getLogger( SchemaService.class );
+
+ /** The service name */
+ public static final String NAME = "schemaService";
+
private static final String[] EMPTY_STRING_ARRAY = new String[0];
private static final String BINARY_KEY = JndiPropertyConstants.JNDI_LDAP_ATTRIBUTES_BINARY;
- /** The LoggerFactory used by this Interceptor */
- private static Logger log = LoggerFactory.getLogger( SchemaService.class );
/** Speedup for logs */
private static final boolean IS_DEBUG = log.isDebugEnabled();
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java?view=diff&rev=531016&r1=531015&r2=531016
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java Sat Apr 21 03:58:44 2007
@@ -28,10 +28,15 @@
import javax.naming.directory.Attributes;
import org.apache.directory.server.constants.MetaSchemaConstants;
+import org.apache.directory.server.core.authn.AuthenticationService;
+import org.apache.directory.server.core.authz.AuthorizationService;
+import org.apache.directory.server.core.authz.DefaultAuthorizationService;
+import org.apache.directory.server.core.exception.ExceptionService;
import org.apache.directory.server.core.interceptor.context.AddOperationContext;
import org.apache.directory.server.core.interceptor.context.DeleteOperationContext;
import org.apache.directory.server.core.invocation.InvocationStack;
import org.apache.directory.server.core.partition.PartitionNexusProxy;
+import org.apache.directory.server.core.referral.ReferralService;
import org.apache.directory.server.schema.bootstrap.Schema;
import org.apache.directory.server.utils.AttributesFactory;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
@@ -67,12 +72,12 @@
static
{
Set<String> bypass = new HashSet<String>();
- bypass.add( "authenticationService" );
- bypass.add( "referralService" );
- bypass.add( "authorizationService" );
- bypass.add( "defaultAuthorizationService" );
- bypass.add( "exceptionService" );
- bypass.add( "schemaService" );
+ bypass.add( AuthenticationService.NAME );
+ bypass.add( ReferralService.NAME );
+ bypass.add( AuthorizationService.NAME );
+ bypass.add( DefaultAuthorizationService.NAME );
+ bypass.add( ExceptionService.NAME );
+ bypass.add( SchemaService.NAME );
BYPASS = Collections.unmodifiableCollection( bypass );
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java?view=diff&rev=531016&r1=531015&r2=531016
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java Sat Apr 21 03:58:44 2007
@@ -87,6 +87,9 @@
*/
public class SubentryService extends BaseInterceptor
{
+ /** The service name */
+ public static final String NAME = "subentryService";
+
/** the subentry control OID */
private static final String SUBENTRY_CONTROL = SubentriesControl.CONTROL_OID;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerService.java?view=diff&rev=531016&r1=531015&r2=531016
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerService.java Sat Apr 21 03:58:44 2007
@@ -78,10 +78,12 @@
*/
public class TriggerService extends BaseInterceptor
{
- public static final String SERVICE_NAME = "triggerService";
-
/** the logger for this class */
private static final Logger log = LoggerFactory.getLogger( TriggerService.class );
+
+ /** The service name */
+ public static final String NAME = "triggerService";
+
/** the entry trigger attribute string: entryTrigger */
private static final String ENTRY_TRIGGER_ATTR = "entryTriggerSpecification";
@@ -440,7 +442,7 @@
// we need to construct an entry to represent it
// at least with minimal requirements which are object class
// and access control subentry operational attributes.
- SubentryService subentryService = ( SubentryService ) chain.get( "subentryService" );
+ SubentryService subentryService = ( SubentryService ) chain.get( SubentryService.NAME );
Attributes fakeImportedEntry = subentryService.getSubentryAttributes( newDN, importedEntry );
NamingEnumeration attrList = importedEntry.getAll();
while ( attrList.hasMore() )
@@ -516,7 +518,7 @@
// we need to construct an entry to represent it
// at least with minimal requirements which are object class
// and access control subentry operational attributes.
- SubentryService subentryService = ( SubentryService ) chain.get( "subentryService" );
+ SubentryService subentryService = ( SubentryService ) chain.get( SubentryService.NAME );
Attributes fakeImportedEntry = subentryService.getSubentryAttributes( newDN, importedEntry );
NamingEnumeration attrList = importedEntry.getAll();
Modified: directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationService.java?view=diff&rev=531016&r1=531015&r2=531016
==============================================================================
--- directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationService.java (original)
+++ directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationService.java Sat Apr 21 03:58:44 2007
@@ -140,6 +140,10 @@
public class ReplicationService extends BaseInterceptor
{
private static final Logger log = LoggerFactory.getLogger( ReplicationService.class );
+
+ /** The service name */
+ public static final String NAME = "replicationService";
+
private static final String ENTRY_CSN_OID = "1.3.6.1.4.1.18060.0.4.1.2.30";
private static final String ENTRY_DELETED_OID = "1.3.6.1.4.1.18060.0.4.1.2.31";