You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2006/02/07 17:18:07 UTC

svn commit: r375636 - in /directory/trunks/apacheds: pom.xml server-installers/pom.xml server-jndi/pom.xml server-main/pom.xml server-sar/pom.xml server-ssl/pom.xml server-tools/ server-tools/pom.xml server-unit/pom.xml simple/pom.xml tools/

Author: akarasulu
Date: Tue Feb  7 08:18:03 2006
New Revision: 375636

URL: http://svn.apache.org/viewcvs?rev=375636&view=rev
Log:
more reorg

Added:
    directory/trunks/apacheds/server-tools/
      - copied from r375625, directory/trunks/apacheds/tools/
Removed:
    directory/trunks/apacheds/tools/
Modified:
    directory/trunks/apacheds/pom.xml
    directory/trunks/apacheds/server-installers/pom.xml
    directory/trunks/apacheds/server-jndi/pom.xml
    directory/trunks/apacheds/server-main/pom.xml
    directory/trunks/apacheds/server-sar/pom.xml
    directory/trunks/apacheds/server-ssl/pom.xml
    directory/trunks/apacheds/server-tools/pom.xml
    directory/trunks/apacheds/server-unit/pom.xml
    directory/trunks/apacheds/simple/pom.xml

Modified: directory/trunks/apacheds/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/pom.xml?rev=375636&r1=375635&r2=375636&view=diff
==============================================================================
--- directory/trunks/apacheds/pom.xml (original)
+++ directory/trunks/apacheds/pom.xml Tue Feb  7 08:18:03 2006
@@ -67,6 +67,10 @@
     <module>protocol-common</module>
     <module>protocols</module>
     <module>simple</module>
+    <module>server-sar</module>
+    <module>server-unit</module>
+    <module>server-main</module>
+    <module>server-jndi</module>
     <module>server-installers</module>
   </modules>
 

Modified: directory/trunks/apacheds/server-installers/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/server-installers/pom.xml?rev=375636&r1=375635&r2=375636&view=diff
==============================================================================
--- directory/trunks/apacheds/server-installers/pom.xml (original)
+++ directory/trunks/apacheds/server-installers/pom.xml Tue Feb  7 08:18:03 2006
@@ -7,20 +7,20 @@
     <version>0.9.4-SNAPSHOT</version>
   </parent>
   <version>1.0-RC1-SNAPSHOT</version>
-  <artifactId>apacheds-installers</artifactId>
-  <name>Apache Directory Server Installers</name>
+  <artifactId>apacheds-server-installers</artifactId>
+  <name>ApacheDS Server Installers</name>
   <packaging>jar</packaging>
   <description>
   </description>
   <dependencies>
     <dependency>
-      <groupId>org.apache.directory.server.standalone.simple</groupId>
-      <artifactId>org.apache.ldap.server.standalone.simple.jndi</artifactId>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-server-jndi</artifactId>
       <version>0.9.4-SNAPSHOT</version>
     </dependency>  
     <dependency>
-      <groupId>org.apache.directory.server.standalone.simple</groupId>
-      <artifactId>org.apache.ldap.server.standalone.simple.main</artifactId>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-server-main</artifactId>
       <version>0.9.4-SNAPSHOT</version>
     </dependency>  
     <dependency>
@@ -31,7 +31,7 @@
     </dependency>  
     <dependency>
       <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-tools</artifactId>
+      <artifactId>apacheds-server-tools</artifactId>
       <version>0.9.4-SNAPSHOT</version>
     </dependency>  
     <dependency>

Modified: directory/trunks/apacheds/server-jndi/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/server-jndi/pom.xml?rev=375636&r1=375635&r2=375636&view=diff
==============================================================================
--- directory/trunks/apacheds/server-jndi/pom.xml (original)
+++ directory/trunks/apacheds/server-jndi/pom.xml Tue Feb  7 08:18:03 2006
@@ -2,12 +2,12 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.directory.server.standalone.simple</groupId>
+    <groupId>org.apache.directory.server</groupId>
     <artifactId>build</artifactId>
     <version>0.9.4-SNAPSHOT</version>
   </parent>
-  <artifactId>org.apache.ldap.server.standalone.simple.jndi</artifactId>
-  <name>standalone-simple-jndi</name>
+  <artifactId>apacheds-server-jndi</artifactId>
+  <name>ApacheDS Server JNDI</name>
   <packaging>jar</packaging>  
   <dependencies>
     <dependency>
