directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r951022 [2/2] - in /directory/apacheds/trunk: ./ all/ avl-partition/ core-annotations/ core-api/ core-avl/ core-constants/ core-integ/ core-jndi/ core-mock/ core/ default-config/ http-integration/ i18n/ interceptor-kerberos/ jdbm-partition/...
Date Thu, 03 Jun 2010 15:06:39 GMT
Modified: directory/apacheds/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/pom.xml?rev=951022&r1=951021&r2=951022&view=diff
==============================================================================
--- directory/apacheds/trunk/pom.xml (original)
+++ directory/apacheds/trunk/pom.xml Thu Jun  3 15:06:38 2010
@@ -21,7 +21,6 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-
   <parent>
     <groupId>org.apache.directory.project</groupId>
     <artifactId>project</artifactId>
@@ -84,98 +83,446 @@
 
   <url>http://directory.apache.org/apacheds/1.5</url>
 
+  <distributionManagement>
+    <site>
+      <id>apache.directory.apacheds</id>
+      <url>${distMgmtSiteUrl}</url>
+    </site>
+  </distributionManagement>
+
+  <issueManagement>
+    <system>JIRA</system>
+    <url>http://issues.apache.org/jira/browse/DIRSERVER</url>
+  </issueManagement>
+  
+  <modules>
+    <module>i18n</module>
+    <module>all</module>
+    <module>jdbm</module>
+    <module>jdbm-store</module>
+    <module>jdbm-partition</module>
+    <module>xdbm-search</module>
+    <module>xdbm-tools</module>
+    <module>core</module>
+    <module>core-api</module>
+    <module>core-annotations</module>
+    <module>server-annotations</module>
+    <module>core-mock</module>
+    <module>core-jndi</module>
+    <module>core-constants</module>
+    <module>core-integ</module>
+    <module>core-avl</module>
+    <module>avl-partition</module>
+    <module>ldif-partition</module>
+    <module>protocol-shared</module>
+    <module>protocol-ntp</module>
+    <module>protocol-ldap</module>
+    <module>protocol-kerberos</module>
+    <module>protocol-dhcp</module>
+    <module>protocol-dns</module>
+    <module>protocol-changepw</module>
+    <module>server-integ</module>
+    <module>server-tools</module>
+    <module>default-config</module>
+    <!--Uncomment to build all in one OSGi bundle-->
+    <!--<module>osgi</module>-->
+
+    <!-- breaks the build on first try
+      <module>sar-plugin</module>
+      <module>server-sar</module>
+    -->
+
+    <module>server-xml</module>
+    <module>server-jndi</module>
+    <module>kerberos-shared</module>
+    <!--module>kerberos-unit</module-->
+    <module>interceptor-kerberos</module>
+    <module>kerberos-test</module>
+    <!--module>syncrepl</module-->
+    <module>server-replication</module>
+    <module>xbean-spring</module>
+    <module>http-integration</module>
+    <module>test-framework</module>
+    <module>ldap-client-test</module>
+  </modules>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.directory.buildtools</groupId>
+            <artifactId>directory-checkstyle</artifactId>
+            <version>${org.apache.directory.buildtools.directory-checkstyle.version}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
+  
   <dependencyManagement>
     <dependencies>
-      <!--dependency>
+      <!-- Project sub-modules dependencies -->
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-all</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-avl-partition</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-benchmarks</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-core</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-core-annotations</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-core-api</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-core-avl</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-core-constants</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-core-integ</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-core-jndi</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-core-mock</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-default-config</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-http-integration</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-i18n</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-interceptor-kerberos</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-jdbm</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-jdbm-partition</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-jdbm-store</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-kerberos-shared</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-kerberos-test</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-ldap-client-test</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-ldif-partition</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-protocol-changepw</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-protocol-dhcp</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-protocol-dns</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-protocol-kerberos</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-protocol-ldap</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-protocol-ntp</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-protocol-shared</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-server-annotations</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-server-integ</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-server-jndi</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-server-replication</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-server-sar</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-server-tools</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-server-xml</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-syncrepl</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-test-framework</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-xbean-spring</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-xdbm-search</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-xdbm-tools</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <!-- Shared dependencies -->
+    
+      <dependency>
         <groupId>org.apache.directory.shared</groupId>
         <artifactId>shared-all</artifactId>
         <version>${org.apache.directory.shared.version}</version>
-      </dependency-->
-
+      </dependency>
+      
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
-        <artifactId>shared-ldap</artifactId>
+        <artifactId>shared-asn1</artifactId>
         <version>${org.apache.directory.shared.version}</version>
       </dependency>
-
+      
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
-        <artifactId>shared-ldap-schema</artifactId>
+        <artifactId>shared-asn1-codec</artifactId>
         <version>${org.apache.directory.shared.version}</version>
       </dependency>
-
+      
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
-        <artifactId>shared-ldap-schema-loader</artifactId>
+        <artifactId>shared-cursor</artifactId>
         <version>${org.apache.directory.shared.version}</version>
       </dependency>
-
+      
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
-        <artifactId>shared-ldap-schema-manager</artifactId>
+        <artifactId>shared-dsml-parser</artifactId>
         <version>${org.apache.directory.shared.version}</version>
       </dependency>
