directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r998144 - in /directory: apacheds/trunk/ apacheds/trunk/core-annotations/ apacheds/trunk/core-api/ apacheds/trunk/core-integ/ apacheds/trunk/core/ apacheds/trunk/ldif-partition/ apacheds/trunk/protocol-shared/ apacheds/trunk/server-config/ ...
Date Fri, 17 Sep 2010 14:10:50 GMT
Author: elecharny
Date: Fri Sep 17 14:10:49 2010
New Revision: 998144

URL: http://svn.apache.org/viewvc?rev=998144&view=rev
Log:
merged shared-ldif with shared-ldap

Added:
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/
      - copied from r998099, directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/
      - copied from r998099, directory/shared/trunk/ldap-ldif/src/test/java/org/apache/directory/shared/ldap/ldif/
Removed:
    directory/shared/trunk/ldap-ldif/
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/ldif-partition/pom.xml
    directory/apacheds/trunk/pom.xml
    directory/apacheds/trunk/protocol-shared/pom.xml
    directory/apacheds/trunk/server-config/pom.xml
    directory/apacheds/trunk/server-integ/pom.xml
    directory/apacheds/trunk/server-tools/pom.xml
    directory/apacheds/trunk/xdbm-tools/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/dsml-parser/pom.xml
    directory/shared/trunk/ldap-convert/pom.xml
    directory/shared/trunk/ldap-schema/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=998144&r1=998143&r2=998144&view=diff
==============================================================================
--- directory/apacheds/trunk/core-annotations/pom.xml (original)
+++ directory/apacheds/trunk/core-annotations/pom.xml Fri Sep 17 14:10:49 2010
@@ -47,6 +47,11 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>apacheds-core-api</artifactId>
     </dependency>
+
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-ldif-partition</artifactId>
+    </dependency>
     
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -60,11 +65,6 @@
     
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>apacheds-ldif-partition</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
       <artifactId>apacheds-xdbm-partition</artifactId>
     </dependency>
 
@@ -87,10 +87,5 @@
       <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldap-schema</artifactId>
     </dependency>
-    
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldif</artifactId>
-    </dependency>
   </dependencies>
 </project>

Modified: directory/apacheds/trunk/core-api/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/pom.xml?rev=998144&r1=998143&r2=998144&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/pom.xml (original)
+++ directory/apacheds/trunk/core-api/pom.xml Fri Sep 17 14:10:49 2010
@@ -78,11 +78,6 @@
     
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldif</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=998144&r1=998143&r2=998144&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/pom.xml (original)
+++ directory/apacheds/trunk/core-integ/pom.xml Fri Sep 17 14:10:49 2010
@@ -92,11 +92,6 @@
       <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldap-schema</artifactId>
     </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldif</artifactId>
-    </dependency>
     
     <dependency>
       <groupId>org.apache.directory.shared</groupId>

Modified: directory/apacheds/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/pom.xml?rev=998144&r1=998143&r2=998144&view=diff
==============================================================================
--- directory/apacheds/trunk/core/pom.xml (original)
+++ directory/apacheds/trunk/core/pom.xml Fri Sep 17 14:10:49 2010
@@ -78,11 +78,6 @@
     
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldif</artifactId>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldap-schema</artifactId>
     </dependency>
     

Modified: directory/apacheds/trunk/ldif-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/pom.xml?rev=998144&r1=998143&r2=998144&view=diff
==============================================================================
--- directory/apacheds/trunk/ldif-partition/pom.xml (original)
+++ directory/apacheds/trunk/ldif-partition/pom.xml Fri Sep 17 14:10:49 2010
@@ -77,11 +77,6 @@
       <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldap-schema</artifactId>
     </dependency>
-    
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldif</artifactId>
-    </dependency>
   </dependencies>
 
   <build>

Modified: directory/apacheds/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/pom.xml?rev=998144&r1=998143&r2=998144&view=diff
==============================================================================
--- directory/apacheds/trunk/pom.xml (original)
+++ directory/apacheds/trunk/pom.xml Fri Sep 17 14:10:49 2010
@@ -454,12 +454,6 @@
       
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
-        <artifactId>shared-ldif</artifactId>
-        <version>${org.apache.directory.shared.version}</version>
-      </dependency>
-      
-      <dependency>
-        <groupId>org.apache.directory.shared</groupId>
         <artifactId>shared-ldap-schema</artifactId>
         <version>${org.apache.directory.shared.version}</version>
       </dependency>

Modified: directory/apacheds/trunk/protocol-shared/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-shared/pom.xml?rev=998144&r1=998143&r2=998144&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-shared/pom.xml (original)
+++ directory/apacheds/trunk/protocol-shared/pom.xml Fri Sep 17 14:10:49 2010
@@ -52,11 +52,6 @@
       <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldap</artifactId>
     </dependency>
-    
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldif</artifactId>
-    </dependency>
   </dependencies>
 
   <build>

