directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r368830 - in /directory/trunks: ./ apacheds/ apacheds/core-unit/ apacheds/core/ apacheds/plugin/ apacheds/protocols/ apacheds/protocols/changepw/ apacheds/protocols/common/ apacheds/protocols/dhcp/ apacheds/protocols/dns/ apacheds/protocols...
Date Fri, 13 Jan 2006 19:37:52 GMT
Author: akarasulu
Date: Fri Jan 13 11:37:35 2006
New Revision: 368830

URL: http://svn.apache.org/viewcvs?rev=368830&view=rev
Log:
putting things that depend on the core in one place and massaging more poms

Added:
    directory/trunks/apacheds/protocols/kerberos-core/
      - copied from r368814, directory/trunks/common/kerberos/
    directory/trunks/apacheds/protocols/pom.xml
Removed:
    directory/trunks/common/kerberos/
Modified:
    directory/trunks/apacheds/core-unit/pom.xml
    directory/trunks/apacheds/core/pom.xml
    directory/trunks/apacheds/plugin/pom.xml
    directory/trunks/apacheds/pom.xml
    directory/trunks/apacheds/protocols/changepw/pom.xml
    directory/trunks/apacheds/protocols/common/pom.xml
    directory/trunks/apacheds/protocols/dhcp/pom.xml
    directory/trunks/apacheds/protocols/dns/pom.xml
    directory/trunks/apacheds/protocols/kerberos/pom.xml
    directory/trunks/apacheds/protocols/ldap/pom.xml
    directory/trunks/apacheds/protocols/ntp/pom.xml
    directory/trunks/apacheds/server-main/pom.xml
    directory/trunks/apacheds/server-ssl/pom.xml
    directory/trunks/apacheds/server-unit/pom.xml
    directory/trunks/apacheds/server/pom.xml
    directory/trunks/apacheds/shared/pom.xml
    directory/trunks/pom.xml

Modified: directory/trunks/apacheds/core-unit/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-unit/pom.xml?rev=368830&r1=368829&r2=368830&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/pom.xml (original)
+++ directory/trunks/apacheds/core-unit/pom.xml Fri Jan 13 11:37:35 2006
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>apacheds-build</artifactId>
+    <artifactId>build</artifactId>
     <version>0.9.4-SNAPSHOT</version>
   </parent>
   <artifactId>org.apache.ldap.server.core.unit</artifactId>

Modified: directory/trunks/apacheds/core/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/pom.xml?rev=368830&r1=368829&r2=368830&view=diff
==============================================================================
--- directory/trunks/apacheds/core/pom.xml (original)
+++ directory/trunks/apacheds/core/pom.xml Fri Jan 13 11:37:35 2006
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>apacheds-build</artifactId>
+    <artifactId>build</artifactId>
     <version>0.9.4-SNAPSHOT</version>
   </parent>
   <artifactId>org.apache.ldap.server.core</artifactId>

Modified: directory/trunks/apacheds/plugin/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/plugin/pom.xml?rev=368830&r1=368829&r2=368830&view=diff
==============================================================================
--- directory/trunks/apacheds/plugin/pom.xml (original)
+++ directory/trunks/apacheds/plugin/pom.xml Fri Jan 13 11:37:35 2006
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>apacheds-build</artifactId>
+    <artifactId>build</artifactId>
     <version>0.9.4-SNAPSHOT</version>
   </parent>
   <artifactId>org.apache.ldap.server.plugin</artifactId>

Modified: directory/trunks/apacheds/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/pom.xml?rev=368830&r1=368829&r2=368830&view=diff
==============================================================================
--- directory/trunks/apacheds/pom.xml (original)
+++ directory/trunks/apacheds/pom.xml Fri Jan 13 11:37:35 2006
@@ -8,7 +8,7 @@
   </parent>
   <groupId>org.apache.directory.server</groupId>
   <version>0.9.4-SNAPSHOT</version>
-  <artifactId>apacheds-build</artifactId>
+  <artifactId>build</artifactId>
   <name>apacheds-build</name>
   <packaging>pom</packaging>
 
@@ -20,45 +20,6 @@
     </dependency>
   </dependencies>
 
-  <repositories>
-    <!-- For ibiblio standard: might want to add a mirror as well later            
-    <repository>
-      <id>ibiblio</id>
-      <name>Standard Ibiblio Repository</name>
-      <url>http://ibiblio.org/maven2</url>
-    </repository>
-    -->
- 
-    <!-- For our snapshots (do not upload release jars or non-apache jars here)    -->
-    <repository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshot Repository</name>
-      <url>http://cvs.apache.org/maven-snapshot-repository</url>
-    </repository>
-    
-    <!-- Temp repo for 3rd party jars that are not in ibiblio.org yet.-->
-    <!-- Artifacts in repo should be requested for ibiblio upload &   -->
-    <!-- removed from this repository - this repo will disappear.     -->
-    <repository>
-      <id>safehaus</id>
-      <name>Alternate Repository for Missing Ibiblio Artifacts</name>
-      <url>http://m2.safehaus.org</url>
-    </repository>
-  </repositories>
-
-  <pluginRepositories>
-    <pluginRepository>
-      <id>snapshots</id>
-      <name>snapshot plugins</name>
-      <url>http://snapshots.maven.codehaus.org/maven2</url>
-    </pluginRepository>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshot Plugin Repository</name>
-      <url>http://cvs.apache.org/maven-snapshot-repository</url>
-    </pluginRepository>
-  </pluginRepositories>
-
   <profiles>
     <profile>
       <id>jdk1.5</id>
