directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r896549 - in /directory/shared/trunk: ldap-schema-dao/ ldap-schema-dao/src/ ldap-schema-dao/src/main/ ldap-schema-dao/src/main/java/ ldap-schema-dao/src/main/java/org/ ldap-schema-dao/src/main/java/org/apache/ ldap-schema-dao/src/main/java/...
Date Wed, 06 Jan 2010 17:21:00 GMT
Author: elecharny
Date: Wed Jan  6 17:20:41 2010
New Revision: 896549

URL: http://svn.apache.org/viewvc?rev=896549&view=rev
Log:
Merging branch into trunk

Added:
    directory/shared/trunk/ldap-schema-dao/   (props changed)
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-dao/
    directory/shared/trunk/ldap-schema-dao/pom.xml
      - copied unchanged from r896441, directory/shared/branches/shared-schema/ldap-schema-dao/pom.xml
    directory/shared/trunk/ldap-schema-dao/src/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-dao/src/
    directory/shared/trunk/ldap-schema-dao/src/main/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-dao/src/main/
    directory/shared/trunk/ldap-schema-dao/src/main/java/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-dao/src/main/java/
    directory/shared/trunk/ldap-schema-dao/src/main/java/org/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-dao/src/main/java/org/
    directory/shared/trunk/ldap-schema-dao/src/main/java/org/apache/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-dao/src/main/java/org/apache/
    directory/shared/trunk/ldap-schema-dao/src/main/java/org/apache/directory/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-dao/src/main/java/org/apache/directory/
    directory/shared/trunk/ldap-schema-dao/src/main/java/org/apache/directory/shared/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-dao/src/main/java/org/apache/directory/shared/
    directory/shared/trunk/ldap-schema-dao/src/main/java/org/apache/directory/shared/ldap/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-dao/src/main/java/org/apache/directory/shared/ldap/
    directory/shared/trunk/ldap-schema-dao/src/main/java/org/apache/directory/shared/ldap/schema/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-dao/src/main/java/org/apache/directory/shared/ldap/schema/
    directory/shared/trunk/ldap-schema-dao/src/main/java/org/apache/directory/shared/ldap/schema/dao/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-dao/src/main/java/org/apache/directory/shared/ldap/schema/dao/
    directory/shared/trunk/ldap-schema-dao/src/main/java/org/apache/directory/shared/ldap/schema/dao/file/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-dao/src/main/java/org/apache/directory/shared/ldap/schema/dao/file/
    directory/shared/trunk/ldap-schema-dao/src/test/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-dao/src/test/
    directory/shared/trunk/ldap-schema-dao/src/test/java/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-dao/src/test/java/
    directory/shared/trunk/ldap-schema-dao/src/test/java/org/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-dao/src/test/java/org/
    directory/shared/trunk/ldap-schema-dao/src/test/java/org/apache/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-dao/src/test/java/org/apache/
    directory/shared/trunk/ldap-schema-dao/src/test/java/org/apache/directory/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-dao/src/test/java/org/apache/directory/
    directory/shared/trunk/ldap-schema-dao/src/test/java/org/apache/directory/shared/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-dao/src/test/java/org/apache/directory/shared/
    directory/shared/trunk/ldap-schema-dao/src/test/java/org/apache/directory/shared/ldap/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-dao/src/test/java/org/apache/directory/shared/ldap/
    directory/shared/trunk/ldap-schema-dao/src/test/java/org/apache/directory/shared/ldap/schema/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-dao/src/test/java/org/apache/directory/shared/ldap/schema/
    directory/shared/trunk/ldap-schema-dao/src/test/resources/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-dao/src/test/resources/
    directory/shared/trunk/ldap-schema-dao/src/test/resources/log4j.properties
      - copied unchanged from r896441, directory/shared/branches/shared-schema/ldap-schema-dao/src/test/resources/log4j.properties
    directory/shared/trunk/ldap-schema-loader/   (props changed)
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-loader/
    directory/shared/trunk/ldap-schema-loader/pom.xml
      - copied unchanged from r896441, directory/shared/branches/shared-schema/ldap-schema-loader/pom.xml
    directory/shared/trunk/ldap-schema-loader/src/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-loader/src/
    directory/shared/trunk/ldap-schema-loader/src/main/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-loader/src/main/
    directory/shared/trunk/ldap-schema-loader/src/main/java/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/
    directory/shared/trunk/ldap-schema-loader/src/main/java/org/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/
    directory/shared/trunk/ldap-schema-loader/src/main/java/org/apache/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/
    directory/shared/trunk/ldap-schema-loader/src/main/java/org/apache/directory/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/
    directory/shared/trunk/ldap-schema-loader/src/main/java/org/apache/directory/shared/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/
    directory/shared/trunk/ldap-schema-loader/src/main/java/org/apache/directory/shared/ldap/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/ldap/
    directory/shared/trunk/ldap-schema-loader/src/main/java/org/apache/directory/shared/ldap/schema/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/ldap/schema/
    directory/shared/trunk/ldap-schema-loader/src/main/java/org/apache/directory/shared/ldap/schema/loader/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/ldap/schema/loader/
    directory/shared/trunk/ldap-schema-loader/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/
    directory/shared/trunk/ldap-schema-loader/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/AttributeClassLoader.java
      - copied unchanged from r896441, directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/AttributeClassLoader.java
    directory/shared/trunk/ldap-schema-loader/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/JarLdifSchemaLoader.java
      - copied unchanged from r896441, directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/JarLdifSchemaLoader.java
    directory/shared/trunk/ldap-schema-loader/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/LdifSchemaLoader.java
      - copied unchanged from r896441, directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/LdifSchemaLoader.java
    directory/shared/trunk/ldap-schema-loader/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaEntityFactory.java
      - copied unchanged from r896441, directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaEntityFactory.java
    directory/shared/trunk/ldap-schema-manager/   (props changed)
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-manager/
    directory/shared/trunk/ldap-schema-manager/pom.xml
      - copied unchanged from r896441, directory/shared/branches/shared-schema/ldap-schema-manager/pom.xml
    directory/shared/trunk/ldap-schema-manager/src/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-manager/src/
    directory/shared/trunk/ldap-schema-manager/src/main/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-manager/src/main/
    directory/shared/trunk/ldap-schema-manager/src/main/java/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-manager/src/main/java/
    directory/shared/trunk/ldap-schema-manager/src/main/java/org/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-manager/src/main/java/org/
    directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-manager/src/main/java/org/apache/
    directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-manager/src/main/java/org/apache/directory/
    directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-manager/src/main/java/org/apache/directory/shared/
    directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/
    directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/
    directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/
  (props changed)
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/
    directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/
  (props changed)
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/
    directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java
  (props changed)
      - copied unchanged from r896441, directory/shared/branches/shared-schema/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java
    directory/shared/trunk/ldap-schema-manager/src/test/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-manager/src/test/
    directory/shared/trunk/ldap-schema-manager/src/test/java/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-manager/src/test/java/
    directory/shared/trunk/ldap-schema-manager/src/test/java/org/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-manager/src/test/java/org/
    directory/shared/trunk/ldap-schema-manager/src/test/java/org/apache/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-manager/src/test/java/org/apache/
    directory/shared/trunk/ldap-schema-manager/src/test/java/org/apache/directory/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-manager/src/test/java/org/apache/directory/
    directory/shared/trunk/ldap-schema-manager/src/test/java/org/apache/directory/shared/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-manager/src/test/java/org/apache/directory/shared/
    directory/shared/trunk/ldap-schema-manager/src/test/java/org/apache/directory/shared/ldap/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-manager/src/test/java/org/apache/directory/shared/ldap/
    directory/shared/trunk/ldap-schema-manager/src/test/java/org/apache/directory/shared/ldap/schema/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-manager/src/test/java/org/apache/directory/shared/ldap/schema/
    directory/shared/trunk/ldap-schema-manager/src/test/java/org/apache/directory/shared/ldap/schema/loader/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-manager/src/test/java/org/apache/directory/shared/ldap/schema/loader/
    directory/shared/trunk/ldap-schema-manager/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-manager/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/
    directory/shared/trunk/ldap-schema-manager/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/JarLdifSchemaLoaderTest.java
      - copied unchanged from r896441, directory/shared/branches/shared-schema/ldap-schema-manager/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/JarLdifSchemaLoaderTest.java
    directory/shared/trunk/ldap-schema-manager/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/LdifSchemaLoaderTest.java
      - copied unchanged from r896441, directory/shared/branches/shared-schema/ldap-schema-manager/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/LdifSchemaLoaderTest.java
    directory/shared/trunk/ldap-schema-manager/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerAddTest.java
      - copied unchanged from r896441, directory/shared/branches/shared-schema/ldap-schema-manager/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerAddTest.java
    directory/shared/trunk/ldap-schema-manager/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerDelTest.java
      - copied unchanged from r896441, directory/shared/branches/shared-schema/ldap-schema-manager/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerDelTest.java
    directory/shared/trunk/ldap-schema-manager/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerEnableDisableLoadTest.java
      - copied unchanged from r896441, directory/shared/branches/shared-schema/ldap-schema-manager/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerEnableDisableLoadTest.java
    directory/shared/trunk/ldap-schema-manager/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerLoadTest.java
      - copied unchanged from r896441, directory/shared/branches/shared-schema/ldap-schema-manager/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerLoadTest.java
    directory/shared/trunk/ldap-schema-manager/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerLoadWithDepsTest.java
      - copied unchanged from r896441, directory/shared/branches/shared-schema/ldap-schema-manager/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerLoadWithDepsTest.java
    directory/shared/trunk/ldap-schema-manager/src/test/resources/
      - copied from r896441, directory/shared/branches/shared-schema/ldap-schema-manager/src/test/resources/
    directory/shared/trunk/ldap-schema-manager/src/test/resources/log4j.properties
      - copied unchanged from r896441, directory/shared/branches/shared-schema/ldap-schema-manager/src/test/resources/log4j.properties