Modified: directory/apacheds/trunk/server-config/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/pom.xml?rev=998144&r1=998143&r2=998144&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/pom.xml (original)
+++ directory/apacheds/trunk/server-config/pom.xml Fri Sep 17 14:10:49 2010
@@ -130,10 +130,5 @@
       <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldap-schema</artifactId>
     </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldif</artifactId>
-    </dependency>
   </dependencies>
 </project>

Modified: directory/apacheds/trunk/server-integ/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/pom.xml?rev=998144&r1=998143&r2=998144&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/pom.xml (original)
+++ directory/apacheds/trunk/server-integ/pom.xml Fri Sep 17 14:10:49 2010
@@ -112,11 +112,6 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldif</artifactId>
-    </dependency>
-
-    <dependency>
       <groupId>org.apache.mina</groupId>
       <artifactId>mina-core</artifactId>
     </dependency>

Modified: directory/apacheds/trunk/server-tools/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-tools/pom.xml?rev=998144&r1=998143&r2=998144&view=diff
==============================================================================
--- directory/apacheds/trunk/server-tools/pom.xml (original)
+++ directory/apacheds/trunk/server-tools/pom.xml Fri Sep 17 14:10:49 2010
@@ -110,11 +110,6 @@
       <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldap-schema</artifactId>
     </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldif</artifactId>
-    </dependency>
   </dependencies>
 
   <build>

Modified: directory/apacheds/trunk/xdbm-tools/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-tools/pom.xml?rev=998144&r1=998143&r2=998144&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-tools/pom.xml (original)
+++ directory/apacheds/trunk/xdbm-tools/pom.xml Fri Sep 17 14:10:49 2010
@@ -65,10 +65,5 @@
       <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldap</artifactId>
     </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldif</artifactId>
-    </dependency>
   </dependencies>
 </project>

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=998144&r1=998143&r2=998144&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 14:10:49 2010
@@ -69,7 +69,6 @@ f none /opt/apacheds/lib/shared-ldap-0.9
 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-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
 f none /opt/apacheds/lib/spring-beans-2.5.6.SEC01.jar 0644 apacheds apacheds

Modified: directory/shared/trunk/all/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/all/pom.xml?rev=998144&r1=998143&r2=998144&view=diff
==============================================================================
--- directory/shared/trunk/all/pom.xml (original)
+++ directory/shared/trunk/all/pom.xml Fri Sep 17 14:10:49 2010
@@ -44,11 +44,6 @@
       <artifactId>shared-cursor</artifactId>
     </dependency>
 
-    <!-- dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>shared-dsml-parser</artifactId>
-    </dependency -->
-
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>shared-i18n</artifactId>
@@ -73,11 +68,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>shared-ldap-schema</artifactId>
     </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldif</artifactId>
-    </dependency>
   </dependencies>
 
   <build>

Modified: directory/shared/trunk/dsml-parser/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/pom.xml?rev=998144&r1=998143&r2=998144&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/pom.xml (original)
+++ directory/shared/trunk/dsml-parser/pom.xml Fri Sep 17 14:10:49 2010
@@ -52,11 +52,6 @@
     
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldif</artifactId>
-    </dependency>
-    
-    <dependency>
-      <groupId>${project.groupId}</groupId>
       <artifactId>ldap-client-api</artifactId>
     </dependency>
     

Modified: directory/shared/trunk/ldap-convert/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-convert/pom.xml?rev=998144&r1=998143&r2=998144&view=diff
==============================================================================
--- directory/shared/trunk/ldap-convert/pom.xml (original)
+++ directory/shared/trunk/ldap-convert/pom.xml Fri Sep 17 14:10:49 2010
@@ -48,11 +48,6 @@
     </dependency>
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldif</artifactId>
-    </dependency>
-    
-    <dependency>
       <groupId>antlr</groupId>
       <artifactId>antlr</artifactId>
       <version>${antlr.version}</version>

Modified: directory/shared/trunk/ldap-schema/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema/pom.xml?rev=998144&r1=998143&r2=998144&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema/pom.xml (original)
+++ directory/shared/trunk/ldap-schema/pom.xml Fri Sep 17 14:10:49 2010
@@ -52,11 +52,6 @@
     </dependency>
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldif</artifactId>
-    </dependency>
-    
-    <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
       <version>${commons.io.version}</version>

Modified: directory/shared/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/pom.xml?rev=998144&r1=998143&r2=998144&view=diff
==============================================================================
--- directory/shared/trunk/pom.xml (original)
+++ directory/shared/trunk/pom.xml Fri Sep 17 14:10:49 2010
@@ -75,7 +75,6 @@
     <module>asn1</module>
     <module>ldap</module>
     <module>ldap-jndi</module>
-    <module>ldap-ldif</module>
     <module>ldap-schema</module>
     <module>asn1-codec</module>
     <module>ldap-convert</module>
@@ -163,12 +162,6 @@
         <version>${project.version}</version>
       </dependency>
 
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>shared-ldif</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      
       <!-- Mina dependencies -->
 
       <dependency>



Mime
View raw message