@@ -74,6 +35,7 @@
         <module>server-ssl</module>
         <module>server-unit</module>
         <module>server-main</module>
+        <module>protocols</module>
       </modules>
     </profile>
 
@@ -90,6 +52,7 @@
         <module>server</module>
         <module>server-unit</module>
         <module>server-main</module>
+        <module>protocols</module>
       </modules>
       <build>
         <plugins>

Modified: directory/trunks/apacheds/protocols/changepw/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocols/changepw/pom.xml?rev=368830&r1=368829&r2=368830&view=diff
==============================================================================
--- directory/trunks/apacheds/protocols/changepw/pom.xml (original)
+++ directory/trunks/apacheds/protocols/changepw/pom.xml Fri Jan 13 11:37:35 2006
@@ -2,11 +2,11 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.directory</groupId>
+    <groupId>org.apache.directory.server</groupId>
     <artifactId>build</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.directory</groupId>
+  <groupId>org.apache.directory.server.protocols</groupId>
   <version>0.7-SNAPSHOT</version>
   <artifactId>org.apache.directory.protocol.changepw</artifactId>
   <name>changepw-protocol</name>

Modified: directory/trunks/apacheds/protocols/common/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocols/common/pom.xml?rev=368830&r1=368829&r2=368830&view=diff
==============================================================================
--- directory/trunks/apacheds/protocols/common/pom.xml (original)
+++ directory/trunks/apacheds/protocols/common/pom.xml Fri Jan 13 11:37:35 2006
@@ -2,11 +2,11 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.directory</groupId>
+    <groupId>org.apache.directory.server.protocols</groupId>
     <artifactId>build</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>0.9.4-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.directory</groupId>
+  <groupId>org.apache.directory.server.protocols</groupId>
   <version>0.7.1-SNAPSHOT</version>
   <artifactId>org.apache.directory.protocol.common</artifactId>
   <name>protocol-common</name>

Modified: directory/trunks/apacheds/protocols/dhcp/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocols/dhcp/pom.xml?rev=368830&r1=368829&r2=368830&view=diff
==============================================================================
--- directory/trunks/apacheds/protocols/dhcp/pom.xml (original)
+++ directory/trunks/apacheds/protocols/dhcp/pom.xml Fri Jan 13 11:37:35 2006
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>protocols-build</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <groupId>org.apache.directory</groupId>

Modified: directory/trunks/apacheds/protocols/dns/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocols/dns/pom.xml?rev=368830&r1=368829&r2=368830&view=diff
==============================================================================
--- directory/trunks/apacheds/protocols/dns/pom.xml (original)
+++ directory/trunks/apacheds/protocols/dns/pom.xml Fri Jan 13 11:37:35 2006
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>protocols-build</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <version>0.3-SNAPSHOT</version>

Modified: directory/trunks/apacheds/protocols/kerberos/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocols/kerberos/pom.xml?rev=368830&r1=368829&r2=368830&view=diff
==============================================================================
--- directory/trunks/apacheds/protocols/kerberos/pom.xml (original)
+++ directory/trunks/apacheds/protocols/kerberos/pom.xml Fri Jan 13 11:37:35 2006
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>protocols-build</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <groupId>org.apache.directory</groupId>

Modified: directory/trunks/apacheds/protocols/ldap/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocols/ldap/pom.xml?rev=368830&r1=368829&r2=368830&view=diff
==============================================================================
--- directory/trunks/apacheds/protocols/ldap/pom.xml (original)
+++ directory/trunks/apacheds/protocols/ldap/pom.xml Fri Jan 13 11:37:35 2006
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>protocols-build</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <groupId>org.apache.directory</groupId>

Modified: directory/trunks/apacheds/protocols/ntp/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocols/ntp/pom.xml?rev=368830&r1=368829&r2=368830&view=diff
==============================================================================
--- directory/trunks/apacheds/protocols/ntp/pom.xml (original)
+++ directory/trunks/apacheds/protocols/ntp/pom.xml Fri Jan 13 11:37:35 2006
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>protocols-build</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <groupId>org.apache.directory</groupId>

