directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r998086 - in /directory: apacheds/trunk/ apacheds/trunk/core-annotations/ apacheds/trunk/core-api/ apacheds/trunk/core-integ/ apacheds/trunk/core/ apacheds/trunk/jdbm-partition/ apacheds/trunk/ldif-partition/ apacheds/trunk/server-config/ a...
Date Fri, 17 Sep 2010 11:51:09 GMT
Author: elecharny
Date: Fri Sep 17 11:51:08 2010
New Revision: 998086

URL: http://svn.apache.org/viewvc?rev=998086&view=rev
Log:
Merged all the shared schema modules into shared-ldap-schema

Added:
    directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/
    directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/
      - copied from r997707, directory/shared/trunk/ldap-schema-loader/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/
    directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/manager/
    directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/
      - copied from r997707, directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/
    directory/shared/trunk/ldap-schema/src/main/resources/schema-all.ldif
      - copied unchanged from r997707, directory/shared/trunk/ldap-schema-loader/src/main/resources/schema-all.ldif
    directory/shared/trunk/ldap-schema/src/test/java/org/apache/directory/shared/ldap/aci/
      - copied from r997707, directory/shared/trunk/ldap-schema-manager-tests/src/test/java/org/apache/directory/shared/ldap/aci/
    directory/shared/trunk/ldap-schema/src/test/java/org/apache/directory/shared/ldap/schema/loader/
    directory/shared/trunk/ldap-schema/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/
      - copied from r997707, directory/shared/trunk/ldap-schema-manager-tests/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/
    directory/shared/trunk/ldap-schema/src/test/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/
      - copied from r997707, directory/shared/trunk/ldap-schema-manager-tests/src/test/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/
    directory/shared/trunk/ldap-schema/src/test/java/org/apache/directory/shared/ldap/subtree/
      - copied from r997707, directory/shared/trunk/ldap-schema-manager-tests/src/test/java/org/apache/directory/shared/ldap/subtree/
Removed:
    directory/shared/trunk/ldap-schema-loader/
    directory/shared/trunk/ldap-schema-manager/
    directory/shared/trunk/ldap-schema-manager-tests/
Modified:
    directory/apacheds/trunk/core-annotations/pom.xml
    directory/apacheds/trunk/core-api/pom.xml
    directory/apacheds/trunk/core-integ/pom.xml
    directory/apacheds/trunk/core/pom.xml
    directory/apacheds/trunk/jdbm-partition/pom.xml
    directory/apacheds/trunk/ldif-partition/pom.xml
    directory/apacheds/trunk/pom.xml
    directory/apacheds/trunk/server-config/pom.xml
    directory/apacheds/trunk/server-jndi/pom.xml
    directory/apacheds/trunk/server-tools/pom.xml
    directory/apacheds/trunk/xdbm-partition/pom.xml
    directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/Prototype
    directory/shared/trunk/all/pom.xml
    directory/shared/trunk/ldap-client-api/pom.xml
    directory/shared/trunk/pom.xml

Modified: directory/apacheds/trunk/core-annotations/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-annotations/pom.xml?rev=998086&r1=998085&r2=998086&view=diff
==============================================================================
--- directory/apacheds/trunk/core-annotations/pom.xml (original)
+++ directory/apacheds/trunk/core-annotations/pom.xml Fri Sep 17 11:51:08 2010
@@ -90,16 +90,6 @@
     
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-schema-loader</artifactId>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-schema-manager</artifactId>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldif</artifactId>
     </dependency>
   </dependencies>

Modified: directory/apacheds/trunk/core-api/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/pom.xml?rev=998086&r1=998085&r2=998086&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/pom.xml (original)
+++ directory/apacheds/trunk/core-api/pom.xml Fri Sep 17 11:51:08 2010
@@ -88,16 +88,6 @@
     
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-schema-loader</artifactId>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-schema-manager</artifactId>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldap-schema</artifactId>
     </dependency>
     

