You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by fe...@apache.org on 2009/03/09 20:12:17 UTC
svn commit: r751794 - in
/directory/apacheds/trunk/server-xml/src/main/resources: server.xml
serverAuthenticatorInAuthenticationInterceptor.xml serverJdbmPartition.xml
serverReplicationInterceptor.xml
Author: felixk
Date: Mon Mar 9 19:12:16 2009
New Revision: 751794
URL: http://svn.apache.org/viewvc?rev=751794&view=rev
Log:
Partial revert of commit 751687 as suggested by David and Stefan
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=751794&r1=751793&r2=751794&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 19:12:16 2009
@@ -20,7 +20,8 @@
-->
-<beans xmlns="http://apacheds.org/config/${pom.version}"
+<spring:beans xmlns="http://apacheds.org/config/${pom.version}"
+ xmlns:spring="http://xbean.apache.org/schemas/spring/1.0"
xmlns:s="http://www.springframework.org/schema/beans">
<defaultDirectoryService id="directoryService" instanceId="default"
@@ -246,4 +247,4 @@
<ldapService>#ldapService</ldapService>
<ldapsService>#ldapsService</ldapsService>
</apacheDS>
-</beans>
+</spring: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=751794&r1=751793&r2=751794&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 19:12:16 2009
@@ -20,7 +20,8 @@
-->
-<beans xmlns="http://apacheds.org/config/${pom.version}"
+<spring:beans xmlns="http://apacheds.org/config/${pom.version}"
+ xmlns:spring="http://xbean.apache.org/schemas/spring/1.0"
xmlns:s="http://www.springframework.org/schema/beans">
<defaultDirectoryService id="directoryService" instanceId="default"
@@ -259,4 +260,4 @@
<ldapService>#ldapService</ldapService>
<ldapsService>#ldapsService</ldapsService>
</apacheDS>
-</beans>
+</spring: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=751794&r1=751793&r2=751794&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 19:12:16 2009
@@ -20,7 +20,8 @@
-->
-<beans xmlns="http://apacheds.org/config/${pom.version}"
+<spring:beans xmlns="http://apacheds.org/config/${pom.version}"
+ xmlns:spring="http://xbean.apache.org/schemas/spring/1.0"
xmlns:s="http://www.springframework.org/schema/beans">
<defaultDirectoryService id="directoryService" instanceId="default"
@@ -248,4 +249,4 @@
<ldapService>#ldapService</ldapService>
<ldapsService>#ldapsService</ldapsService>
</apacheDS>
-</beans>
+</spring: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=751794&r1=751793&r2=751794&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 19:12:16 2009
@@ -20,7 +20,8 @@
-->
-<beans xmlns="http://apacheds.org/config/${pom.version}"
+<spring:beans xmlns="http://apacheds.org/config/${pom.version}"
+ xmlns:spring="http://xbean.apache.org/schemas/spring/1.0"
xmlns:s="http://www.springframework.org/schema/beans">
<defaultDirectoryService id="directoryService" instanceId="default"
@@ -253,4 +254,4 @@
<ldapService>#ldapService</ldapService>
<ldapsService>#ldapsService</ldapsService>
</apacheDS>
-</beans>
+</spring:beans>