@@ -15,6 +15,31 @@
       <artifactId>nlog4j</artifactId>
       <version>1.2.19</version>
       <scope>provided</scope>
+    </dependency>  
+    <dependency>
+      <groupId>org.apache.directory.server.protocols</groupId>
+      <artifactId>org.apache.directory.protocol.changepw</artifactId>
+      <version>0.7-SNAPSHOT</version>
+    </dependency>  
+    <dependency>
+      <groupId>org.apache.directory.server.protocols</groupId>
+      <artifactId>org.apache.directory.protocol.ntp</artifactId>
+      <version>0.5-SNAPSHOT</version>
+    </dependency>  
+    <dependency>
+      <groupId>org.apache.directory.server.protocols</groupId>
+      <artifactId>org.apache.directory.protocol.kerberos</artifactId>
+      <version>0.7-SNAPSHOT</version>
+    </dependency>  
+    <dependency>
+      <groupId>org.apache.directory.server.protocols</groupId>
+      <artifactId>org.apache.directory.protocol.ldap</artifactId>
+      <version>0.9.4-SNAPSHOT</version>
+    </dependency>  
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>org.apache.ldap.server.core</artifactId>
+      <version>0.9.4-SNAPSHOT</version>
     </dependency>  
   </dependencies>
 </project>

Modified: directory/trunks/apacheds/server-main/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/server-main/pom.xml?rev=375636&r1=375635&r2=375636&view=diff
==============================================================================
--- directory/trunks/apacheds/server-main/pom.xml (original)
+++ directory/trunks/apacheds/server-main/pom.xml Tue Feb  7 08:18:03 2006
@@ -2,17 +2,17 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.directory.server.standalone.simple</groupId>
+    <groupId>org.apache.directory.server</groupId>
     <artifactId>build</artifactId>
     <version>0.9.4-SNAPSHOT</version>
   </parent>
-  <artifactId>org.apache.ldap.server.standalone.simple.main</artifactId>
-  <name>standalone-simple-main</name>
+  <artifactId>apacheds-server-main</artifactId>
+  <name>ApacheDS Server Main</name>
   <packaging>jar</packaging>  
   <dependencies>
     <dependency>
-      <groupId>org.apache.directory.server.standalone.simple</groupId>
-      <artifactId>org.apache.ldap.server.standalone.simple.jndi</artifactId>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-server-jndi</artifactId>
       <version>0.9.4-SNAPSHOT</version>
     </dependency>  
     <dependency>

Modified: directory/trunks/apacheds/server-sar/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/server-sar/pom.xml?rev=375636&r1=375635&r2=375636&view=diff
==============================================================================
--- directory/trunks/apacheds/server-sar/pom.xml (original)
+++ directory/trunks/apacheds/server-sar/pom.xml Tue Feb  7 08:18:03 2006
@@ -2,17 +2,17 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.directory.server.standalone.simple</groupId>
+    <groupId>org.apache.directory.server</groupId>
     <artifactId>build</artifactId>
     <version>0.9.4-SNAPSHOT</version>
   </parent>
-  <artifactId>apacheds-sar</artifactId>
-  <name>Apache Directory Server Sar for JBoss 3.x</name>
+  <artifactId>apacheds-server-sar</artifactId>
+  <name>ApacheDS Server Sar (JBoss 3.x)</name>
   <packaging>sar</packaging>  
   <dependencies>
     <dependency>
-      <groupId>org.apache.directory.server.standalone.simple</groupId>
-      <artifactId>org.apache.ldap.server.standalone.simple.jndi</artifactId>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-server-jndi</artifactId>
       <version>0.9.4-SNAPSHOT</version>
     </dependency>  
     <dependency>

Modified: directory/trunks/apacheds/server-ssl/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/server-ssl/pom.xml?rev=375636&r1=375635&r2=375636&view=diff
==============================================================================
--- directory/trunks/apacheds/server-ssl/pom.xml (original)
+++ directory/trunks/apacheds/server-ssl/pom.xml Tue Feb  7 08:18:03 2006
@@ -2,12 +2,12 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.directory.server.standalone.simple</groupId>
+    <groupId>org.apache.directory.server</groupId>
     <artifactId>build</artifactId>
     <version>0.9.4-SNAPSHOT</version>
   </parent>