Modified: directory/apacheds/trunk/core-integ/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/pom.xml?rev=998086&r1=998085&r2=998086&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/pom.xml (original)
+++ directory/apacheds/trunk/core-integ/pom.xml Fri Sep 17 11:51:08 2010
@@ -95,7 +95,7 @@
 
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-schema-loader</artifactId>
+      <artifactId>shared-ldap-schema</artifactId>
     </dependency>
 
     <dependency>

Modified: directory/apacheds/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/pom.xml?rev=998086&r1=998085&r2=998086&view=diff
==============================================================================
--- directory/apacheds/trunk/core/pom.xml (original)
+++ directory/apacheds/trunk/core/pom.xml Fri Sep 17 11:51:08 2010
@@ -88,16 +88,6 @@
     
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-schema-loader</artifactId>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-schema-manager</artifactId>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldap-schema</artifactId>
     </dependency>
     

Modified: directory/apacheds/trunk/jdbm-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/pom.xml?rev=998086&r1=998085&r2=998086&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/pom.xml (original)
+++ directory/apacheds/trunk/jdbm-partition/pom.xml Fri Sep 17 11:51:08 2010
@@ -80,16 +80,6 @@
       <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldap-schema</artifactId>
     </dependency>
-    
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-schema-loader</artifactId>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-schema-manager</artifactId>
-    </dependency>
   </dependencies>
 
   <build>

Modified: directory/apacheds/trunk/ldif-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/pom.xml?rev=998086&r1=998085&r2=998086&view=diff
==============================================================================
--- directory/apacheds/trunk/ldif-partition/pom.xml (original)
+++ directory/apacheds/trunk/ldif-partition/pom.xml Fri Sep 17 11:51:08 2010
@@ -85,16 +85,6 @@
     
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-schema-loader</artifactId>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-schema-manager</artifactId>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldif</artifactId>
     </dependency>
   </dependencies>

Modified: directory/apacheds/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/pom.xml?rev=998086&r1=998085&r2=998086&view=diff
==============================================================================
--- directory/apacheds/trunk/pom.xml (original)
+++ directory/apacheds/trunk/pom.xml Fri Sep 17 11:51:08 2010
@@ -472,18 +472,6 @@
       
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
-        <artifactId>shared-ldap-schema-loader</artifactId>
-        <version>${org.apache.directory.shared.version}</version>
-      </dependency>
-      
-      <dependency>
-        <groupId>org.apache.directory.shared</groupId>
-        <artifactId>shared-ldap-schema-manager</artifactId>
-        <version>${org.apache.directory.shared.version}</version>
-      </dependency>
-      
-      <dependency>
-        <groupId>org.apache.directory.shared</groupId>
         <artifactId>ldap-client-api</artifactId>
         <version>${org.apache.directory.shared.version}</version>
       </dependency>

Modified: directory/apacheds/trunk/server-config/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/pom.xml?rev=998086&r1=998085&r2=998086&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/pom.xml (original)
+++ directory/apacheds/trunk/server-config/pom.xml Fri Sep 17 11:51:08 2010
@@ -133,16 +133,6 @@
 
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-schema-loader</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-schema-manager</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldif</artifactId>
     </dependency>
   </dependencies>

Modified: directory/apacheds/trunk/server-jndi/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-jndi/pom.xml?rev=998086&r1=998085&r2=998086&view=diff
==============================================================================
--- directory/apacheds/trunk/server-jndi/pom.xml (original)
+++ directory/apacheds/trunk/server-jndi/pom.xml Fri Sep 17 11:51:08 2010
@@ -83,16 +83,6 @@
       <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldap-schema</artifactId>
     </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-schema-loader</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-schema-manager</artifactId>
-    </dependency>
   </dependencies>
 
   <build>

Modified: directory/apacheds/trunk/server-tools/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-tools/pom.xml?rev=998086&r1=998085&r2=998086&view=diff
==============================================================================
--- directory/apacheds/trunk/server-tools/pom.xml (original)
+++ directory/apacheds/trunk/server-tools/pom.xml Fri Sep 17 11:51:08 2010
@@ -113,16 +113,6 @@
 
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-schema-loader</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-schema-manager</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldif</artifactId>
     </dependency>
   </dependencies>

