directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r998101 - in /directory: apacheds/trunk/ apacheds/trunk/core-api/ apacheds/trunk/core-integ/ apacheds/trunk/core-jndi/ apacheds/trunk/core/ apacheds/trunk/kerberos-shared/ apacheds/trunk/ldif-partition/ apacheds/trunk/protocol-dhcp/ apached...
Date Fri, 17 Sep 2010 12:51:06 GMT
Author: elecharny
Date: Fri Sep 17 12:51:05 2010
New Revision: 998101

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

Added:
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/constants/
      - copied from r998049, directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/
Removed:
    directory/shared/trunk/ldap-constants/
Modified:
    directory/apacheds/trunk/core-api/pom.xml
    directory/apacheds/trunk/core-integ/pom.xml
    directory/apacheds/trunk/core-jndi/pom.xml
    directory/apacheds/trunk/core/pom.xml
    directory/apacheds/trunk/kerberos-shared/pom.xml
    directory/apacheds/trunk/ldif-partition/pom.xml
    directory/apacheds/trunk/pom.xml
    directory/apacheds/trunk/protocol-dhcp/pom.xml
    directory/apacheds/trunk/protocol-ldap/pom.xml
    directory/apacheds/trunk/server-integ/pom.xml
    directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/Prototype
    directory/installers/trunk/pom.xml
    directory/shared/trunk/all/pom.xml
    directory/shared/trunk/ldap-client-api/pom.xml
    directory/shared/trunk/ldap/pom.xml
    directory/shared/trunk/pom.xml

Modified: directory/apacheds/trunk/core-api/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/pom.xml?rev=998101&r1=998100&r2=998101&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/pom.xml (original)
+++ directory/apacheds/trunk/core-api/pom.xml Fri Sep 17 12:51:05 2010
@@ -83,11 +83,6 @@
     
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-constants</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=998101&r1=998100&r2=998101&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/pom.xml (original)
+++ directory/apacheds/trunk/core-integ/pom.xml Fri Sep 17 12:51:05 2010
@@ -85,11 +85,6 @@
 
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-constants</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldap-jndi</artifactId>
     </dependency>
 

Modified: directory/apacheds/trunk/core-jndi/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/pom.xml?rev=998101&r1=998100&r2=998101&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/pom.xml (original)
+++ directory/apacheds/trunk/core-jndi/pom.xml Fri Sep 17 12:51:05 2010
@@ -75,11 +75,6 @@
     
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-constants</artifactId>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldap-jndi</artifactId>
     </dependency>
   </dependencies>

Modified: directory/apacheds/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/pom.xml?rev=998101&r1=998100&r2=998101&view=diff
==============================================================================
--- directory/apacheds/trunk/core/pom.xml (original)
+++ directory/apacheds/trunk/core/pom.xml Fri Sep 17 12:51:05 2010
@@ -83,11 +83,6 @@
     
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-constants</artifactId>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldap-schema</artifactId>
     </dependency>
     

Modified: directory/apacheds/trunk/kerberos-shared/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/pom.xml?rev=998101&r1=998100&r2=998101&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/pom.xml (original)
+++ directory/apacheds/trunk/kerberos-shared/pom.xml Fri Sep 17 12:51:05 2010
@@ -66,11 +66,6 @@
       <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldap</artifactId>
     </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-constants</artifactId>
-    </dependency>
   </dependencies>
 </project>
 

Modified: directory/apacheds/trunk/ldif-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/pom.xml?rev=998101&r1=998100&r2=998101&view=diff
==============================================================================
--- directory/apacheds/trunk/ldif-partition/pom.xml (original)
+++ directory/apacheds/trunk/ldif-partition/pom.xml Fri Sep 17 12:51:05 2010
@@ -75,11 +75,6 @@
     
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-constants</artifactId>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldap-schema</artifactId>
     </dependency>
     

Modified: directory/apacheds/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/pom.xml?rev=998101&r1=998100&r2=998101&view=diff
==============================================================================
--- directory/apacheds/trunk/pom.xml (original)
+++ directory/apacheds/trunk/pom.xml Fri Sep 17 12:51:05 2010
@@ -442,12 +442,6 @@
       
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
-        <artifactId>shared-ldap-constants</artifactId>
-        <version>${org.apache.directory.shared.version}</version>
-      </dependency>
-      
-      <dependency>
-        <groupId>org.apache.directory.shared</groupId>
         <artifactId>shared-ldap-converter</artifactId>
         <version>${org.apache.directory.shared.version}</version>
       </dependency>