Added: directory/trunks/apacheds/protocols/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocols/pom.xml?rev=368830&view=auto
==============================================================================
--- directory/trunks/apacheds/protocols/pom.xml (added)
+++ directory/trunks/apacheds/protocols/pom.xml Fri Jan 13 11:37:35 2006
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.directory.server</groupId>
+    <artifactId>build</artifactId>
+    <version>0.9.4-SNAPSHOT</version>
+  </parent>
+  <groupId>org.apache.directory.server.protocols</groupId>
+  <version>0.9.4-SNAPSHOT</version>
+  <artifactId>build</artifactId>
+  <name>protocols-build</name>
+  <packaging>pom</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.directory</groupId>
+      <artifactId>org.apache.ldap.common</artifactId>
+      <version>0.9.4-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+
+  <modules>
+    <module>common</module>
+    <!--
+    <module>ntp</module>
+    <module>dns</module>
+    <module>dhcp</module>
+    <module>ldap</module>
+    <module>kerberos</module>
+    <module>changepw</module>
+    -->
+  </modules>
+</project>

Modified: directory/trunks/apacheds/server-main/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/server-main/pom.xml?rev=368830&r1=368829&r2=368830&view=diff
==============================================================================
--- directory/trunks/apacheds/server-main/pom.xml (original)
+++ directory/trunks/apacheds/server-main/pom.xml Fri Jan 13 11:37:35 2006
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>apacheds-build</artifactId>
+    <artifactId>build</artifactId>
     <version>0.9.4-SNAPSHOT</version>
   </parent>
   <artifactId>org.apache.ldap.server.main</artifactId>

Modified: directory/trunks/apacheds/server-ssl/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/server-ssl/pom.xml?rev=368830&r1=368829&r2=368830&view=diff
==============================================================================
--- directory/trunks/apacheds/server-ssl/pom.xml (original)
+++ directory/trunks/apacheds/server-ssl/pom.xml Fri Jan 13 11:37:35 2006
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>apacheds-build</artifactId>
+    <artifactId>build</artifactId>
     <version>0.9.4-SNAPSHOT</version>
   </parent>
   <artifactId>org.apache.ldap.server.ssl</artifactId>

Modified: directory/trunks/apacheds/server-unit/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/server-unit/pom.xml?rev=368830&r1=368829&r2=368830&view=diff
==============================================================================
--- directory/trunks/apacheds/server-unit/pom.xml (original)
+++ directory/trunks/apacheds/server-unit/pom.xml Fri Jan 13 11:37:35 2006
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>apacheds-build</artifactId>
+    <artifactId>build</artifactId>
     <version>0.9.4-SNAPSHOT</version>
   </parent>
   <artifactId>org.apache.ldap.server.unit</artifactId>

Modified: directory/trunks/apacheds/server/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/server/pom.xml?rev=368830&r1=368829&r2=368830&view=diff
==============================================================================
--- directory/trunks/apacheds/server/pom.xml (original)
+++ directory/trunks/apacheds/server/pom.xml Fri Jan 13 11:37:35 2006
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>apacheds-build</artifactId>
+    <artifactId>build</artifactId>
     <version>0.9.4-SNAPSHOT</version>
   </parent>
   <artifactId>org.apache.ldap.server</artifactId>

Modified: directory/trunks/apacheds/shared/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/shared/pom.xml?rev=368830&r1=368829&r2=368830&view=diff
==============================================================================
--- directory/trunks/apacheds/shared/pom.xml (original)
+++ directory/trunks/apacheds/shared/pom.xml Fri Jan 13 11:37:35 2006
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>apacheds-build</artifactId>
+    <artifactId>build</artifactId>
     <version>0.9.4-SNAPSHOT</version>
   </parent>
   <artifactId>org.apache.ldap.server.shared</artifactId>

Modified: directory/trunks/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/pom.xml?rev=368830&r1=368829&r2=368830&view=diff
==============================================================================
--- directory/trunks/pom.xml (original)
+++ directory/trunks/pom.xml Fri Jan 13 11:37:35 2006
@@ -8,17 +8,9 @@
   <packaging>pom</packaging>
   <modules>
     <module>asn1</module>
-    <module>mina-build</module>
+    <module>mina</module>
     <module>apacheds</module>
-    <module>protocol-common</module>
-    <module>kerberos-common</module>
-    <module>ldap-common</module>
-    <module>changepw-protocol</module>
-    <module>dhcp-protocol</module>
-    <module>dns-protocol</module>
-    <module>kerberos-protocol</module>
-    <module>ldap-protocol</module>
-    <module>ntp-protocol</module>
+    <module>common</module>
   </modules>
   <dependencies>
    <dependency>
@@ -29,15 +21,7 @@
     </dependency>
   </dependencies>
   <repositories>
-    <!-- For ibiblio standard: might want to add a mirror as well later            
-    <repository>
-      <id>ibiblio</id>
-      <name>Standard Ibiblio Repository</name>
-      <url>http://ibiblio.org/maven2</url>
-    </repository>
-    -->
- 
-    <!-- For our snapshots (do not upload release jars or non-apache jars here)    -->
+    <!-- For snapshots (no release jars or non-apache jars)           -->
     <repository>
       <id>apache.snapshots</id>
       <name>Apache Snapshot Repository</name>



Mime
View raw message