Modified: directory/apacheds/trunk/xdbm-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/pom.xml?rev=998086&r1=998085&r2=998086&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/pom.xml (original)
+++ directory/apacheds/trunk/xdbm-partition/pom.xml Fri Sep 17 11:51:08 2010
@@ -80,16 +80,6 @@
       <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldap-schema</artifactId>
     </dependency>
-    
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-schema-manager</artifactId>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-schema-loader</artifactId>
-    </dependency>
   </dependencies>
 
   <build>

Modified: directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/Prototype
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/Prototype?rev=998086&r1=998085&r2=998086&view=diff
==============================================================================
--- directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/Prototype
(original)
+++ directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/Prototype
Fri Sep 17 11:51:08 2010
@@ -70,9 +70,6 @@ f none /opt/apacheds/lib/shared-ldap-con
 f none /opt/apacheds/lib/shared-ldap-converter-0.9.19-SNAPSHOT.jar 0644 apacheds apacheds
 f none /opt/apacheds/lib/shared-ldap-jndi-0.9.19-SNAPSHOT.jar 0644 apacheds apacheds
 f none /opt/apacheds/lib/shared-ldap-schema-0.9.19-SNAPSHOT.jar 0644 apacheds apacheds
-f none /opt/apacheds/lib/shared-ldap-schema-dao-0.9.19-SNAPSHOT.jar 0644 apacheds apacheds
-f none /opt/apacheds/lib/shared-ldap-schema-loader-0.9.19-SNAPSHOT.jar 0644 apacheds apacheds
-f none /opt/apacheds/lib/shared-ldap-schema-manager-0.9.19-SNAPSHOT.jar 0644 apacheds apacheds
 f none /opt/apacheds/lib/shared-ldif-0.9.19-SNAPSHOT.jar 0644 apacheds apacheds
 f none /opt/apacheds/lib/slf4j-api-1.5.11.jar 0644 apacheds apacheds
 f none /opt/apacheds/lib/slf4j-log4j12-1.5.11.jar 0644 apacheds apacheds

Modified: directory/shared/trunk/all/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/all/pom.xml?rev=998086&r1=998085&r2=998086&view=diff
==============================================================================
--- directory/shared/trunk/all/pom.xml (original)
+++ directory/shared/trunk/all/pom.xml Fri Sep 17 11:51:08 2010
@@ -81,16 +81,6 @@
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-schema-loader</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-schema-manager</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
       <artifactId>shared-ldif</artifactId>
     </dependency>
   </dependencies>

Modified: directory/shared/trunk/ldap-client-api/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-client-api/pom.xml?rev=998086&r1=998085&r2=998086&view=diff
==============================================================================
--- directory/shared/trunk/ldap-client-api/pom.xml (original)
+++ directory/shared/trunk/ldap-client-api/pom.xml Fri Sep 17 11:51:08 2010
@@ -69,12 +69,7 @@
 
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-schema-manager</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-schema-loader</artifactId>
+      <artifactId>shared-ldap-schema</artifactId>
     </dependency>
 
     <dependency>

Modified: directory/shared/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/pom.xml?rev=998086&r1=998085&r2=998086&view=diff
==============================================================================
--- directory/shared/trunk/pom.xml (original)
+++ directory/shared/trunk/pom.xml Fri Sep 17 11:51:08 2010
@@ -78,9 +78,6 @@
     <module>ldap-ldif</module>
     <module>ldap-constants</module>
     <module>ldap-schema</module>
-    <module>ldap-schema-loader</module>
-    <module>ldap-schema-manager</module>
-    <module>ldap-schema-manager-tests</module>
     <module>asn1-codec</module>
     <module>ldap-convert</module>
     <module>cursor</module>
@@ -175,18 +172,6 @@
 
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>shared-ldap-schema-loader</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>shared-ldap-schema-manager</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>${project.groupId}</groupId>
         <artifactId>shared-ldif</artifactId>
         <version>${project.version}</version>
       </dependency>



Mime
View raw message