Modified: directory/apacheds/trunk/protocol-dhcp/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dhcp/pom.xml?rev=998101&r1=998100&r2=998101&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dhcp/pom.xml (original)
+++ directory/apacheds/trunk/protocol-dhcp/pom.xml Fri Sep 17 12:51:05 2010
@@ -44,7 +44,7 @@
 
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-constants</artifactId>
+      <artifactId>shared-ldap</artifactId>
     </dependency>
 
     <dependency>

Modified: directory/apacheds/trunk/protocol-ldap/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/pom.xml?rev=998101&r1=998100&r2=998101&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/pom.xml (original)
+++ directory/apacheds/trunk/protocol-ldap/pom.xml Fri Sep 17 12:51:05 2010
@@ -101,11 +101,6 @@
     
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-constants</artifactId>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldap-jndi</artifactId>
     </dependency>
     

Modified: directory/apacheds/trunk/server-integ/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/pom.xml?rev=998101&r1=998100&r2=998101&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/pom.xml (original)
+++ directory/apacheds/trunk/server-integ/pom.xml Fri Sep 17 12:51:05 2010
@@ -108,11 +108,6 @@
 
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-constants</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldap-jndi</artifactId>
     </dependency>
 

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=998101&r1=998100&r2=998101&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 12:51:05 2010
@@ -66,7 +66,6 @@ f none /opt/apacheds/lib/shared-cursor-0
 f none /opt/apacheds/lib/shared-dsml-parser-0.9.19-SNAPSHOT.jar 0644 apacheds apacheds
 f none /opt/apacheds/lib/shared-i18n-0.9.19-SNAPSHOT.jar 0644 apacheds apacheds
 f none /opt/apacheds/lib/shared-ldap-0.9.19-SNAPSHOT.jar 0644 apacheds apacheds
-f none /opt/apacheds/lib/shared-ldap-constants-0.9.19-SNAPSHOT.jar 0644 apacheds apacheds
 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

Modified: directory/installers/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/installers/trunk/pom.xml?rev=998101&r1=998100&r2=998101&view=diff
==============================================================================
--- directory/installers/trunk/pom.xml (original)
+++ directory/installers/trunk/pom.xml Fri Sep 17 12:51:05 2010
@@ -152,12 +152,6 @@
 
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
-        <artifactId>shared-ldap-constants</artifactId>
-        <version>${shared.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.directory.shared</groupId>
         <artifactId>shared-client-api</artifactId>
         <version>${shared.version}</version>
       </dependency>

Modified: directory/shared/trunk/all/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/all/pom.xml?rev=998101&r1=998100&r2=998101&view=diff
==============================================================================
--- directory/shared/trunk/all/pom.xml (original)
+++ directory/shared/trunk/all/pom.xml Fri Sep 17 12:51:05 2010
@@ -61,11 +61,6 @@
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-constants</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
       <artifactId>shared-ldap-converter</artifactId>
     </dependency>
 

Modified: directory/shared/trunk/ldap-client-api/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-client-api/pom.xml?rev=998101&r1=998100&r2=998101&view=diff
==============================================================================
--- directory/shared/trunk/ldap-client-api/pom.xml (original)
+++ directory/shared/trunk/ldap-client-api/pom.xml Fri Sep 17 12:51:05 2010
@@ -48,27 +48,22 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.directory.shared</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>shared-ldap</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.directory.shared</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>shared-cursor</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-constants</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>shared-asn1</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.directory.shared</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>shared-ldap-schema</artifactId>
     </dependency>
 

Modified: directory/shared/trunk/ldap/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/pom.xml?rev=998101&r1=998100&r2=998101&view=diff
==============================================================================
--- directory/shared/trunk/ldap/pom.xml (original)
+++ directory/shared/trunk/ldap/pom.xml Fri Sep 17 12:51:05 2010
@@ -48,11 +48,6 @@
     </dependency> 
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-constants</artifactId>
-    </dependency>
-    
-    <dependency>
       <groupId>antlr</groupId>
       <artifactId>antlr</artifactId>
     </dependency>

Modified: directory/shared/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/pom.xml?rev=998101&r1=998100&r2=998101&view=diff
==============================================================================
--- directory/shared/trunk/pom.xml (original)
+++ directory/shared/trunk/pom.xml Fri Sep 17 12:51:05 2010
@@ -76,7 +76,6 @@
     <module>ldap</module>
     <module>ldap-jndi</module>
     <module>ldap-ldif</module>
-    <module>ldap-constants</module>
     <module>ldap-schema</module>
     <module>asn1-codec</module>
     <module>ldap-convert</module>
@@ -142,12 +141,6 @@
 
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>shared-ldap-constants</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>${project.groupId}</groupId>
         <artifactId>shared-ldap-converter</artifactId>
         <version>${project.version}</version>
       </dependency>



Mime
View raw message