You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2007/10/09 21:54:59 UTC
svn commit: r583278 [2/2] - in /directory/apacheds/branches/bigbang:
apacheds-xbean-spring/
core-unit/src/test/java/org/apache/directory/server/core/authz/
core-unit/src/test/java/org/apache/directory/server/core/operational/
core-unit/src/test/java/or...
Copied: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java (from r583255, directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java?p2=directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java&p1=directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java&r1=583255&r2=583278&rev=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java Tue Oct 9 12:54:55 2007
@@ -70,10 +70,10 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class SchemaService extends BaseInterceptor
+public class SchemaInterceptor extends BaseInterceptor
{
/** The LoggerFactory used by this Interceptor */
- private static Logger log = LoggerFactory.getLogger( SchemaService.class );
+ private static Logger log = LoggerFactory.getLogger( SchemaInterceptor.class );
private static final String[] EMPTY_STRING_ARRAY = new String[0];
private static final String BINARY_KEY = JndiPropertyConstants.JNDI_LDAP_ATTRIBUTES_BINARY;
@@ -139,7 +139,7 @@
{
if ( IS_DEBUG )
{
- log.debug( "Initializing SchemaService..." );
+ log.debug( "Initializing SchemaInterceptor..." );
}
nexus = directoryService.getPartitionNexus();
@@ -175,7 +175,7 @@
if ( IS_DEBUG )
{
- log.debug( "SchemaService Initialized !" );
+ log.debug( "SchemaInterceptor Initialized !" );
}
}
Propchange: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Tue Oct 9 12:54:55 2007
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaManager.java?rev=583278&r1=583277&r2=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaManager.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaManager.java Tue Oct 9 12:54:55 2007
@@ -38,17 +38,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.authn.AuthenticationInterceptor;
+import org.apache.directory.server.core.authz.AciAuthorizationInterceptor;
+import org.apache.directory.server.core.authz.DefaultAuthorizationInterceptor;
+import org.apache.directory.server.core.collective.CollectiveAttributeInterceptor;
+import org.apache.directory.server.core.exception.ExceptionInterceptor;
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.core.normalization.NormalizationInterceptor;
+import org.apache.directory.server.core.referral.ReferralInterceptor;
import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
import org.apache.directory.server.schema.registries.ObjectClassRegistry;
import org.apache.directory.server.schema.registries.OidRegistry;
@@ -181,18 +181,18 @@
VALID_OU_VALUES.add( SchemaConstants.DIT_STRUCTURE_RULES_AT.toLowerCase() );
HashSet<String> c = new HashSet<String>();
- c.add( NormalizationService.class.getName() );
- c.add( AuthenticationService.class.getName() );
- c.add( ReferralService.class.getName() );
- c.add( AuthorizationService.class.getName() );
- c.add( DefaultAuthorizationService.class.getName() );
- c.add( ExceptionService.class.getName() );
-// c.add( OperationalAttributeService.class.getName() );
- c.add( SchemaService.class.getName() );
-// c.add( SubentryService.class.getName() );
- c.add( CollectiveAttributeService.class.getName() );
-// c.add( EventService.class.getName() );
-// c.add( TriggerService.class.getName() );
+ c.add( NormalizationInterceptor.class.getName() );
+ c.add( AuthenticationInterceptor.class.getName() );
+ c.add( ReferralInterceptor.class.getName() );
+ c.add( AciAuthorizationInterceptor.class.getName() );
+ c.add( DefaultAuthorizationInterceptor.class.getName() );
+ c.add( ExceptionInterceptor.class.getName() );
+// c.add( OperationalAttributeInterceptor.class.getName() );
+ c.add( SchemaInterceptor.class.getName() );
+// c.add( SubentryInterceptor.class.getName() );
+ c.add( CollectiveAttributeInterceptor.class.getName() );
+// c.add( EventInterceptor.class.getName() );
+// c.add( TriggerInterceptor.class.getName() );
SCHEMA_MODIFICATION_ATTRIBUTES_UPDATE_BYPASS = Collections.unmodifiableCollection( c );
}
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java?rev=583278&r1=583277&r2=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java Tue Oct 9 12:54:55 2007
@@ -28,15 +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.authn.AuthenticationInterceptor;
+import org.apache.directory.server.core.authz.AciAuthorizationInterceptor;
+import org.apache.directory.server.core.authz.DefaultAuthorizationInterceptor;
+import org.apache.directory.server.core.exception.ExceptionInterceptor;
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.core.referral.ReferralInterceptor;
import org.apache.directory.server.schema.bootstrap.Schema;
import org.apache.directory.server.utils.AttributesFactory;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
@@ -72,18 +72,18 @@
static
{
Set<String> c = new HashSet<String>();
-// c.add( NormalizationService.class.getName() );
- c.add( AuthenticationService.class.getName() );
- c.add( ReferralService.class.getName() );
- c.add( AuthorizationService.class.getName() );
- c.add( DefaultAuthorizationService.class.getName() );
- c.add( ExceptionService.class.getName() );
-// c.add( OperationalAttributeService.class.getName() );
- c.add( SchemaService.class.getName() );
-// c.add( SubentryService.class.getName() );
-// c.add( CollectiveAttributeService.class.getName() );
-// c.add( EventService.class.getName() );
-// c.add( TriggerService.class.getName() );
+// c.add( NormalizationInterceptor.class.getName() );
+ c.add( AuthenticationInterceptor.class.getName() );
+ c.add( ReferralInterceptor.class.getName() );
+ c.add( AciAuthorizationInterceptor.class.getName() );
+ c.add( DefaultAuthorizationInterceptor.class.getName() );
+ c.add( ExceptionInterceptor.class.getName() );
+// c.add( OperationalAttributeInterceptor.class.getName() );
+ c.add( SchemaInterceptor.class.getName() );
+// c.add( SubentryInterceptor.class.getName() );
+// c.add( CollectiveAttributeInterceptor.class.getName() );
+// c.add( EventInterceptor.class.getName() );
+// c.add( TriggerInterceptor.class.getName() );
BYPASS = Collections.unmodifiableCollection( c );
}
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java?rev=583278&r1=583277&r2=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java Tue Oct 9 12:54:55 2007
@@ -94,7 +94,7 @@
public StoredProcEngine getStoredProcEngineInstance( Attributes spUnitEntry ) throws NamingException
{
- String spLangId = ( String ) spUnitEntry.get( "storedProcLangId" ).get();
+ String spLangId = ( String ) spUnitEntry.get( "STORED_PROC_LANG_ID" ).get();
for ( StoredProcEngineConfig engineConfig : storedProcEngineConfigs )
{
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/sp/java/JavaStoredProcEngine.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/sp/java/JavaStoredProcEngine.java?rev=583278&r1=583277&r2=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/sp/java/JavaStoredProcEngine.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/sp/java/JavaStoredProcEngine.java Tue Oct 9 12:54:55 2007
@@ -46,7 +46,7 @@
public class JavaStoredProcEngine implements StoredProcEngine
{
- public static final String storedProcLangId = "Java";
+ public static final String STORED_PROC_LANG_ID = "Java";
private Attributes spUnit;
@@ -116,7 +116,7 @@
*/
public String getSPLangId()
{
- return storedProcLangId;
+ return STORED_PROC_LANG_ID;
}
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/sp/java/JavaStoredProcEngineConfig.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/sp/java/JavaStoredProcEngineConfig.java?rev=583278&r1=583277&r2=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/sp/java/JavaStoredProcEngineConfig.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/sp/java/JavaStoredProcEngineConfig.java Tue Oct 9 12:54:55 2007
@@ -48,7 +48,7 @@
*/
public String getStoredProcLangId()
{
- return JavaStoredProcEngine.storedProcLangId;
+ return JavaStoredProcEngine.STORED_PROC_LANG_ID;
}
}
Copied: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java (from r583255, directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java?p2=directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java&p1=directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java&r1=583255&r2=583278&rev=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java Tue Oct 9 12:54:55 2007
@@ -26,7 +26,6 @@
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.NextInterceptor;
import org.apache.directory.server.core.interceptor.context.*;
import org.apache.directory.server.core.invocation.Invocation;
@@ -73,7 +72,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class SubentryService extends BaseInterceptor
+public class SubentryInterceptor extends BaseInterceptor
{
/** the subentry control OID */
private static final String SUBENTRY_CONTROL = SubentriesControl.CONTROL_OID;
@@ -98,7 +97,7 @@
SchemaConstants.TRIGGER_EXECUTION_SUBENTRIES_AT
};
- private static final Logger LOG = LoggerFactory.getLogger( SubentryService.class );
+ private static final Logger LOG = LoggerFactory.getLogger( SubentryInterceptor.class );
/** the hash mapping the DN of a subentry to its SubtreeSpecification/types */
private final SubentryCache subentryCache = new SubentryCache();
Propchange: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Tue Oct 9 12:54:55 2007
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id
Copied: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java (from r583255, directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/trigger/TriggerService.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java?p2=directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java&p1=directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/trigger/TriggerService.java&r1=583255&r2=583278&rev=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/trigger/TriggerService.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java Tue Oct 9 12:54:55 2007
@@ -34,7 +34,7 @@
import org.apache.directory.server.core.sp.StoredProcEngineConfig;
import org.apache.directory.server.core.sp.StoredProcExecutionManager;
import org.apache.directory.server.core.sp.java.JavaStoredProcEngineConfig;
-import org.apache.directory.server.core.subtree.SubentryService;
+import org.apache.directory.server.core.subtree.SubentryInterceptor;
import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.exception.LdapNamingException;
@@ -65,10 +65,10 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev:$
*/
-public class TriggerService extends BaseInterceptor
+public class TriggerInterceptor extends BaseInterceptor
{
/** the logger for this class */
- private static final Logger LOG = LoggerFactory.getLogger( TriggerService.class );
+ private static final Logger LOG = LoggerFactory.getLogger( TriggerInterceptor.class );
/** the entry trigger attribute string: entryTrigger */
private static final String ENTRY_TRIGGER_ATTR = "entryTriggerSpecification";
@@ -426,7 +426,7 @@
// Get the entry again without operational attributes
// because access control subentry operational attributes
// will not be valid at the new location.
- // This will certainly be fixed by the SubentryService,
+ // This will certainly be fixed by the SubentryInterceptor,
// but after this service.
Attributes importedEntry = proxy.lookup( new LookupOperationContext( oriChildName ), PartitionNexusProxy.LOOKUP_EXCLUDING_OPR_ATTRS_BYPASS );
// As the target entry does not exist yet and so
@@ -434,8 +434,8 @@
// 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.class.getName() );
- Attributes fakeImportedEntry = subentryService.getSubentryAttributes( newDN, importedEntry );
+ SubentryInterceptor subentryInterceptor = ( SubentryInterceptor ) chain.get( SubentryInterceptor.class.getName() );
+ Attributes fakeImportedEntry = subentryInterceptor.getSubentryAttributes( newDN, importedEntry );
NamingEnumeration attrList = importedEntry.getAll();
while ( attrList.hasMore() )
{
@@ -500,7 +500,7 @@
// Get the entry again without operational attributes
// because access control subentry operational attributes
// will not be valid at the new location.
- // This will certainly be fixed by the SubentryService,
+ // This will certainly be fixed by the SubentryInterceptor,
// but after this service.
Attributes importedEntry = proxy.lookup( new LookupOperationContext( oriChildName ), PartitionNexusProxy.LOOKUP_EXCLUDING_OPR_ATTRS_BYPASS );
// As the target entry does not exist yet and so
@@ -508,8 +508,8 @@
// 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.class.getName() );
- Attributes fakeImportedEntry = subentryService.getSubentryAttributes( newDN, importedEntry );
+ SubentryInterceptor subentryInterceptor = ( SubentryInterceptor ) chain.get( SubentryInterceptor.class.getName() );
+ Attributes fakeImportedEntry = subentryInterceptor.getSubentryAttributes( newDN, importedEntry );
NamingEnumeration attrList = importedEntry.getAll();
while ( attrList.hasMore() )
Propchange: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java?rev=583278&r1=583277&r2=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java (original)
+++ directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java Tue Oct 9 12:54:55 2007
@@ -37,7 +37,7 @@
/**
- * Tests methods in SchemaService.
+ * Tests methods in SchemaInterceptor.
*/
public class SchemaServiceTest extends TestCase
{
@@ -86,7 +86,7 @@
try
{
- SchemaService.alterObjectClasses( attr, registries.getObjectClassRegistry() );
+ SchemaInterceptor.alterObjectClasses( attr, registries.getObjectClassRegistry() );
fail( "should not get here" );
}
catch ( LdapNamingException e )
@@ -95,7 +95,7 @@
}
attr = new AttributeImpl( "objectClass" );
- SchemaService.alterObjectClasses( attr );
+ SchemaInterceptor.alterObjectClasses( attr );
assertEquals( 0, attr.size() );
}
@@ -103,7 +103,7 @@
public void testAlterObjectClassesNoAttrValue() throws NamingException
{
Attribute attr = new AttributeImpl( "objectClass" );
- SchemaService.alterObjectClasses( attr );
+ SchemaInterceptor.alterObjectClasses( attr );
assertEquals( 0, attr.size() );
}
@@ -111,7 +111,7 @@
public void testAlterObjectClassesTopAttrValue() throws NamingException
{
Attribute attr = new AttributeImpl( "objectClass", "top" );
- SchemaService.alterObjectClasses( attr, registries.getObjectClassRegistry() );
+ SchemaInterceptor.alterObjectClasses( attr, registries.getObjectClassRegistry() );
assertEquals( 0, attr.size() );
}
@@ -119,7 +119,7 @@
public void testAlterObjectClassesInetOrgPersonAttrValue() throws NamingException
{
Attribute attr = new AttributeImpl( "objectClass", "organizationalPerson" );
- SchemaService.alterObjectClasses( attr, registries.getObjectClassRegistry() );
+ SchemaInterceptor.alterObjectClasses( attr, registries.getObjectClassRegistry() );
assertEquals( 2, attr.size() );
assertTrue( attr.contains( "person" ) );
assertTrue( attr.contains( "organizationalPerson" ) );
@@ -130,7 +130,7 @@
{
Attribute attr = new AttributeImpl( "objectClass", "organizationalPerson" );
attr.add( "residentialPerson" );
- SchemaService.alterObjectClasses( attr, registries.getObjectClassRegistry() );
+ SchemaInterceptor.alterObjectClasses( attr, registries.getObjectClassRegistry() );
assertEquals( 3, attr.size() );
assertTrue( attr.contains( "person" ) );
assertTrue( attr.contains( "organizationalPerson" ) );
@@ -143,7 +143,7 @@
Attribute attr = new AttributeImpl( "objectClass", "organizationalPerson" );
attr.add( "residentialPerson" );
attr.add( "dSA" );
- SchemaService.alterObjectClasses( attr, registries.getObjectClassRegistry() );
+ SchemaInterceptor.alterObjectClasses( attr, registries.getObjectClassRegistry() );
assertEquals( 5, attr.size() );
assertTrue( attr.contains( "person" ) );
assertTrue( attr.contains( "organizationalPerson" ) );
Copied: directory/apacheds/branches/bigbang/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java (from r583255, directory/apacheds/branches/bigbang/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationService.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java?p2=directory/apacheds/branches/bigbang/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java&p1=directory/apacheds/branches/bigbang/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationService.java&r1=583255&r2=583278&rev=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationService.java (original)
+++ directory/apacheds/branches/bigbang/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java Tue Oct 9 12:54:55 2007
@@ -45,18 +45,18 @@
import org.apache.directory.server.core.invocation.Invocation;
import org.apache.directory.server.core.invocation.InvocationStack;
import org.apache.directory.server.core.partition.PartitionNexusProxy;
-import org.apache.directory.server.core.normalization.NormalizationService;
-import org.apache.directory.server.core.authn.AuthenticationService;
-import org.apache.directory.server.core.referral.ReferralService;
-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.operational.OperationalAttributeService;
-import org.apache.directory.server.core.schema.SchemaService;
-import org.apache.directory.server.core.subtree.SubentryService;
-import org.apache.directory.server.core.collective.CollectiveAttributeService;
-import org.apache.directory.server.core.event.EventService;
-import org.apache.directory.server.core.trigger.TriggerService;
+import org.apache.directory.server.core.normalization.NormalizationInterceptor;
+import org.apache.directory.server.core.authn.AuthenticationInterceptor;
+import org.apache.directory.server.core.referral.ReferralInterceptor;
+import org.apache.directory.server.core.authz.AciAuthorizationInterceptor;
+import org.apache.directory.server.core.authz.DefaultAuthorizationInterceptor;
+import org.apache.directory.server.core.exception.ExceptionInterceptor;
+import org.apache.directory.server.core.operational.OperationalAttributeInterceptor;
+import org.apache.directory.server.core.schema.SchemaInterceptor;
+import org.apache.directory.server.core.subtree.SubentryInterceptor;
+import org.apache.directory.server.core.collective.CollectiveAttributeInterceptor;
+import org.apache.directory.server.core.event.EventInterceptor;
+import org.apache.directory.server.core.trigger.TriggerInterceptor;
import org.apache.directory.server.kerberos.shared.crypto.encryption.EncryptionType;
import org.apache.directory.server.kerberos.shared.crypto.encryption.KerberosKeyFactory;
import org.apache.directory.server.kerberos.shared.crypto.encryption.RandomKeyFactory;
@@ -86,10 +86,10 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class KeyDerivationService extends BaseInterceptor
+public class KeyDerivationInterceptor extends BaseInterceptor
{
/** The log for this class. */
- private static final Logger log = LoggerFactory.getLogger( KeyDerivationService.class );
+ private static final Logger log = LoggerFactory.getLogger( KeyDerivationInterceptor.class );
/** The service name. */
public static final String NAME = "keyDerivationService";
@@ -101,18 +101,18 @@
static
{
Set<String> c = new HashSet<String>();
- c.add( NormalizationService.class.getName() );
- c.add( AuthenticationService.class.getName() );
- c.add( ReferralService.class.getName() );
- c.add( AuthorizationService.class.getName() );
- c.add( DefaultAuthorizationService.class.getName() );
- c.add( ExceptionService.class.getName() );
- c.add( OperationalAttributeService.class.getName() );
- c.add( SchemaService.class.getName() );
- c.add( SubentryService.class.getName() );
- c.add( CollectiveAttributeService.class.getName() );
- c.add( EventService.class.getName() );
- c.add( TriggerService.class.getName() );
+ c.add( NormalizationInterceptor.class.getName() );
+ c.add( AuthenticationInterceptor.class.getName() );
+ c.add( ReferralInterceptor.class.getName() );
+ c.add( AciAuthorizationInterceptor.class.getName() );
+ c.add( DefaultAuthorizationInterceptor.class.getName() );
+ c.add( ExceptionInterceptor.class.getName() );
+ c.add( OperationalAttributeInterceptor.class.getName() );
+ c.add( SchemaInterceptor.class.getName() );
+ c.add( SubentryInterceptor.class.getName() );
+ c.add( CollectiveAttributeInterceptor.class.getName() );
+ c.add( EventInterceptor.class.getName() );
+ c.add( TriggerInterceptor.class.getName() );
USERLOOKUP_BYPASS = Collections.unmodifiableCollection( c );
}
Propchange: directory/apacheds/branches/bigbang/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: directory/apacheds/branches/bigbang/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyInterceptor.java (from r583255, directory/apacheds/branches/bigbang/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyService.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyInterceptor.java?p2=directory/apacheds/branches/bigbang/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyInterceptor.java&p1=directory/apacheds/branches/bigbang/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyService.java&r1=583255&r2=583278&rev=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyService.java (original)
+++ directory/apacheds/branches/bigbang/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyInterceptor.java Tue Oct 9 12:54:55 2007
@@ -53,10 +53,10 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class PasswordPolicyService extends BaseInterceptor
+public class PasswordPolicyInterceptor extends BaseInterceptor
{
/** The log for this class. */
- private static final Logger log = LoggerFactory.getLogger( PasswordPolicyService.class );
+ private static final Logger log = LoggerFactory.getLogger( PasswordPolicyInterceptor.class );
/** The service name. */
public static final String NAME = "passwordPolicyService";
Propchange: directory/apacheds/branches/bigbang/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/configuration/ReplicationConfiguration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/configuration/ReplicationConfiguration.java?rev=583278&r1=583277&r2=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/configuration/ReplicationConfiguration.java (original)
+++ directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/configuration/ReplicationConfiguration.java Tue Oct 9 12:54:55 2007
@@ -37,7 +37,7 @@
import org.apache.directory.mitosis.common.DefaultUUIDFactory;
import org.apache.directory.mitosis.common.UUID;
import org.apache.directory.mitosis.common.UUIDFactory;
-import org.apache.directory.mitosis.service.ReplicationService;
+import org.apache.directory.mitosis.service.ReplicationInterceptor;
import org.apache.directory.mitosis.store.ReplicationStore;
import org.apache.directory.mitosis.store.derby.DerbyReplicationStore;
import org.apache.directory.shared.ldap.util.StringTools;
@@ -45,8 +45,8 @@
import org.slf4j.LoggerFactory;
/**
- * A configuration for {@link ReplicationService}. This configuration can be
- * used by calling {@link ReplicationService#setConfiguration(ReplicationConfiguration)}.
+ * A configuration for {@link ReplicationInterceptor}. This configuration can be
+ * used by calling {@link ReplicationInterceptor#setConfiguration(ReplicationConfiguration)}.
*
* @org.apache.xbean.XBean
*
@@ -94,7 +94,7 @@
}
/**
- * Returns the TCP/IP port number that a {@link ReplicationService}
+ * Returns the TCP/IP port number that a {@link ReplicationInterceptor}
* listens to. The default value is {@link #DEFAULT_SERVER_PORT}.
*/
public int getServerPort()
@@ -104,7 +104,7 @@
/**
- * Sets the TCP/IP port number that a {@link ReplicationService}
+ * Sets the TCP/IP port number that a {@link ReplicationInterceptor}
* listens to. The default value is {@link #DEFAULT_SERVER_PORT}.
*/
public void setServerPort( int serverPort )
Modified: directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ClientConnectionManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ClientConnectionManager.java?rev=583278&r1=583277&r2=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ClientConnectionManager.java (original)
+++ directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ClientConnectionManager.java Tue Oct 9 12:54:55 2007
@@ -51,7 +51,7 @@
/**
* Manages all outgoing connections to remote replicas.
* It gets the list of the peer {@link Replica}s from
- * {@link ReplicationService} and keeps trying to connect to them.
+ * {@link ReplicationInterceptor} and keeps trying to connect to them.
* <p>
* When the connection attempt fails, the interval between each connection
* attempt doubles up (0, 2, 4, 8, 16, ...) to 60 seconds at maximum.
@@ -70,7 +70,7 @@
{
private static final Logger log = LoggerFactory.getLogger( ClientConnectionManager.class );
- private final ReplicationService service;
+ private final ReplicationInterceptor interceptor;
private final IoConnector connector = new SocketConnector();
private final IoConnectorConfig connectorConfig = new SocketConnectorConfig();
private final Map<ReplicaId,Connection> sessions = new HashMap<ReplicaId,Connection>();
@@ -78,9 +78,9 @@
private ConnectionMonitor monitor;
- ClientConnectionManager( ReplicationService service )
+ ClientConnectionManager( ReplicationInterceptor interceptor )
{
- this.service = service;
+ this.interceptor = interceptor;
ExecutorThreadModel threadModel = ExecutorThreadModel.getInstance( "mitosis" );
threadModel.setExecutor( new ThreadPoolExecutor( 16, 16, 60, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>() ) );
@@ -362,7 +362,7 @@
{
connectorConfig.setConnectTimeout( configuration.getResponseTimeout() );
ConnectFuture future = connector.connect( replica.getAddress(), new ReplicationClientProtocolHandler(
- service ), connectorConfig );
+ interceptor ), connectorConfig );
future.join();
session = future.getSession();
Modified: directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/DefaultReplicationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/DefaultReplicationContext.java?rev=583278&r1=583277&r2=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/DefaultReplicationContext.java (original)
+++ directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/DefaultReplicationContext.java Tue Oct 9 12:54:55 2007
@@ -42,7 +42,7 @@
{
private static final Timer EXPIRATION_TIMER = new Timer( "ReplicationMessageExpirer" );
- private final ReplicationService service;
+ private final ReplicationInterceptor interceptor;
private final ReplicationConfiguration configuration;
private final DirectoryService directoryService;
private final IoSession session;
@@ -52,19 +52,19 @@
private State state = State.INIT;
- public DefaultReplicationContext( ReplicationService service, DirectoryService directoryService,
+ public DefaultReplicationContext( ReplicationInterceptor interceptor, DirectoryService directoryService,
ReplicationConfiguration configuration, IoSession session )
{
- this.service = service;
+ this.interceptor = interceptor;
this.configuration = configuration;
this.directoryService = directoryService;
this.session = session;
}
- public ReplicationService getService()
+ public ReplicationInterceptor getService()
{
- return service;
+ return interceptor;
}
Modified: directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationContext.java?rev=583278&r1=583277&r2=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationContext.java (original)
+++ directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationContext.java Tue Oct 9 12:54:55 2007
@@ -54,14 +54,14 @@
ReplicationConfiguration getConfiguration();
/**
- * Returns the {@link ReplicationService} which is managing this
+ * Returns the {@link ReplicationInterceptor} which is managing this
* context.
*/
- ReplicationService getService();
+ ReplicationInterceptor getService();
/**
- * Returns the {@link DirectoryService} which owns the {@link ReplicationService}
+ * Returns the {@link DirectoryService} which owns the {@link ReplicationInterceptor}
* which is managing this context.
*/
DirectoryService getDirectoryService();
Copied: directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationInterceptor.java (from r583255, directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationService.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationInterceptor.java?p2=directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationInterceptor.java&p1=directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationService.java&r1=583255&r2=583278&rev=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationService.java (original)
+++ directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationInterceptor.java Tue Oct 9 12:54:55 2007
@@ -87,7 +87,7 @@
* {@link Operation} to {@link ReplicationStore}) are performed automatically
* when
* {@link Operation#execute(PartitionNexus, ReplicationStore, AttributeTypeRegistry)}
- * method is invoked. {@link ReplicationService} always call it instead of
+ * method is invoked. {@link ReplicationInterceptor} always call it instead of
* forwarding the requested operation to the next {@link Interceptor}.
* <p>
* The last action takes place by {@link ReplicationClientContextHandler},
@@ -120,9 +120,9 @@
* @author The Apache Directory Project (dev@directory.apache.org)
* @version $Rev$, $Date$
*/
-public class ReplicationService extends BaseInterceptor
+public class ReplicationInterceptor extends BaseInterceptor
{
- private static final Logger LOG = LoggerFactory.getLogger( ReplicationService.class );
+ private static final Logger LOG = LoggerFactory.getLogger( ReplicationInterceptor.class );
/** The service name */
public static final String NAME = "replicationService";
@@ -146,7 +146,7 @@
private AttributeTypeRegistry attrRegistry;
- public ReplicationService()
+ public ReplicationInterceptor()
{
}
Propchange: directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationLogCleanJob.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationLogCleanJob.java?rev=583278&r1=583277&r2=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationLogCleanJob.java (original)
+++ directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationLogCleanJob.java Tue Oct 9 12:54:55 2007
@@ -35,7 +35,7 @@
* A <a href="http://www.opensymphony.com/quartz/">OpenSymphony Quartz</a>
* {@link Job} that purges old replication logs and the old entries marked as
* 'deleted' (i.e. {@link Constants#ENTRY_DELETED} is <tt>TRUE</tt>). This
- * {@link Job} just calls {@link ReplicationService#purgeAgedData()} to
+ * {@link Job} just calls {@link ReplicationInterceptor#purgeAgedData()} to
* purge old data.
*
* @author The Apache Directory Project Team
@@ -77,11 +77,11 @@
{
for ( Interceptor interceptor : service.getInterceptorChain().getAll() )
{
- if ( interceptor instanceof ReplicationService )
+ if ( interceptor instanceof ReplicationInterceptor )
{
try
{
- ( ( ReplicationService ) interceptor ).purgeAgedData();
+ ( ( ReplicationInterceptor ) interceptor ).purgeAgedData();
}
catch ( NamingException e )
{
Modified: directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationClientProtocolHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationClientProtocolHandler.java?rev=583278&r1=583277&r2=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationClientProtocolHandler.java (original)
+++ directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationClientProtocolHandler.java Tue Oct 9 12:54:55 2007
@@ -20,7 +20,7 @@
package org.apache.directory.mitosis.service.protocol.handler;
-import org.apache.directory.mitosis.service.ReplicationService;
+import org.apache.directory.mitosis.service.ReplicationInterceptor;
/**
* A {@link ReplicationProtocolHandler} for client-side, which uses
@@ -33,8 +33,8 @@
*/
public class ReplicationClientProtocolHandler extends ReplicationProtocolHandler
{
- public ReplicationClientProtocolHandler( ReplicationService service )
+ public ReplicationClientProtocolHandler( ReplicationInterceptor interceptor )
{
- super( service, new ReplicationClientContextHandler() );
+ super( interceptor, new ReplicationClientContextHandler() );
}
}
Modified: directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationProtocolHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationProtocolHandler.java?rev=583278&r1=583277&r2=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationProtocolHandler.java (original)
+++ directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationProtocolHandler.java Tue Oct 9 12:54:55 2007
@@ -23,7 +23,7 @@
import org.apache.directory.mitosis.configuration.ReplicationConfiguration;
import org.apache.directory.mitosis.service.DefaultReplicationContext;
import org.apache.directory.mitosis.service.ReplicationContext;
-import org.apache.directory.mitosis.service.ReplicationService;
+import org.apache.directory.mitosis.service.ReplicationInterceptor;
import org.apache.directory.server.core.DirectoryService;
import org.apache.mina.common.IdleStatus;
import org.apache.mina.common.IoHandler;
@@ -40,20 +40,20 @@
{
private static final String CONTEXT = "context";
- private final ReplicationService service;
+ private final ReplicationInterceptor interceptor;
private final ReplicationConfiguration configuration;
private final DirectoryService directoryService;
private final ReplicationContextHandler contextHandler;
- public ReplicationProtocolHandler( ReplicationService service, ReplicationContextHandler contextHandler )
+ public ReplicationProtocolHandler( ReplicationInterceptor interceptor, ReplicationContextHandler contextHandler )
{
- assert service != null;
+ assert interceptor != null;
assert contextHandler != null;
- this.service = service;
- this.configuration = service.getConfiguration();
- this.directoryService = service.getDirectoryService();
+ this.interceptor = interceptor;
+ this.configuration = interceptor.getConfiguration();
+ this.directoryService = interceptor.getDirectoryService();
this.contextHandler = contextHandler;
}
@@ -71,7 +71,7 @@
public void sessionCreated( IoSession session ) throws Exception
{
session.setAttribute( CONTEXT,
- new DefaultReplicationContext( service, directoryService, configuration, session ) );
+ new DefaultReplicationContext( interceptor, directoryService, configuration, session ) );
}
Modified: directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationServerProtocolHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationServerProtocolHandler.java?rev=583278&r1=583277&r2=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationServerProtocolHandler.java (original)
+++ directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationServerProtocolHandler.java Tue Oct 9 12:54:55 2007
@@ -20,7 +20,7 @@
package org.apache.directory.mitosis.service.protocol.handler;
-import org.apache.directory.mitosis.service.ReplicationService;
+import org.apache.directory.mitosis.service.ReplicationInterceptor;
/**
* A {@link ReplicationProtocolHandler} for server-side, which uses
@@ -33,8 +33,8 @@
*/
public class ReplicationServerProtocolHandler extends ReplicationProtocolHandler
{
- public ReplicationServerProtocolHandler( ReplicationService service )
+ public ReplicationServerProtocolHandler( ReplicationInterceptor interceptor )
{
- super( service, new ReplicationServerContextHandler() );
+ super( interceptor, new ReplicationServerContextHandler() );
}
}
Modified: directory/apacheds/branches/bigbang/mitosis/src/test/java/org/apache/directory/mitosis/service/AbstractReplicationServiceTestCase.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/mitosis/src/test/java/org/apache/directory/mitosis/service/AbstractReplicationServiceTestCase.java?rev=583278&r1=583277&r2=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/mitosis/src/test/java/org/apache/directory/mitosis/service/AbstractReplicationServiceTestCase.java (original)
+++ directory/apacheds/branches/bigbang/mitosis/src/test/java/org/apache/directory/mitosis/service/AbstractReplicationServiceTestCase.java Tue Oct 9 12:54:55 2007
@@ -52,7 +52,7 @@
private static final Logger LOG = LoggerFactory.getLogger( AbstractReplicationServiceTestCase.class );
protected Map<String, LdapContext> contexts = new HashMap<String, LdapContext>();
protected Map<String, DirectoryService> services = new HashMap<String, DirectoryService>();
- protected Map<String, ReplicationService> replicationServices = new HashMap<String, ReplicationService>();
+ protected Map<String, ReplicationInterceptor> replicationServices = new HashMap<String, ReplicationInterceptor>();
protected void setUp() throws Exception
{
@@ -112,9 +112,9 @@
}
}
- ReplicationService replicationService = new ReplicationService();
- replicationService.setConfiguration( replicationCfg );
- interceptors.add( replicationService );
+ ReplicationInterceptor replicationInterceptor = new ReplicationInterceptor();
+ replicationInterceptor.setConfiguration( replicationCfg );
+ interceptors.add( replicationInterceptor );
service.setInterceptors( interceptors );
@@ -138,13 +138,13 @@
LdapContext context = new InitialLdapContext( env, null );
contexts.put( replicaId, context );
services.put( replicaId, service );
- replicationServices.put( replicaId, replicationService );
+ replicationServices.put( replicaId, replicationInterceptor );
}
// Ensure all replicas have had a chance to connect to each other since the last one started.
- for ( ReplicationService replicationService : replicationServices.values() )
+ for ( ReplicationInterceptor replicationInterceptor : replicationServices.values() )
{
- replicationService.interruptConnectors();
+ replicationInterceptor.interruptConnectors();
}
Thread.sleep( 5000 );
}
Modified: directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/FastSearchTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/FastSearchTest.java?rev=583278&r1=583277&r2=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/FastSearchTest.java (original)
+++ directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/FastSearchTest.java Tue Oct 9 12:54:55 2007
@@ -35,7 +35,7 @@
import javax.naming.ldap.Control;
import javax.naming.ldap.LdapContext;
-import org.apache.directory.server.core.subtree.SubentryService;
+import org.apache.directory.server.core.subtree.SubentryInterceptor;
import org.apache.directory.server.unit.AbstractServerFastTest;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.message.AttributeImpl;
@@ -530,9 +530,9 @@
Attributes ap = ctx.getAttributes( "", new String[] { "administrativeRole" } );
Attribute administrativeRole = ap.get( "administrativeRole" );
- if ( administrativeRole == null || !administrativeRole.contains( SubentryService.AC_AREA ) )
+ if ( administrativeRole == null || !administrativeRole.contains( SubentryInterceptor.AC_AREA ) )
{
- Attributes changes = new AttributesImpl( "administrativeRole", SubentryService.AC_AREA, true );
+ Attributes changes = new AttributesImpl( "administrativeRole", SubentryInterceptor.AC_AREA, true );
ctx.modifyAttributes( "", DirContext.ADD_ATTRIBUTE, changes );
}
@@ -563,7 +563,7 @@
Attributes ap = ctx.getAttributes( "", new String[] { "administrativeRole" } );
Attribute administrativeRole = ap.get( "administrativeRole" );
- if ( administrativeRole != null && administrativeRole.contains( SubentryService.AC_AREA ) )
+ if ( administrativeRole != null && administrativeRole.contains( SubentryInterceptor.AC_AREA ) )
{
Attribute administrativeRoleAttr = new AttributeImpl( "administrativeRole" );
Modified: directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/KeyDerivationServiceITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/KeyDerivationServiceITest.java?rev=583278&r1=583277&r2=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/KeyDerivationServiceITest.java (original)
+++ directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/KeyDerivationServiceITest.java Tue Oct 9 12:54:55 2007
@@ -21,7 +21,7 @@
import org.apache.directory.server.core.interceptor.Interceptor;
-import org.apache.directory.server.core.kerberos.KeyDerivationService;
+import org.apache.directory.server.core.kerberos.KeyDerivationInterceptor;
import org.apache.directory.server.core.partition.Partition;
import org.apache.directory.server.core.partition.impl.btree.Index;
import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
@@ -49,7 +49,7 @@
/**
- * An {@link AbstractServerTest} testing the (@link {@link KeyDerivationService}'s
+ * An {@link AbstractServerTest} testing the (@link {@link KeyDerivationInterceptor}'s
* ability to derive Kerberos symmetric keys based on userPassword and principal
* name and to generate random keys when the special keyword "randomKey" is used.
*
@@ -102,7 +102,7 @@
List<Interceptor> list = apacheDS.getDirectoryService().getInterceptors();
- list.add( new KeyDerivationService() );
+ list.add( new KeyDerivationInterceptor() );
apacheDS.getDirectoryService().setInterceptors( list );
doDelete( apacheDS.getDirectoryService().getWorkingDirectory() );
Modified: directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/PasswordPolicyServiceITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/PasswordPolicyServiceITest.java?rev=583278&r1=583277&r2=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/PasswordPolicyServiceITest.java (original)
+++ directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/PasswordPolicyServiceITest.java Tue Oct 9 12:54:55 2007
@@ -21,7 +21,7 @@
import org.apache.directory.server.core.interceptor.Interceptor;
-import org.apache.directory.server.core.kerberos.PasswordPolicyService;
+import org.apache.directory.server.core.kerberos.PasswordPolicyInterceptor;
import org.apache.directory.server.core.partition.Partition;
import org.apache.directory.server.core.partition.impl.btree.Index;
import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
@@ -42,7 +42,7 @@
/**
- * An {@link AbstractServerTest} testing the (@link {@link PasswordPolicyService}.
+ * An {@link AbstractServerTest} testing the (@link {@link PasswordPolicyInterceptor}.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
@@ -54,7 +54,7 @@
/**
- * Set up a partition for EXAMPLE.COM, add the {@link PasswordPolicyService}
+ * Set up a partition for EXAMPLE.COM, add the {@link PasswordPolicyInterceptor}
* interceptor, and create a users subcontext.
*/
public void setUp() throws Exception
@@ -90,7 +90,7 @@
List<Interceptor> list = apacheDS.getDirectoryService().getInterceptors();
- list.add( new PasswordPolicyService() );
+ list.add( new PasswordPolicyInterceptor() );
apacheDS.getDirectoryService().setInterceptors( list );
super.setUp();
Modified: directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/SaslGssapiBindITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/SaslGssapiBindITest.java?rev=583278&r1=583277&r2=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/SaslGssapiBindITest.java (original)
+++ directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/SaslGssapiBindITest.java Tue Oct 9 12:54:55 2007
@@ -22,7 +22,7 @@
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.interceptor.Interceptor;
-import org.apache.directory.server.core.kerberos.KeyDerivationService;
+import org.apache.directory.server.core.kerberos.KeyDerivationInterceptor;
import org.apache.directory.server.core.partition.Partition;
import org.apache.directory.server.core.partition.impl.btree.Index;
import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
@@ -120,7 +120,7 @@
apacheDS.getDirectoryService().setPartitions( partitions );
List<Interceptor> list = apacheDS.getDirectoryService().getInterceptors();
- list.add( new KeyDerivationService() );
+ list.add( new KeyDerivationInterceptor() );
apacheDS.getDirectoryService().setInterceptors( list );
doDelete( apacheDS.getDirectoryService().getWorkingDirectory() );
Modified: directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/SearchITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/SearchITest.java?rev=583278&r1=583277&r2=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/SearchITest.java (original)
+++ directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/SearchITest.java Tue Oct 9 12:54:55 2007
@@ -37,7 +37,7 @@
import javax.naming.ldap.InitialLdapContext;
import javax.naming.ldap.LdapContext;
-import org.apache.directory.server.core.subtree.SubentryService;
+import org.apache.directory.server.core.subtree.SubentryInterceptor;
import org.apache.directory.server.unit.AbstractServerTest;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.message.AttributeImpl;
@@ -513,9 +513,9 @@
// modify ou=system to be an AP for an A/C AA if it is not already
Attributes ap = adminCtx.getAttributes( "", new String[] { "administrativeRole" } );
Attribute administrativeRole = ap.get( "administrativeRole" );
- if ( administrativeRole == null || !administrativeRole.contains( SubentryService.AC_AREA ) )
+ if ( administrativeRole == null || !administrativeRole.contains( SubentryInterceptor.AC_AREA ) )
{
- Attributes changes = new AttributesImpl( "administrativeRole", SubentryService.AC_AREA, true );
+ Attributes changes = new AttributesImpl( "administrativeRole", SubentryInterceptor.AC_AREA, true );
adminCtx.modifyAttributes( "", DirContext.ADD_ATTRIBUTE, changes );
}
Modified: directory/apacheds/branches/bigbang/server-xml/src/main/resources/server.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/server-xml/src/main/resources/server.xml?rev=583278&r1=583277&r2=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/server-xml/src/main/resources/server.xml (original)
+++ directory/apacheds/branches/bigbang/server-xml/src/main/resources/server.xml Tue Oct 9 12:54:55 2007
@@ -74,27 +74,27 @@
</partitions>
<interceptors>
- <normalizationService/>
- <authenticationService/>
- <referralService/>
- <authorizationService/>
- <defaultAuthorizationService/>
- <exceptionService/>
- <operationalAttributeService/>
+ <normalizationInterceptor/>
+ <authenticationInterceptor/>
+ <referralInterceptor/>
+ <aciAuthorizationInterceptor/>
+ <defaultAuthorizationInterceptor/>
+ <exceptionInterceptor/>
+ <operationalAttributeInterceptor/>
- <!-- Uncomment to enable the password policy service
- <passwordPolicyService/>
- <keyDerivationService/>
+ <!-- Uncomment to enable the password policy interceptor
+ <passwordPolicyInterceptor/>
+ <keyDerivationInterceptor/>
-->
- <schemaService/>
- <subentryService/>
- <collectiveAttributeService/>
- <eventService/>
- <triggerService/>
+ <schemaInterceptor/>
+ <subentryInterceptor/>
+ <collectiveAttributeInterceptor/>
+ <eventInterceptor/>
+ <triggerInterceptor/>
- <!-- Uncomment to enable replication service
- <replicationService >
+ <!-- Uncomment to enable replication interceptor
+ <replicationInterceptor>
<configuration>
<replicationConfiguration serverPort="10390" peerReplicas="instance_b@localhost:10392">
<replicaId>
@@ -102,7 +102,7 @@
</replicaId>
</replicationConfiguration>
</configuration>
- </replicationService>
+ </replicationInterceptor>
-->
</interceptors>
</defaultDirectoryService>