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/02/17 22:57:30 UTC
svn commit: r745265 - in /directory/apacheds/trunk: server-xml/
server-xml/src/main/resources/ xbean-spring/
Author: felixk
Date: Tue Feb 17 21:57:29 2009
New Revision: 745265
URL: http://svn.apache.org/viewvc?rev=745265&view=rev
Log:
Set current version in namespace. ATM there is no easy way to find out to which version the file belongs. There are already many different versions of these configuration files all having the same version in the namespace (...). Having the version not only in the jars file name but also in the file itself can make life easier.
To see also in conjunction with DIRSTUDIO-387.
To me it looks ATM like this namespace isn't used anywhere, so the change shouldn't cause any problems - at least all integration tests have passed.
Modified:
directory/apacheds/trunk/server-xml/pom.xml
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
directory/apacheds/trunk/xbean-spring/pom.xml
Modified: directory/apacheds/trunk/server-xml/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-xml/pom.xml?rev=745265&r1=745264&r2=745265&view=diff
==============================================================================
--- directory/apacheds/trunk/server-xml/pom.xml (original)
+++ directory/apacheds/trunk/server-xml/pom.xml Tue Feb 17 21:57:29 2009
@@ -33,6 +33,15 @@
A single authoritative server.xml file.
</description>
+ <build>
+ <resources>
+ <resource>
+ <filtering>true</filtering>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ </build>
+
<dependencies>
<dependency>
<groupId>org.apache.directory.server</groupId>
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=745265&r1=745264&r2=745265&view=diff
==============================================================================
--- directory/apacheds/trunk/server-xml/src/main/resources/server.xml (original)
+++ directory/apacheds/trunk/server-xml/src/main/resources/server.xml Tue Feb 17 21:57:29 2009
@@ -22,7 +22,7 @@
<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/1.0">
+ xmlns="http://apacheds.org/config/${pom.version}">
<defaultDirectoryService id="directoryService" instanceId="default"
replicaId="1"
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=745265&r1=745264&r2=745265&view=diff
==============================================================================
--- directory/apacheds/trunk/server-xml/src/main/resources/serverAuthenticatorInAuthenticationInterceptor.xml (original)
+++ directory/apacheds/trunk/server-xml/src/main/resources/serverAuthenticatorInAuthenticationInterceptor.xml Tue Feb 17 21:57:29 2009
@@ -22,7 +22,7 @@
<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/1.0">
+ xmlns="http://apacheds.org/config/${pom.version}">
<defaultDirectoryService id="directoryService" instanceId="default"
workingDirectory="example.com"
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=745265&r1=745264&r2=745265&view=diff
==============================================================================
--- directory/apacheds/trunk/server-xml/src/main/resources/serverJdbmPartition.xml (original)
+++ directory/apacheds/trunk/server-xml/src/main/resources/serverJdbmPartition.xml Tue Feb 17 21:57:29 2009
@@ -22,7 +22,7 @@
<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/1.0">
+ xmlns="http://apacheds.org/config/${pom.version}">
<defaultDirectoryService id="directoryService" instanceId="default"
workingDirectory="example.com"
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=745265&r1=745264&r2=745265&view=diff
==============================================================================
--- directory/apacheds/trunk/server-xml/src/main/resources/serverReplicationInterceptor.xml (original)
+++ directory/apacheds/trunk/server-xml/src/main/resources/serverReplicationInterceptor.xml Tue Feb 17 21:57:29 2009
@@ -22,7 +22,7 @@
<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/1.0">
+ xmlns="http://apacheds.org/config/${pom.version}">
<defaultDirectoryService id="directoryService" instanceId="default"
workingDirectory="example.com"
Modified: directory/apacheds/trunk/xbean-spring/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xbean-spring/pom.xml?rev=745265&r1=745264&r2=745265&view=diff
==============================================================================
--- directory/apacheds/trunk/xbean-spring/pom.xml (original)
+++ directory/apacheds/trunk/xbean-spring/pom.xml Tue Feb 17 21:57:29 2009
@@ -150,7 +150,7 @@
<executions>
<execution>
<configuration>
- <namespace>http://apacheds.org/config/1.0</namespace>
+ <namespace>http://apacheds.org/config/${project.version}</namespace>
<schema>target/xbean/${pom.artifactId}.xsd</schema>
</configuration>
<goals>