-  <artifactId>org.apache.ldap.server.standalone.simple.ssl</artifactId>
-  <name>standalone-simple-ssl</name>
+  <artifactId>apacheds-server-ssl</artifactId>
+  <name>ApacheDS Server SSL</name>
   <packaging>jar</packaging>  
   <dependencies>
     <dependency>
@@ -17,13 +17,13 @@
       <scope>provided</scope>
     </dependency>  
     <dependency>
-      <groupId>org.apache.directory.server.standalone.simple</groupId>
-      <artifactId>org.apache.ldap.server.standalone.simple.jndi</artifactId>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>org.apache.ldap.server.jndi</artifactId>
       <version>0.9.4-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.directory.server.standalone.simple</groupId>
-      <artifactId>org.apache.ldap.server.standalone.simple.unit</artifactId>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>org.apache.ldap.server.unit</artifactId>
       <version>0.9.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>

Modified: directory/trunks/apacheds/server-tools/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/server-tools/pom.xml?rev=375636&r1=375625&r2=375636&view=diff
==============================================================================
--- directory/trunks/apacheds/server-tools/pom.xml (original)
+++ directory/trunks/apacheds/server-tools/pom.xml Tue Feb  7 08:18:03 2006
@@ -6,8 +6,8 @@
     <artifactId>build</artifactId>
     <version>0.9.4-SNAPSHOT</version>
   </parent>
-  <artifactId>apacheds-tools</artifactId>
-  <name>Apache Directory Server Tools</name>
+  <artifactId>apacheds-server-tools</artifactId>
+  <name>ApacheDS Server Tools</name>
   <description>
     Contained within this executable jar are various commandline utilities
     for apacheds.
@@ -15,8 +15,8 @@
   <packaging>jar</packaging>  
   <dependencies>
     <dependency>
-      <groupId>org.apache.directory.server.standalone.simple</groupId>
-      <artifactId>org.apache.ldap.server.standalone.simple.main</artifactId>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-server-main</artifactId>
       <version>0.9.4-SNAPSHOT</version>
     </dependency>
     <dependency>

Modified: directory/trunks/apacheds/server-unit/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/server-unit/pom.xml?rev=375636&r1=375635&r2=375636&view=diff
==============================================================================
--- directory/trunks/apacheds/server-unit/pom.xml (original)
+++ directory/trunks/apacheds/server-unit/pom.xml Tue Feb  7 08:18:03 2006
@@ -2,12 +2,12 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.directory.server.standalone.simple</groupId>
+    <groupId>org.apache.directory.server</groupId>
     <artifactId>build</artifactId>
     <version>0.9.4-SNAPSHOT</version>
   </parent>
-  <artifactId>org.apache.ldap.server.standalone.simple.unit</artifactId>
-  <name>standalone-simple-unit</name>
+  <artifactId>apacheds-server-unit</artifactId>
+  <name>ApacheDS Server Unit</name>
   <packaging>jar</packaging>  
   <dependencies>
     <dependency>
@@ -17,8 +17,14 @@
       <scope>provided</scope>
     </dependency>  
     <dependency>
-      <groupId>org.apache.directory.server.standalone.simple</groupId>
-      <artifactId>org.apache.ldap.server.standalone.simple.jndi</artifactId>
+      <groupId>org.slf4j</groupId>
+      <artifactId>nlog4j</artifactId>
+      <version>1.2.19</version>
+      <scope>provided</scope>
+    </dependency>  
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>org.apache.ldap.server.jndi</artifactId>
       <version>0.9.4-SNAPSHOT</version>
     </dependency>  
     <dependency>

Modified: directory/trunks/apacheds/simple/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/simple/pom.xml?rev=375636&r1=375635&r2=375636&view=diff
==============================================================================
--- directory/trunks/apacheds/simple/pom.xml (original)
+++ directory/trunks/apacheds/simple/pom.xml Tue Feb  7 08:18:03 2006
@@ -62,11 +62,7 @@
         <jdk>1.5</jdk>
       </activation>
       <modules>
-        <module>jndi</module>
-        <module>main</module>
         <module>ssl</module>
-        <module>unit</module>
-        <module>sar</module>
       </modules>
     </profile>
 
@@ -76,10 +72,6 @@
         <jdk>1.4</jdk>
       </activation>
       <modules>
-        <module>jndi</module>
-        <module>main</module>
-        <module>unit</module>
-        <module>sar</module>
       </modules>
       <build>
         <plugins>