directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r751687 - in /directory/apacheds/trunk/server-xml/src/main/resources: server.xml serverAuthenticatorInAuthenticationInterceptor.xml serverJdbmPartition.xml serverReplicationInterceptor.xml
Date Mon, 09 Mar 2009 14:07:05 GMT
Author: felixk
Date: Mon Mar  9 14:07:04 2009
New Revision: 751687

URL: http://svn.apache.org/viewvc?rev=751687&view=rev
Log:
Cleanup configuration files:
- Remove CustomEditorConfigurer as it's no longer used
- Remove spring namespace as it's useless

Modified:
    directory/apacheds/trunk/server-xml/src/main/resources/server.xml
    directory/apacheds/trunk/server-xml/src/main/resources/serverAuthenticatorInAuthenticationInterceptor.xml
    directory/apacheds/trunk/server-xml/src/main/resources/serverJdbmPartition.xml
    directory/apacheds/trunk/server-xml/src/main/resources/serverReplicationInterceptor.xml

Modified: directory/apacheds/trunk/server-xml/src/main/resources/server.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-xml/src/main/resources/server.xml?rev=751687&r1=751686&r2=751687&view=diff
==============================================================================
--- directory/apacheds/trunk/server-xml/src/main/resources/server.xml (original)
+++ directory/apacheds/trunk/server-xml/src/main/resources/server.xml Mon Mar  9 14:07:04
2009
@@ -20,9 +20,8 @@
 -->
 
 
-<spring:beans xmlns:spring="http://xbean.apache.org/schemas/spring/1.0" 
-              xmlns:s="http://www.springframework.org/schema/beans"
-              xmlns="http://apacheds.org/config/${pom.version}">
+<beans xmlns="http://apacheds.org/config/${pom.version}"
+       xmlns:s="http://www.springframework.org/schema/beans">
 
   <defaultDirectoryService id="directoryService" instanceId="default"
                            replicaId="1"
@@ -247,15 +246,4 @@
     <ldapService>#ldapService</ldapService>
     <ldapsService>#ldapsService</ldapsService>
   </apacheDS>
-
-  <!-- another bean I didn't convert -->
-  <spring:bean class="org.springframework.beans.factory.config.CustomEditorConfigurer">
-    <spring:property name="customEditors">
-      <spring:map>
-        <spring:entry key="javax.naming.directory.Attributes">
-          <spring:bean class="org.apache.directory.server.core.configuration.AttributesPropertyEditor"/>
-        </spring:entry>
-      </spring:map>
-    </spring:property>
-  </spring:bean>
-</spring:beans>
+</beans>

Modified: directory/apacheds/trunk/server-xml/src/main/resources/serverAuthenticatorInAuthenticationInterceptor.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-xml/src/main/resources/serverAuthenticatorInAuthenticationInterceptor.xml?rev=751687&r1=751686&r2=751687&view=diff
==============================================================================
--- directory/apacheds/trunk/server-xml/src/main/resources/serverAuthenticatorInAuthenticationInterceptor.xml
(original)
+++ directory/apacheds/trunk/server-xml/src/main/resources/serverAuthenticatorInAuthenticationInterceptor.xml
Mon Mar  9 14:07:04 2009
@@ -20,9 +20,8 @@
 -->
 
 
-<spring:beans xmlns:spring="http://xbean.apache.org/schemas/spring/1.0" 
-              xmlns:s="http://www.springframework.org/schema/beans"
-              xmlns="http://apacheds.org/config/${pom.version}">
+<beans xmlns="http://apacheds.org/config/${pom.version}"
+       xmlns:s="http://www.springframework.org/schema/beans">
               
   <defaultDirectoryService id="directoryService" instanceId="default"
                            workingDirectory="example.com"
@@ -260,15 +259,4 @@
     <ldapService>#ldapService</ldapService>
     <ldapsService>#ldapsService</ldapsService>
   </apacheDS>
