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/02/02 22:26:55 UTC
svn commit: r502757 - in /directory/apacheds/trunk:
core/src/main/java/org/apache/directory/server/core/configuration/
core/src/main/java/org/apache/directory/server/core/schema/
server-installers/src/main/installers/
Author: akarasulu
Date: Fri Feb 2 13:26:54 2007
New Revision: 502757
URL: http://svn.apache.org/viewvc?view=rev&rev=502757
Log:
putting the operational attribute interceptor in front of the schema interceptor so creatorsName is available to it
Modified:
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/schema/SchemaPartitionDao.java
directory/apacheds/trunk/server-installers/src/main/installers/server.xml
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=502757&r1=502756&r2=502757
==============================================================================
--- 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 Fri Feb 2 13:26:54 2007
@@ -101,10 +101,7 @@
private void setDefaultAuthenticatorConfigurations()
{
- Set set;
-
- // Set default authenticator configurations
- set = new HashSet();
+ Set<AuthenticatorConfiguration> set = new HashSet<AuthenticatorConfiguration>();
MutableAuthenticatorConfiguration authCfg;
@@ -128,7 +125,7 @@
{
// Set default interceptor chains
InterceptorConfiguration interceptorCfg;
- List list = new ArrayList();
+ List<InterceptorConfiguration> list = new ArrayList<InterceptorConfiguration>();
interceptorCfg = new MutableInterceptorConfiguration();
interceptorCfg.setName( "normalizationService" );
@@ -161,6 +158,11 @@
list.add( interceptorCfg );
interceptorCfg = new MutableInterceptorConfiguration();
+ interceptorCfg.setName( "operationalAttributeService" );
+ interceptorCfg.setInterceptor( new OperationalAttributeService() );
+ list.add( interceptorCfg );
+
+ interceptorCfg = new MutableInterceptorConfiguration();
interceptorCfg.setName( "schemaService" );
interceptorCfg.setInterceptor( new SchemaService() );
list.add( interceptorCfg );
@@ -168,11 +170,6 @@
interceptorCfg = new MutableInterceptorConfiguration();
interceptorCfg.setName( "subentryService" );
interceptorCfg.setInterceptor( new SubentryService() );
- list.add( interceptorCfg );
-
- interceptorCfg = new MutableInterceptorConfiguration();
- interceptorCfg.setName( "operationalAttributeService" );
- interceptorCfg.setInterceptor( new OperationalAttributeService() );
list.add( interceptorCfg );
interceptorCfg = new MutableInterceptorConfiguration();
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java?view=diff&rev=502757&r1=502756&r2=502757
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java Fri Feb 2 13:26:54 2007
@@ -73,6 +73,8 @@
/** static class logger */
private final static Logger log = LoggerFactory.getLogger( SchemaPartitionDao.class );
private final static NumericOidSyntaxChecker NUMERIC_OID_CHECKER = new NumericOidSyntaxChecker();
+ private static final String[] SCHEMA_ATTRIBUTES = new String[] {
+ "creatorsName", "m-dependencies", "objectClass", "cn", "m-disabled" };
private final Partition partition;
@@ -161,8 +163,7 @@
return schemaNames;
}
- private static final String[] SCHEMA_ATTRIBUTES = new String[] {
- "creatorsName", "m-dependencies", "objectClass", "cn", "m-disabled" };
+
private NamingEnumeration listSchemas() throws NamingException
{
LdapDN base = new LdapDN( "ou=schema" );
Modified: directory/apacheds/trunk/server-installers/src/main/installers/server.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-installers/src/main/installers/server.xml?view=diff&rev=502757&r1=502756&r2=502757
==============================================================================
--- directory/apacheds/trunk/server-installers/src/main/installers/server.xml (original)
+++ directory/apacheds/trunk/server-installers/src/main/installers/server.xml Fri Feb 2 13:26:54 2007
@@ -145,21 +145,21 @@
</property>
</bean>
<bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
- <property name="name" value="schemaService" />
+ <property name="name" value="operationalAttributeService" />
<property name="interceptor">
- <bean class="org.apache.directory.server.core.schema.SchemaService" />
+ <bean class="org.apache.directory.server.core.operational.OperationalAttributeService" />
</property>
</bean>
<bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
- <property name="name" value="subentryService" />
+ <property name="name" value="schemaService" />
<property name="interceptor">
- <bean class="org.apache.directory.server.core.subtree.SubentryService" />
+ <bean class="org.apache.directory.server.core.schema.SchemaService" />
</property>
</bean>
<bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
- <property name="name" value="operationalAttributeService" />
+ <property name="name" value="subentryService" />
<property name="interceptor">
- <bean class="org.apache.directory.server.core.operational.OperationalAttributeService" />
+ <bean class="org.apache.directory.server.core.subtree.SubentryService" />
</property>
</bean>
<bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">