-
+      
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
-        <artifactId>shared-cursor</artifactId>
+        <artifactId>shared-i18n</artifactId>
         <version>${org.apache.directory.shared.version}</version>
       </dependency>
-
+      
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
-        <artifactId>shared-ldap-jndi</artifactId>
+        <artifactId>shared-ldap</artifactId>
         <version>${org.apache.directory.shared.version}</version>
       </dependency>
-
+      
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
-        <artifactId>shared-asn1-codec</artifactId>
+        <artifactId>shared-ldap-constants</artifactId>
         <version>${org.apache.directory.shared.version}</version>
       </dependency>
-
+      
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
-        <artifactId>shared-asn1</artifactId>
+        <artifactId>shared-ldap-converter</artifactId>
         <version>${org.apache.directory.shared.version}</version>
       </dependency>
       
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
-        <artifactId>shared-ldap-constants</artifactId>
+        <artifactId>shared-ldap-jndi</artifactId>
         <version>${org.apache.directory.shared.version}</version>
       </dependency>
       
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
-        <artifactId>shared-ldap-converter</artifactId>
+        <artifactId>shared-ldif</artifactId>
         <version>${org.apache.directory.shared.version}</version>
       </dependency>
       
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
-        <artifactId>shared-ldif</artifactId>
+        <artifactId>shared-ldap-schema</artifactId>
         <version>${org.apache.directory.shared.version}</version>
       </dependency>
       
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
-        <artifactId>shared-dsml-parser</artifactId>
+        <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>
       
+      <!-- Client dependencies -->
+    
+      <dependency>
+        <groupId>org.apache.directory.client.ldap</groupId>
+        <artifactId>ldap-client-api</artifactId>
+        <version>${org.apache.directory.ldap.client.api.version}</version>
+      </dependency>
+      
+      <!-- Daemon dependencies -->
+      
       <dependency>
         <groupId>org.apache.directory.daemon</groupId>
         <artifactId>daemon-bootstrappers</artifactId>
         <version>${daemon.bootstrappers.version}</version>
       </dependency>
 
+      <!-- Mina dependencies -->
+      
       <dependency>
         <groupId>org.apache.mina</groupId>
         <artifactId>mina-core</artifactId>
         <version>${mina.core.version}</version>
       </dependency>
 
+      <!-- Commons dependencies -->
+      
       <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
@@ -224,6 +571,8 @@
         <version>${commons.pool.version}</version>
       </dependency>
 
+      <!-- Logging dependencies -->
+
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
@@ -241,6 +590,8 @@
         <artifactId>log4j</artifactId>
         <version>${log4j.version}</version>
       </dependency>
+      
+      <!-- Other dependencies -->
 
       <dependency>
         <groupId>org.apache.velocity</groupId>