Propchange: directory/shared/trunk/ldap-schema-dao/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jan  6 17:20:41 2010
@@ -0,0 +1,7 @@
+target
+*.iml
+*.iws
+*.ipr
+.project
+.classpath
+.settings

Propchange: directory/shared/trunk/ldap-schema-loader/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jan  6 17:20:41 2010
@@ -0,0 +1,5 @@
+target
+.project
+.settings
+.classpath
+*.iml

Propchange: directory/shared/trunk/ldap-schema-loader/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jan  6 17:20:41 2010
@@ -0,0 +1,3 @@
+/directory/apacheds/branches/apacheds-replication/schema-loader:749790-764110
+/directory/shared/branches/shared-replication/ldap-schema-loader:749791-764113
+/directory/shared/branches/shared-schema/ldap-schema-loader:806622-896441

Propchange: directory/shared/trunk/ldap-schema-manager/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jan  6 17:20:41 2010
@@ -0,0 +1,7 @@
+target
+*.iml
+*.iws
+*.ipr
+.project
+.classpath
+.settings

Propchange: directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jan  6 17:20:41 2010
@@ -0,0 +1,3 @@
+/directory/shared/branches/shared-replication/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager:749791-764113
+/directory/shared/branches/shared-schema/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager:806622-896441
+/directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager:806622-894844*

Propchange: directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jan  6 17:20:41 2010
@@ -0,0 +1,3 @@
+/directory/shared/branches/shared-replication/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:749791-764113
+/directory/shared/branches/shared-schema/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:806622-896441
+/directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:806622-894844*

Propchange: directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jan  6 17:20:41 2010
@@ -0,0 +1,3 @@
+/directory/shared/branches/shared-replication/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:749791-764113
+/directory/shared/branches/shared-schema/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:806622-896441
+/directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:806622-894844



Mime
View raw message