-
-  <!-- another bean I didn't convert -->
-  <spring:bean class="org.springframework.beans.factory.config.CustomEditorConfigurer">
-    <spring:property name="customEditors">
-      <spring:map>
-        <spring:entry key="javax.naming.directory.Attributes">
-          <spring:bean class="org.apache.directory.server.core.configuration.AttributesPropertyEditor"/>
-        </spring:entry>
-      </spring:map>
-    </spring:property>
-  </spring:bean>
-</spring:beans>
+</beans>

Modified: directory/apacheds/trunk/server-xml/src/main/resources/serverJdbmPartition.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-xml/src/main/resources/serverJdbmPartition.xml?rev=751687&r1=751686&r2=751687&view=diff
==============================================================================
--- directory/apacheds/trunk/server-xml/src/main/resources/serverJdbmPartition.xml (original)
+++ directory/apacheds/trunk/server-xml/src/main/resources/serverJdbmPartition.xml Mon Mar
 9 14:07:04 2009
@@ -20,9 +20,8 @@
 -->
 
 
-<spring:beans xmlns:spring="http://xbean.apache.org/schemas/spring/1.0" 
-              xmlns:s="http://www.springframework.org/schema/beans"
-              xmlns="http://apacheds.org/config/${pom.version}">
+<beans xmlns="http://apacheds.org/config/${pom.version}"
+       xmlns:s="http://www.springframework.org/schema/beans">
 
   <defaultDirectoryService id="directoryService" instanceId="default"
                            workingDirectory="example.com"
@@ -249,15 +248,4 @@
     <ldapService>#ldapService</ldapService>
     <ldapsService>#ldapsService</ldapsService>
   </apacheDS>
-
-  <!-- another bean I didn't convert -->
-  <spring:bean class="org.springframework.beans.factory.config.CustomEditorConfigurer">
-    <spring:property name="customEditors">
-      <spring:map>
-        <spring:entry key="javax.naming.directory.Attributes">
-          <spring:bean class="org.apache.directory.server.core.configuration.AttributesPropertyEditor"/>
-        </spring:entry>
-      </spring:map>
-    </spring:property>
-  </spring:bean>
-</spring:beans>
+</beans>

Modified: directory/apacheds/trunk/server-xml/src/main/resources/serverReplicationInterceptor.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-xml/src/main/resources/serverReplicationInterceptor.xml?rev=751687&r1=751686&r2=751687&view=diff
==============================================================================
--- directory/apacheds/trunk/server-xml/src/main/resources/serverReplicationInterceptor.xml
(original)
+++ directory/apacheds/trunk/server-xml/src/main/resources/serverReplicationInterceptor.xml
Mon Mar  9 14:07:04 2009
@@ -20,9 +20,8 @@
 -->
 
 
-<spring:beans xmlns:spring="http://xbean.apache.org/schemas/spring/1.0" 
-              xmlns:s="http://www.springframework.org/schema/beans"
-              xmlns="http://apacheds.org/config/${pom.version}">
+<beans xmlns="http://apacheds.org/config/${pom.version}"
+       xmlns:s="http://www.springframework.org/schema/beans">
               
   <defaultDirectoryService id="directoryService" instanceId="default"
                            workingDirectory="example.com"
@@ -254,15 +253,4 @@
     <ldapService>#ldapService</ldapService>
     <ldapsService>#ldapsService</ldapsService>
   </apacheDS>
-
-  <!-- another bean I didn't convert -->
-  <spring:bean class="org.springframework.beans.factory.config.CustomEditorConfigurer">
-    <spring:property name="customEditors">
-      <spring:map>
-        <spring:entry key="javax.naming.directory.Attributes">
-          <spring:bean class="org.apache.directory.server.core.configuration.AttributesPropertyEditor"/>
-        </spring:entry>
-      </spring:map>
-    </spring:property>
-  </spring:bean>
-</spring:beans>
+</beans>



Mime
View raw message