@@ -362,94 +713,34 @@
         <version>${xercesImpl.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>jetty</artifactId>
+        <version>${jetty.version}</version>
+      </dependency>
+    
+      <dependency>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>servlet-api-2.5</artifactId>
+        <version>${jetty.version}</version>
+      </dependency>
+    
+      <dependency>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>jetty-util</artifactId>
+        <version>${jetty.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
-  <issueManagement>
-    <system>JIRA</system>
-    <url>http://issues.apache.org/jira/browse/DIRSERVER</url>
-  </issueManagement>
-
-  <distributionManagement>
-    <site>
-      <id>apache.directory.apacheds</id>
-      <url>${distMgmtSiteUrl}</url>
-    </site>
-  </distributionManagement>
-
   <dependencies>
-    <!--dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-all</artifactId>
-    </dependency-->
-
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap</artifactId>
-    </dependency>
-
-    <dependency>
-      <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>
-
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-cursor</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-jndi</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-asn1-codec</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-asn1</artifactId>
-    </dependency>
-      
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-constants</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-converter</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldif</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-dsml-parser</artifactId>
-    </dependency>
-
-    <!-- apacheds standard logging interface -->
+    <!-- common logging interface -->
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
 
-    <!-- standard logging implementation for tests -->
+    <!-- logging implementation used for unit tests -->
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
@@ -457,92 +748,12 @@
     </dependency>
 
     <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>test</scope>
-    </dependency>
-    
-    <!-- Most modules use commons-io in test -->
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
 
-  <modules>
-    <module>i18n</module>
-    <module>all</module>
-    <module>jdbm</module>
-    <module>jdbm-store</module>
-    <module>jdbm-partition</module>
-    <module>xdbm-search</module>
-    <module>xdbm-tools</module>
-    <module>core</module>
-    <module>core-api</module>
-    <module>core-annotations</module>
-    <module>server-annotations</module>
-    <module>core-mock</module>
-    <module>core-jndi</module>
-    <module>core-constants</module>
-    <module>core-integ</module>
-    <module>core-avl</module>
-    <module>avl-partition</module>
-    <module>ldif-partition</module>
-    <module>protocol-shared</module>
-    <module>protocol-ntp</module>
-    <module>protocol-ldap</module>
-    <module>protocol-kerberos</module>
-    <module>protocol-dhcp</module>
-    <module>protocol-dns</module>
-    <module>protocol-changepw</module>
-    <module>server-integ</module>
-    <module>server-tools</module>
-    <module>default-config</module>
-    <!--Uncomment to build all in one OSGi bundle-->
-    <!--<module>osgi</module>-->
-
-    <!-- breaks the build on first try
-      <module>sar-plugin</module>
-      <module>server-sar</module>
-    -->
-
-    <module>server-xml</module>
-    <module>server-jndi</module>
-    <module>kerberos-shared</module>
-    <!--module>kerberos-unit</module-->
-    <module>interceptor-kerberos</module>
-    <module>kerberos-test</module>
-    <!--module>syncrepl</module-->
-    <module>server-replication</module>
-    <module>xbean-spring</module>
-    <module>http-integration</module>
-    <module>test-framework</module>
-    <module>ldap-client-test</module>
-  </modules>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.directory.buildtools</groupId>
-            <artifactId>directory-checkstyle</artifactId>
-            <version>${org.apache.directory.buildtools.directory-checkstyle.version}</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-    </plugins>
-  </build>
-
   <reporting>
     <excludeDefaults>true</excludeDefaults>
     <plugins>

Modified: directory/apacheds/trunk/protocol-changepw/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-changepw/pom.xml?rev=951022&r1=951021&r2=951022&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-changepw/pom.xml (original)
+++ directory/apacheds/trunk/protocol-changepw/pom.xml Thu Jun  3 15:06:38 2010
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements.  See the NOTICE file
@@ -18,7 +17,6 @@
   specific language governing permissions and limitations
   under the License.
 -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
@@ -30,23 +28,52 @@
   <artifactId>apacheds-protocol-changepw</artifactId>
   <name>ApacheDS Protocol Change Password</name>
 
-  <description>
-    The Change Password protocol provider for ApacheDS
-  </description>
-
-  <packaging>jar</packaging>  
+  <description>The Change Password protocol provider for ApacheDS</description>
 
   <dependencies>
     <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-core-api</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>apacheds-i18n</artifactId>
+    </dependency>
+    
+    <dependency>
       <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
+      <artifactId>apacheds-i18n</artifactId>
     </dependency>
     
     <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>apacheds-kerberos-shared</artifactId>
+    </dependency>
+    
+    <dependency>
       <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
+      <artifactId>apacheds-protocol-shared</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-asn1</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.apache.mina</groupId>
+      <artifactId>mina-core</artifactId>
     </dependency>
   </dependencies>
 

Modified: directory/apacheds/trunk/protocol-dhcp/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dhcp/pom.xml?rev=951022&r1=951021&r2=951022&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dhcp/pom.xml (original)
+++ directory/apacheds/trunk/protocol-dhcp/pom.xml Thu Jun  3 15:06:38 2010
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements.  See the NOTICE file
@@ -18,7 +17,6 @@
   specific language governing permissions and limitations
   under the License.
 -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
@@ -30,18 +28,22 @@
   <artifactId>apacheds-protocol-dhcp</artifactId>
   <name>ApacheDS Protocol Dhcp</name>
 
-  <description>
-    The DHCP protocol provider for ApacheDS
-  </description>
-
-  <packaging>jar</packaging>  
+  <description>The DHCP protocol provider for ApacheDS</description>
 
   <dependencies>
     <dependency>
-      <artifactId>apacheds-protocol-shared</artifactId>
       <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
+      <artifactId>apacheds-i18n</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap-constants</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.mina</groupId>
+      <artifactId>mina-core</artifactId>
     </dependency>
   </dependencies>
 </project>
-

Modified: directory/apacheds/trunk/protocol-dns/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dns/pom.xml?rev=951022&r1=951021&r2=951022&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dns/pom.xml (original)
+++ directory/apacheds/trunk/protocol-dns/pom.xml Thu Jun  3 15:06:38 2010
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements.  See the NOTICE file
@@ -18,7 +17,6 @@
   specific language governing permissions and limitations
   under the License.
 -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
@@ -30,30 +28,48 @@
   <artifactId>apacheds-protocol-dns</artifactId>
   <name>ApacheDS Protocol Dns</name>
 
-  <description>
-    The DNS protocol provider for ApacheDS
-  </description>
-
-  <packaging>jar</packaging>  
+  <description>The DNS protocol provider for ApacheDS</description> 
 
   <dependencies>
     <dependency>
-      <artifactId>apacheds-i18n</artifactId>
       <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
+      <artifactId>apacheds-core</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-core-api</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-i18n</artifactId>
     </dependency>
 
     <!-- TODO remove dependency on JNDI core -->
     <dependency>
-      <artifactId>apacheds-core-jndi</artifactId>
       <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
+      <artifactId>apacheds-core-jndi</artifactId>
     </dependency>
 
     <dependency>
-      <artifactId>apacheds-protocol-shared</artifactId>
       <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
+      <artifactId>apacheds-protocol-shared</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.mina</groupId>
+      <artifactId>mina-core</artifactId>
     </dependency>
   </dependencies>
 
@@ -75,4 +91,3 @@
     </plugins>
   </build>
 </project>
-

Modified: directory/apacheds/trunk/protocol-kerberos/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-kerberos/pom.xml?rev=951022&r1=951021&r2=951022&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-kerberos/pom.xml (original)
+++ directory/apacheds/trunk/protocol-kerberos/pom.xml Thu Jun  3 15:06:38 2010
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements.  See the NOTICE file
@@ -18,7 +17,6 @@
   specific language governing permissions and limitations
   under the License.
 -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
@@ -27,35 +25,40 @@
     <version>1.5.8-SNAPSHOT</version>
   </parent>
   
-  <groupId>org.apache.directory.server</groupId>  
   <artifactId>apacheds-protocol-kerberos</artifactId>
-  
   <name>ApacheDS Protocol Kerberos</name>
 
-  <description>
-    The Kerberos Protocol Provider for ApacheDS
-  </description>
-
-  <packaging>jar</packaging>  
+  <description>The Kerberos Protocol Provider for ApacheDS</description>
 
   <dependencies>
     <dependency>
-      <artifactId>apacheds-i18n</artifactId>
       <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
+      <artifactId>apacheds-core-api</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-i18n</artifactId>
     </dependency>
 
     <dependency>
-      <artifactId>apacheds-kerberos-shared</artifactId>
       <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
+      <artifactId>apacheds-kerberos-shared</artifactId>
     </dependency>
 
     <dependency>
-      <artifactId>apacheds-jdbm-partition</artifactId>
       <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
-      <scope>test</scope>
+      <artifactId>apacheds-protocol-shared</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.mina</groupId>
+      <artifactId>mina-core</artifactId>
     </dependency>
   </dependencies>
 
@@ -86,4 +89,3 @@
     </plugins>
   </build>
 </project>
-

Modified: directory/apacheds/trunk/protocol-ldap/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/pom.xml?rev=951022&r1=951021&r2=951022&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/pom.xml (original)
+++ directory/apacheds/trunk/protocol-ldap/pom.xml Thu Jun  3 15:06:38 2010
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements.  See the NOTICE file
@@ -18,7 +17,6 @@
   specific language governing permissions and limitations
   under the License.
 -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
@@ -26,32 +24,81 @@
     <artifactId>apacheds-parent</artifactId>
     <version>1.5.8-SNAPSHOT</version>
   </parent>
+  
   <artifactId>apacheds-protocol-ldap</artifactId>
-
-  <description>
-    The LDAPv3 protocol provider for ApacheDS
-  </description>
-
   <name>ApacheDS Protocol Ldap</name>
-  <packaging>jar</packaging>  
+  
+  <description>The LDAPv3 protocol provider for ApacheDS</description>
 
   <dependencies>
     <dependency>
-      <artifactId>apacheds-i18n</artifactId>
       <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
+      <artifactId>apacheds-core</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-core-api</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-i18n</artifactId>
     </dependency>
 
     <dependency>
-      <artifactId>apacheds-kerberos-shared</artifactId>
       <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
+      <artifactId>apacheds-kerberos-shared</artifactId>
     </dependency>
 
     <dependency>
-      <artifactId>apacheds-xdbm-tools</artifactId>
       <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
+      <artifactId>apacheds-xdbm-tools</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-asn1-codec</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-cursor</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-i18n</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
+    </dependency>
+    
+    <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>
+    
+    <dependency>
+      <groupId>org.apache.mina</groupId>
+      <artifactId>mina-core</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.apache.directory.client.ldap</groupId>
+      <artifactId>ldap-client-api</artifactId>
     </dependency>
 
     <!-- just have the dependency on activemq core components alone excluding
@@ -112,4 +159,3 @@
     </plugins>
   </build>
 </project>
-

Modified: directory/apacheds/trunk/protocol-ntp/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ntp/pom.xml?rev=951022&r1=951021&r2=951022&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ntp/pom.xml (original)
+++ directory/apacheds/trunk/protocol-ntp/pom.xml Thu Jun  3 15:06:38 2010
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements.  See the NOTICE file
@@ -18,7 +17,6 @@
   specific language governing permissions and limitations
   under the License.
 -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
@@ -30,23 +28,22 @@
   <artifactId>apacheds-protocol-ntp</artifactId>
   <name>ApacheDS Protocol Ntp</name>
 
-  <description>
-    The NTP protocol provider for ApacheDS
-  </description>
-
-  <packaging>jar</packaging>  
+  <description>The NTP protocol provider for ApacheDS</description>
 
   <dependencies>
     <dependency>
-      <artifactId>apacheds-protocol-shared</artifactId>
       <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
+      <artifactId>apacheds-protocol-shared</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.apache.mina</groupId>
+      <artifactId>mina-core</artifactId>
     </dependency>
 
     <dependency>
       <groupId>commons-net</groupId>
       <artifactId>commons-net</artifactId>
-      <version>${commons.net.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -69,4 +66,3 @@
     </plugins>
   </build>
 </project>
-

Modified: directory/apacheds/trunk/protocol-shared/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-shared/pom.xml?rev=951022&r1=951021&r2=951022&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-shared/pom.xml (original)
+++ directory/apacheds/trunk/protocol-shared/pom.xml Thu Jun  3 15:06:38 2010
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements.  See the NOTICE file
@@ -18,7 +17,6 @@
   specific language governing permissions and limitations
   under the License.
 -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
@@ -27,33 +25,37 @@
     <version>1.5.8-SNAPSHOT</version>
   </parent>
   
-  <groupId>org.apache.directory.server</groupId>
+  <name>ApacheDS Protocol Shared</name>
   <artifactId>apacheds-protocol-shared</artifactId>
 
   <description>
     Shared library that is used by all protocol providers in ApacheDS
   </description>
 
-  <name>ApacheDS Protocol Shared</name>
-  <packaging>jar</packaging>
-
   <dependencies>
     <dependency>
-      <artifactId>apacheds-i18n</artifactId>
       <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
+      <artifactId>apacheds-core-api</artifactId>
     </dependency>
-
+    
     <dependency>
-      <artifactId>apacheds-core</artifactId>
       <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
+      <artifactId>apacheds-i18n</artifactId>
     </dependency>
 
     <dependency>
       <groupId>org.apache.mina</groupId>
       <artifactId>mina-core</artifactId>
-      <version>${mina.core.version}</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldif</artifactId>
     </dependency>
   </dependencies>
 

Modified: directory/apacheds/trunk/server-annotations/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-annotations/pom.xml?rev=951022&r1=951021&r2=951022&view=diff
==============================================================================
--- directory/apacheds/trunk/server-annotations/pom.xml (original)
+++ directory/apacheds/trunk/server-annotations/pom.xml Thu Jun  3 15:06:38 2010
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements.  See the NOTICE file
@@ -18,7 +17,6 @@
   specific language governing permissions and limitations
   under the License.
 -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
@@ -30,34 +28,62 @@
   <artifactId>apacheds-server-annotations</artifactId>
   <name>Apacheds Server Annotations</name>
 
-  <packaging>jar</packaging>
-  <description>
-    Annotations used to define a LdapServer
-  </description>
+  <description>Annotations used to define a LdapServer</description>
   
   <dependencies>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>${junit.version}</version>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-core-annotations</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-core-api</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-i18n</artifactId>
     </dependency>
 
     <dependency>
-      <artifactId>apacheds-core-annotations</artifactId>
       <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
-    </dependency>  
+      <artifactId>apacheds-protocol-kerberos</artifactId>
+    </dependency>
 
     <dependency>
-      <artifactId>apacheds-protocol-ldap</artifactId>
       <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
-    </dependency>  
+      <artifactId>apacheds-protocol-ldap</artifactId>
+    </dependency>
 
     <dependency>
-      <artifactId>apacheds-protocol-kerberos</artifactId>
       <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
-    </dependency>  
+      <artifactId>apacheds-protocol-shared</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap-jndi</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.apache.mina</groupId>
+      <artifactId>mina-core</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</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=951022&r1=951021&r2=951022&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/pom.xml (original)
+++ directory/apacheds/trunk/server-integ/pom.xml Thu Jun  3 15:06:38 2010
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements.  See the NOTICE file
@@ -18,7 +17,6 @@
   specific language governing permissions and limitations
   under the License.
 -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
@@ -29,49 +27,120 @@
   
   <artifactId>apacheds-server-integ</artifactId>
   <name>ApacheDS Server Integration</name>
-  <packaging>jar</packaging>  
 
-  <description>
-    Integration testing framework for Apache Directory Server.
-  </description>
+  <description>Integration testing framework for Apache Directory Server.</description>
 
   <dependencies>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>${junit.version}</version>
-      <scope>provided</scope>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-core</artifactId>
     </dependency>
-
+    
     <dependency>
-      <groupId>commons-net</groupId>
-      <artifactId>commons-net</artifactId>
-      <version>${commons.net.version}</version>
-      <scope>test</scope>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-core-annotations</artifactId>
     </dependency>
-
+    
     <dependency>
-      <artifactId>apacheds-interceptor-kerberos</artifactId>
       <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
-    </dependency>  
-
+      <artifactId>apacheds-core-api</artifactId>
+    </dependency>
+    
     <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>apacheds-core-integ</artifactId>
+    </dependency>
+    
+    <dependency>
       <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
-    </dependency>  
+      <artifactId>apacheds-core-jndi</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-kerberos-shared</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-interceptor-kerberos</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-protocol-ldap</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-server-annotations</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-test-framework</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>ldapsdk</groupId>
       <artifactId>ldapsdk</artifactId>
-      <version>${ldapsdk.version}</version>
-    </dependency>  
+    </dependency>
+
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-asn1</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-cursor</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
+    </dependency>
+
+    <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>
+
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldif</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.mina</groupId>
+      <artifactId>mina-core</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>commons-net</groupId>
+      <artifactId>commons-net</artifactId>
+      <scope>test</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <scope>test</scope>
+    </dependency>
     
     <dependency>
       <groupId>org.apache.directory.client.ldap</groupId>
       <artifactId>ldap-client-api</artifactId>
-      <version>${org.apache.directory.ldap.client.api.version}</version>
     </dependency>  
   </dependencies>
 
@@ -176,4 +245,3 @@
     </profile>
   </profiles>
 </project>
-

Modified: directory/apacheds/trunk/server-jndi/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-jndi/pom.xml?rev=951022&r1=951021&r2=951022&view=diff
==============================================================================
--- directory/apacheds/trunk/server-jndi/pom.xml (original)
+++ directory/apacheds/trunk/server-jndi/pom.xml Thu Jun  3 15:06:38 2010
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements.  See the NOTICE file
@@ -18,7 +17,6 @@
   specific language governing permissions and limitations
   under the License.
 -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
@@ -34,34 +32,67 @@
     The JNDI provider which launches the core and associated network 
     services: Changepw, Kerberos, LDAP, and NTP if all are configured.
     By default only LDAP is configured to startup.
-  </description>
-
-  <packaging>jar</packaging>  
+  </description> 
 
   <dependencies>
     <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-core</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-core-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>apacheds-i18n</artifactId>
+    </dependency>
+
+    <dependency>
       <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
+      <artifactId>apacheds-ldif-partition</artifactId>
     </dependency>
     
     <dependency>
-      <artifactId>apacheds-protocol-ldap</artifactId>
       <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
-    </dependency>  
+      <artifactId>apacheds-protocol-ldap</artifactId>
+    </dependency>
 
     <dependency>
-      <artifactId>apacheds-ldif-partition</artifactId>
       <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
-    </dependency> 
+      <artifactId>apacheds-protocol-shared</artifactId>
+    </dependency>
 
     <dependency>
-      <artifactId>apacheds-jdbm-partition</artifactId>
       <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
-    </dependency>      
+      <artifactId>apacheds-xdbm-search</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
+    </dependency>
+
+    <dependency>
+      <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>
@@ -92,4 +123,3 @@
     </plugins>
   </build>
 </project>
-

Modified: directory/apacheds/trunk/server-replication/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-replication/pom.xml?rev=951022&r1=951021&r2=951022&view=diff
==============================================================================
--- directory/apacheds/trunk/server-replication/pom.xml (original)
+++ directory/apacheds/trunk/server-replication/pom.xml Thu Jun  3 15:06:38 2010
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements.  See the NOTICE file
@@ -18,7 +17,6 @@
   specific language governing permissions and limitations
   under the License.
 -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
@@ -29,18 +27,21 @@
   
   <artifactId>apacheds-server-replication</artifactId>
   <name>ApacheDS Server Replication Service</name>
+  
   <description>
     A multi-master replication service for replicating information
     across ApacheDS instances.  This service is modeled as an interceptor.
   </description>
-  <packaging>jar</packaging>
   
   <dependencies>
     <dependency>
-      <artifactId>apacheds-i18n</artifactId>
       <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
-    </dependency>  
+      <artifactId>apacheds-i18n</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
+    </dependency>
   </dependencies>
 </project>
-

Modified: directory/apacheds/trunk/server-tools/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-tools/pom.xml?rev=951022&r1=951021&r2=951022&view=diff
==============================================================================
--- directory/apacheds/trunk/server-tools/pom.xml (original)
+++ directory/apacheds/trunk/server-tools/pom.xml Thu Jun  3 15:06:38 2010
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements.  See the NOTICE file
@@ -18,7 +17,6 @@
   specific language governing permissions and limitations
   under the License.
 -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
@@ -30,90 +28,102 @@
   <artifactId>apacheds-server-tools</artifactId>
   <name>ApacheDS Server Tools</name>
 
-  <description>
-    Contained within this executable jar are various command line utilities
-    for apacheds.
-  </description>
-
-  <packaging>jar</packaging>  
+  <description>Contained within this executable jar are various command line utilities for apacheds.</description>
 
   <dependencies>
     <dependency>
-      <artifactId>apacheds-server-xml</artifactId>
       <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
+      <artifactId>apacheds-core</artifactId>
     </dependency>
-
+    
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-core-api</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-i18n</artifactId>
+    </dependency>
+    
     <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-jdbm</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-jdbm-store</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-protocol-ldap</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>apacheds-server-jndi</artifactId>
+    </dependency>
+    
+    <dependency>
       <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
+      <artifactId>apacheds-xdbm-search</artifactId>
     </dependency>
-
+    
     <dependency>
-      <artifactId>apacheds-jdbm-partition</artifactId>
       <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
+      <artifactId>apacheds-xdbm-tools</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.xbean</groupId>
-      <artifactId>xbean-spring</artifactId>
-      <version>${xbean.spring.version}</version>
+      <groupId>commons-cli</groupId>
+      <artifactId>commons-cli</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>${slf4j.api.version}</version>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-core</artifactId>
-      <version>${spring.core.version}</version>
+      <groupId>org.apache.directory.daemon</groupId>
+      <artifactId>daemon-bootstrappers</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-beans</artifactId>
-      <version>${spring.beans.version}</version>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-asn1</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-      <version>${spring.context.version}</version>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-cursor</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.directory.daemon</groupId>
-      <artifactId>daemon-bootstrappers</artifactId>
-      <version>${org.apache.directory.daemon.version}</version>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>commons-cli</groupId>
-      <artifactId>commons-cli</artifactId>
-      <version>${commons.cli.version}</version>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap-schema</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>${commons.lang.version}</version>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap-schema-loader</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>${slf4j.log4j12.version}</version>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap-schema-manager</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>${log4j.version}</version>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldif</artifactId>
     </dependency>
   </dependencies>
 

Modified: directory/apacheds/trunk/server-xml/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-xml/pom.xml?rev=951022&r1=951021&r2=951022&view=diff
==============================================================================
--- directory/apacheds/trunk/server-xml/pom.xml (original)
+++ directory/apacheds/trunk/server-xml/pom.xml Thu Jun  3 15:06:38 2010
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements.  See the NOTICE file
@@ -18,7 +17,6 @@
   specific language governing permissions and limitations
   under the License.
 -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
@@ -29,10 +27,8 @@
   
   <artifactId>apacheds-server-xml</artifactId>
   <name>ApacheDS Server XML File</name>
-  <packaging>jar</packaging>
-  <description>
-    A single authoritative server.xml file.
-  </description>
+  
+  <description>A single authoritative server.xml file</description>
 
   <build>
     <resources>
@@ -45,72 +41,74 @@
   
   <dependencies>
     <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>apacheds-xbean-spring</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
       <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
+      <artifactId>apacheds-core</artifactId>
       <scope>test</scope>
     </dependency>
 
     <dependency>
-      <artifactId>apacheds-protocol-changepw</artifactId>
       <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
+      <artifactId>apacheds-core-api</artifactId>
       <scope>test</scope>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-jdbm-partition</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-server-jndi</artifactId>
       <scope>test</scope>
     </dependency>
     
     <dependency>
-      <artifactId>apacheds-protocol-kerberos</artifactId>
       <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
+      <artifactId>apacheds-protocol-kerberos</artifactId>
       <scope>test</scope>
     </dependency>
     
     <dependency>
-      <artifactId>apacheds-protocol-dns</artifactId>
       <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
+      <artifactId>apacheds-protocol-dns</artifactId>
       <scope>test</scope>
     </dependency>
     
     <dependency>
-      <artifactId>apacheds-protocol-ldap</artifactId>
       <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
+      <artifactId>apacheds-protocol-ldap</artifactId>
       <scope>test</scope>
     </dependency>
     
     <dependency>
-      <artifactId>apacheds-protocol-ntp</artifactId>
       <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
+      <artifactId>apacheds-protocol-ntp</artifactId>
       <scope>test</scope>
     </dependency>
 
     <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>apacheds-server-jndi</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
       <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
+      <artifactId>apacheds-jdbm-partition</artifactId>
       <scope>test</scope>
     </dependency>
 
     <dependency>
-      <artifactId>apacheds-http-integration</artifactId>
       <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
+      <artifactId>apacheds-http-integration</artifactId>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>org.apache.xbean</groupId>
       <artifactId>xbean-spring</artifactId>
-      <version>3.4.3</version>
       <scope>test</scope>
     </dependency>
 

Modified: directory/apacheds/trunk/test-framework/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/test-framework/pom.xml?rev=951022&r1=951021&r2=951022&view=diff
==============================================================================
--- directory/apacheds/trunk/test-framework/pom.xml (original)
+++ directory/apacheds/trunk/test-framework/pom.xml Thu Jun  3 15:06:38 2010
@@ -9,35 +9,58 @@
   
   <artifactId>apacheds-test-framework</artifactId>
   <name>ApacheDS Test Framework</name>
-  <packaging>jar</packaging>
   
-  <description>
-    test framework for integration tests without depending on the InheritableSettings
-  </description>
+  <description>Test framework for integration tests without depending on the InheritableSettings</description>
   
   <dependencies>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>${junit.version}</version>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-core-annotations</artifactId>
     </dependency>
-
+    
     <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>${commons.io.version}</version>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-core-api</artifactId>
     </dependency>
-
+    
     <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>apacheds-i18n</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-protocol-kerberos</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-protocol-ldap</artifactId>
+    </dependency>
+    
+    <dependency>
       <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
-    </dependency>  
+      <artifactId>apacheds-protocol-shared</artifactId>
+    </dependency>
 
     <dependency>
-      <artifactId>apacheds-server-annotations</artifactId>
       <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
-    </dependency>  
+      <artifactId>apacheds-server-annotations</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
   </dependencies>
 </project>

Modified: directory/apacheds/trunk/xbean-spring/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xbean-spring/pom.xml?rev=951022&r1=951021&r2=951022&view=diff
==============================================================================
--- directory/apacheds/trunk/xbean-spring/pom.xml (original)
+++ directory/apacheds/trunk/xbean-spring/pom.xml Thu Jun  3 15:06:38 2010
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements.  See the NOTICE file
@@ -18,131 +17,128 @@
   specific language governing permissions and limitations
   under the License.
 -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
+  <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>apacheds-parent</artifactId>
     <groupId>org.apache.directory.server</groupId>
     <version>1.5.8-SNAPSHOT</version>
   </parent>
   
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.directory.server</groupId>
   <artifactId>apacheds-xbean-spring</artifactId>
   <name>ApacheDS Xbean Spring</name>
 
-  <url>http://maven.apache.org</url>
   <dependencies>
     <!-- The list of dependencies must include all modules with xbean annotations.  Grep for @org.apache.xbean.XBean -->
-    <!-- Also be sure that each module mentioned here generates a source jar by including
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-source-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-sources</id>
-            <phase>verify</phase>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
+    <!-- Also be sure that each module mentioned here generates a source jar by including:
+         ==============================================
+         <plugin>
+           <groupId>org.apache.maven.plugins</groupId>
+           <artifactId>maven-source-plugin</artifactId>
+           <executions>
+             <execution>
+               <id>attach-sources</id>
+               <phase>verify</phase>
+               <goals>
+                 <goal>jar</goal>
+               </goals>
+             </execution>
+           </executions>
+         </plugin>
+         ==============================================
     -->
     
     <dependency>
-      <artifactId>apacheds-core</artifactId>
       <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-core</artifactId>
       <version>${project.version}</version>
       <classifier>sources</classifier>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
-      <artifactId>apacheds-interceptor-kerberos</artifactId>
       <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-interceptor-kerberos</artifactId>
       <version>${project.version}</version>
       <classifier>sources</classifier>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
-      <artifactId>apacheds-jdbm-store</artifactId>
       <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-jdbm-store</artifactId>
       <version>${project.version}</version>
       <classifier>sources</classifier>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
-      <artifactId>apacheds-jdbm-partition</artifactId>
       <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-jdbm-partition</artifactId>
       <version>${project.version}</version>
       <classifier>sources</classifier>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
-      <artifactId>apacheds-protocol-changepw</artifactId>
       <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-protocol-changepw</artifactId>
       <version>${project.version}</version>
       <classifier>sources</classifier>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
-      <artifactId>apacheds-protocol-dns</artifactId>
       <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-protocol-dns</artifactId>
       <version>${project.version}</version>
       <classifier>sources</classifier>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
-      <artifactId>apacheds-protocol-kerberos</artifactId>
       <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-protocol-kerberos</artifactId>
       <version>${project.version}</version>
       <classifier>sources</classifier>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
-      <artifactId>apacheds-protocol-ldap</artifactId>
       <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-protocol-ldap</artifactId>
       <version>${project.version}</version>
       <classifier>sources</classifier>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
-      <artifactId>apacheds-protocol-ntp</artifactId>
       <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-protocol-ntp</artifactId>
       <version>${project.version}</version>
       <classifier>sources</classifier>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
-      <artifactId>apacheds-protocol-shared</artifactId>
       <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-protocol-shared</artifactId>
       <version>${project.version}</version>
       <classifier>sources</classifier>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
-      <artifactId>apacheds-server-jndi</artifactId>
       <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-server-jndi</artifactId>
       <version>${project.version}</version>
       <classifier>sources</classifier>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
-      <artifactId>apacheds-http-integration</artifactId>
       <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-http-integration</artifactId>
       <version>${project.version}</version>
       <classifier>sources</classifier>
       <scope>provided</scope>
@@ -151,6 +147,7 @@
     <dependency>
       <groupId>xerces</groupId>
       <artifactId>xercesImpl</artifactId>
+      <scope>test</scope>
     </dependency>
 
     <!-- replication interceptor xbean config metadata -->

Modified: directory/apacheds/trunk/xdbm-search/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/pom.xml?rev=951022&r1=951021&r2=951022&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/pom.xml (original)
+++ directory/apacheds/trunk/xdbm-search/pom.xml Thu Jun  3 15:06:38 2010
@@ -26,23 +26,63 @@
   
   <artifactId>apacheds-xdbm-search</artifactId>
   <name>ApacheDS Generalized (X) DBM Search Engine</name>
-  <packaging>jar</packaging>
-  <description>
-    Search engine implementation generalized for XDBM entry store scheme.
-  </description>
+  
+  <description>Search engine implementation generalized for XDBM entry store scheme</description>
   
   <dependencies>
     <dependency>
-      <artifactId>apacheds-core-avl</artifactId>
       <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
+      <artifactId>apacheds-core-avl</artifactId>
     </dependency>
 
     <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>apacheds-core-api</artifactId>
+    </dependency>
+    
+    <dependency>
       <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
+      <artifactId>apacheds-i18n</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-asn1</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-cursor</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-i18n</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
+    </dependency>
+    
+    <dependency>
+      <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>
 </project>
-

Modified: directory/apacheds/trunk/xdbm-tools/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-tools/pom.xml?rev=951022&r1=951021&r2=951022&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-tools/pom.xml (original)
+++ directory/apacheds/trunk/xdbm-tools/pom.xml Thu Jun  3 15:06:38 2010
@@ -15,7 +15,6 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<!-- $Rev:  $ $Date:  $ -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
@@ -23,6 +22,7 @@
     <artifactId>apacheds-parent</artifactId>
     <version>1.5.8-SNAPSHOT</version>
   </parent>
+  
   <artifactId>apacheds-xdbm-tools</artifactId>
   <name>ApacheDS Generalized (X) DBM Tools</name>
 
@@ -37,18 +37,38 @@
   
   <dependencies>
     <dependency>
-      <artifactId>apacheds-i18n</artifactId>
       <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
+      <artifactId>apacheds-core-api</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-i18n</artifactId>
     </dependency>
 
     <dependency>
-      <artifactId>apacheds-xdbm-search</artifactId>
       <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
+      <artifactId>apacheds-xdbm-search</artifactId>
     </dependency>
-  </dependencies>
 
-  <packaging>jar</packaging>
-</project>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-cursor</artifactId>
+    </dependency>
 
+    <dependency>
+      <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>



Mime
View raw message