You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2010/07/22 09:42:36 UTC
svn commit: r966530 - in
/directory/apacheds/branches/apacheds-subtree/server-config: ./
src/main/java/org/apache/directory/server/config/ src/main/resources/
src/test/java/org/apache/directory/server/config/
Author: elecharny
Date: Thu Jul 22 07:42:35 2010
New Revision: 966530
URL: http://svn.apache.org/viewvc?rev=966530&view=rev
Log:
Merged back the trunk
Modified:
directory/apacheds/branches/apacheds-subtree/server-config/ (props changed)
directory/apacheds/branches/apacheds-subtree/server-config/pom.xml
directory/apacheds/branches/apacheds-subtree/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java (props changed)
directory/apacheds/branches/apacheds-subtree/server-config/src/main/resources/ (props changed)
directory/apacheds/branches/apacheds-subtree/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java (props changed)
Propchange: directory/apacheds/branches/apacheds-subtree/server-config/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 22 07:42:35 2010
@@ -1,4 +1,4 @@
/directory/apacheds/branches/apacheds-replication/server-config:749790-764110
/directory/apacheds/branches/apacheds-schema/server-config:806623-896441
/directory/apacheds/branches/xdbm-refactoring/server-config:945827-946347
-/directory/apacheds/trunk/server-config:965704-966208
+/directory/apacheds/trunk/server-config:965704-966208,966529
Modified: directory/apacheds/branches/apacheds-subtree/server-config/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-subtree/server-config/pom.xml?rev=966530&r1=966529&r2=966530&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-subtree/server-config/pom.xml (original)
+++ directory/apacheds/branches/apacheds-subtree/server-config/pom.xml Thu Jul 22 07:42:35 2010
@@ -25,7 +25,7 @@
<version>1.5.8-SNAPSHOT</version>
</parent>
- <artifactId>apacheds-config</artifactId>
+ <artifactId>server-config</artifactId>
<name>ApacheDS Server Config</name>
<dependencies>
Propchange: directory/apacheds/branches/apacheds-subtree/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 22 07:42:35 2010
@@ -1,4 +1,4 @@
/directory/apacheds/branches/apacheds-replication/core-annotations/src/main/java/org/apache/directory/server/core/factory/ConfigPartitionReader.java:749790-764110
/directory/apacheds/branches/apacheds-schema/core-annotations/src/main/java/org/apache/directory/server/core/factory/ConfigPartitionReader.java:806623-896441
/directory/apacheds/branches/xdbm-refactoring/default-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:945827-946347
-/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:965704-966208
+/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:965704-966208,966529
Propchange: directory/apacheds/branches/apacheds-subtree/server-config/src/main/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 22 07:42:35 2010
@@ -4,4 +4,4 @@
/directory/apacheds/branches/apacheds-schema/core-annotations/src/main/resources:806623-896441
/directory/apacheds/branches/apacheds-schema/default-config/src/main/resources:806623-896441
/directory/apacheds/branches/xdbm-refactoring/default-config/src/main/resources:945827-946347
-/directory/apacheds/trunk/server-config/src/main/resources:965704-966208
+/directory/apacheds/trunk/server-config/src/main/resources:965704-966208,966529
Propchange: directory/apacheds/branches/apacheds-subtree/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 22 07:42:35 2010
@@ -2,4 +2,4 @@
/directory/apacheds/branches/apacheds-schema/core-annotations/src/main/java/org/apache/directory/server/core/factory/CiDITDirectoryServiceFactory.java:806623-896441
/directory/apacheds/branches/cidit/default-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:900288-900681
/directory/apacheds/branches/xdbm-refactoring/default-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:945827-946347
-/directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:965704-966208
+/directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:965704-966208,966529