directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r897580 - in /directory/apacheds/trunk: ./ all/ avl-partition/ core-annotations/ core-api/ core-avl/ core-entry/ core-entry/src/main/java/org/apache/directory/server/core/entry/ core-entry/src/test/java/org/apache/directory/server/core/entr...
Date Sun, 10 Jan 2010 00:03:44 GMT
Author: seelmann
Date: Sun Jan 10 00:03:43 2010
New Revision: 897580

URL: http://svn.apache.org/viewvc?rev=897580&view=rev
Log:
o use shared-all in apacheds-parent, removed all other dependencies to shared
o cleaned up internal transitive dependencies
o moved commons-io (scope test) dependency to apacheds-parent, because most modules use it as test dependency
o moved ServerEntrySerializer from core-entry to jdbm-store, removed dependency from core-entry to jdbm-store
o listed all modules in apacheds-all
o fixed some project names to use upper case 


Added:
    directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializer.java
      - copied, changed from r897425, directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntrySerializer.java
    directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java
      - copied, changed from r897425, directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerEntrySerializerTest.java
Removed:
    directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntrySerializer.java
    directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerEntrySerializerTest.java
Modified:
    directory/apacheds/trunk/all/pom.xml
    directory/apacheds/trunk/avl-partition/pom.xml
    directory/apacheds/trunk/core-annotations/pom.xml
    directory/apacheds/trunk/core-api/pom.xml
    directory/apacheds/trunk/core-avl/pom.xml
    directory/apacheds/trunk/core-entry/pom.xml
    directory/apacheds/trunk/core-integ/pom.xml
    directory/apacheds/trunk/core-jndi/pom.xml
    directory/apacheds/trunk/core/pom.xml
    directory/apacheds/trunk/http-integration/pom.xml
    directory/apacheds/trunk/interceptor-kerberos/pom.xml
    directory/apacheds/trunk/jdbm-partition/pom.xml
    directory/apacheds/trunk/jdbm-store/pom.xml
    directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java
    directory/apacheds/trunk/kerberos-shared/pom.xml
    directory/apacheds/trunk/ldap-api-test/pom.xml
    directory/apacheds/trunk/ldif-partition/pom.xml
    directory/apacheds/trunk/pom.xml
    directory/apacheds/trunk/protocol-dhcp/pom.xml
    directory/apacheds/trunk/protocol-ldap/pom.xml
    directory/apacheds/trunk/protocol-ntp/pom.xml
    directory/apacheds/trunk/protocol-ntp/src/test/java/org/apache/directory/server/ntp/NtpITest.java
    directory/apacheds/trunk/server-annotations/pom.xml
    directory/apacheds/trunk/server-integ/pom.xml
    directory/apacheds/trunk/server-jndi/pom.xml
    directory/apacheds/trunk/server-tools/pom.xml
    directory/apacheds/trunk/test-framework/pom.xml
    directory/apacheds/trunk/xdbm-base/pom.xml
    directory/apacheds/trunk/xdbm-search/pom.xml
    directory/apacheds/trunk/xdbm-tools/pom.xml

Modified: directory/apacheds/trunk/all/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/all/pom.xml?rev=897580&r1=897579&r2=897580&view=diff
==============================================================================
--- directory/apacheds/trunk/all/pom.xml (original)
+++ directory/apacheds/trunk/all/pom.xml Sun Jan 10 00:03:43 2010
@@ -33,15 +33,200 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-server-jndi</artifactId>
+      <artifactId>apacheds-avl-partition</artifactId>
       <version>${pom.version}</version>
     </dependency>
-
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core-annotations</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core-api</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core-avl</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core-constants</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core-entry</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <!-- 
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core-integ</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+     -->
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core-jndi</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core-mock</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <!-- 
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-http-integration</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    -->
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-interceptor-kerberos</artifactId>
       <version>${pom.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-jdbm</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-jdbm-partition</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-jdbm-store</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-kerberos-shared</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <!-- 
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-kerberos-test</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+     -->
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-ldif-partition</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-protocol-changepw</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-protocol-dhcp</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-protocol-dns</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-protocol-kerberos</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-protocol-ldap</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-protocol-ntp</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-protocol-shared</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-server-annotations</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <!-- 
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-server-integ</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+     -->
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-server-jndi</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-server-replication</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <!-- 
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-server-tools</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+     -->
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-server-xml</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-test-framework</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-utils</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-xbean-spring</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-xdbm-base</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-xdbm-search</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-xdbm-tools</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    
   </dependencies>
 
   <build>

Modified: directory/apacheds/trunk/avl-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/avl-partition/pom.xml?rev=897580&r1=897579&r2=897580&view=diff
==============================================================================
--- directory/apacheds/trunk/avl-partition/pom.xml (original)
+++ directory/apacheds/trunk/avl-partition/pom.xml Sun Jan 10 00:03:43 2010
@@ -37,59 +37,28 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-core-entry</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core-avl</artifactId>
       <version>${pom.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-core-constants</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core</artifactId>
       <version>${pom.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-xdbm-base</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-xdbm-search</artifactId>
       <version>${pom.version}</version>
     </dependency>
     
     <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap</artifactId>
-      <version>${org.apache.directory.shared.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-constants</artifactId>
-      <version>${org.apache.directory.shared.version}</version>
-    </dependency>    
-
-   <!-- this dependency exists only for using the DitToLdifWriter class.
-        should be dropped once the ldif partition moves into its own module -->
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-client-api</artifactId>
-      <version>${org.apache.directory.shared.version}</version>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-xdbm-tools</artifactId>
+      <version>${pom.version}</version>
       <scope>test</scope>
-    </dependency>    
+    </dependency>
 
   </dependencies>
 

Modified: directory/apacheds/trunk/core-annotations/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-annotations/pom.xml?rev=897580&r1=897579&r2=897580&view=diff
==============================================================================
--- directory/apacheds/trunk/core-annotations/pom.xml (original)
+++ directory/apacheds/trunk/core-annotations/pom.xml Sun Jan 10 00:03:43 2010
@@ -9,7 +9,7 @@
   <artifactId>apacheds-core-annotations</artifactId>
   <packaging>jar</packaging>
   <version>1.5.6-SNAPSHOT</version>
-  <name>apacheds-core-annotations</name>
+  <name>ApacheDS Core Annotations</name>
   <description>Annotations used to define a DirectoryService</description>
   <dependencies>
     <dependency>
@@ -37,12 +37,6 @@
 
     <dependency>
       <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-avl-partition</artifactId>
-      <version>${pom.version}</version>
-    </dependency>  
-
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-ldif-partition</artifactId>
       <version>${pom.version}</version>
     </dependency>  

Modified: directory/apacheds/trunk/core-api/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/pom.xml?rev=897580&r1=897579&r2=897580&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/pom.xml (original)
+++ directory/apacheds/trunk/core-api/pom.xml Sun Jan 10 00:03:43 2010
@@ -42,18 +42,6 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-cursor</artifactId>
-      <version>${org.apache.directory.shared.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-schema-loader</artifactId>
-      <version>${org.apache.directory.shared.version}</version>
-    </dependency>
-
-    <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core-constants</artifactId>
       <version>${pom.version}</version>

Modified: directory/apacheds/trunk/core-avl/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-avl/pom.xml?rev=897580&r1=897579&r2=897580&view=diff
==============================================================================
--- directory/apacheds/trunk/core-avl/pom.xml (original)
+++ directory/apacheds/trunk/core-avl/pom.xml Sun Jan 10 00:03:43 2010
@@ -34,12 +34,6 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <version>${org.apache.directory.shared.version}</version>
-      <artifactId>shared-cursor</artifactId>
-    </dependency>
-
-    <dependency>
       <groupId>org.apache.directory.server</groupId>
       <version>${pom.version}</version>
       <artifactId>apacheds-xdbm-base</artifactId>

Modified: directory/apacheds/trunk/core-entry/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-entry/pom.xml?rev=897580&r1=897579&r2=897580&view=diff
==============================================================================
--- directory/apacheds/trunk/core-entry/pom.xml (original)
+++ directory/apacheds/trunk/core-entry/pom.xml Sun Jan 10 00:03:43 2010
@@ -35,35 +35,6 @@
 
   <packaging>jar</packaging>
 
-  <dependencies>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <version>${pom.version}</version>
-      <artifactId>apacheds-jdbm</artifactId>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <version>${org.apache.directory.shared.version}</version>
-      <artifactId>shared-ldap-schema-manager</artifactId>
-      <scope>test</scope>
-    </dependency>    
-    
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <scope>test</scope>
-    </dependency>
-      
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <version>${org.apache.directory.shared.version}</version>
-      <artifactId>shared-ldap-schema</artifactId>
-      <scope>test</scope>
-    </dependency>    
-  </dependencies>
-  
-
   <build>
     <plugins>
       <plugin>

Modified: directory/apacheds/trunk/core-integ/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/pom.xml?rev=897580&r1=897579&r2=897580&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/pom.xml (original)
+++ directory/apacheds/trunk/core-integ/pom.xml Sun Jan 10 00:03:43 2010
@@ -48,31 +48,6 @@
 
     <dependency>
       <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-core-jndi</artifactId>
-      <version>${pom.version}</version>
-    </dependency>  
-
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-jdbm-partition</artifactId>
-      <version>${pom.version}</version>
-      <!--scope>test</scope-->
-    </dependency>  
-
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-avl-partition</artifactId>
-      <version>${pom.version}</version>
-    </dependency>  
-
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-ldif-partition</artifactId>
-      <version>${pom.version}</version>
-    </dependency>  
-
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-test-framework</artifactId>
       <version>${pom.version}</version>
     </dependency>  

Modified: directory/apacheds/trunk/core-jndi/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/pom.xml?rev=897580&r1=897579&r2=897580&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/pom.xml (original)
+++ directory/apacheds/trunk/core-jndi/pom.xml Sun Jan 10 00:03:43 2010
@@ -40,12 +40,6 @@
 
   <dependencies>
     <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core</artifactId>
       <version>${pom.version}</version>

Modified: directory/apacheds/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/pom.xml?rev=897580&r1=897579&r2=897580&view=diff
==============================================================================
--- directory/apacheds/trunk/core/pom.xml (original)
+++ directory/apacheds/trunk/core/pom.xml Sun Jan 10 00:03:43 2010
@@ -38,78 +38,18 @@
 
   <dependencies>
     <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-xdbm-search</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-
-    <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core-api</artifactId>
       <version>${pom.version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-schema</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>
-
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-xdbm-tools</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-core-entry</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-core-constants</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-
-    <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-utils</artifactId>
       <version>${pom.version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-jdbm-store</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-xdbm-base</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <version>${org.apache.directory.shared.version}</version>
-      <artifactId>shared-cursor</artifactId>
-    </dependency>
-
-    <dependency>
       <groupId>bouncycastle</groupId>
       <artifactId>bcprov-jdk15</artifactId>
     </dependency>

Modified: directory/apacheds/trunk/http-integration/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/http-integration/pom.xml?rev=897580&r1=897579&r2=897580&view=diff
==============================================================================
--- directory/apacheds/trunk/http-integration/pom.xml (original)
+++ directory/apacheds/trunk/http-integration/pom.xml Sun Jan 10 00:03:43 2010
@@ -28,7 +28,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.directory.server.http</groupId>
   <artifactId>apacheds-http-integration</artifactId>
-  <name>ApacheDS jetty http server integration</name>
+  <name>ApacheDS Jetty HTTP Server Integration</name>
   <version>1.5.6-SNAPSHOT</version>
   
   <properties>

Modified: directory/apacheds/trunk/interceptor-kerberos/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptor-kerberos/pom.xml?rev=897580&r1=897579&r2=897580&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptor-kerberos/pom.xml (original)
+++ directory/apacheds/trunk/interceptor-kerberos/pom.xml Sun Jan 10 00:03:43 2010
@@ -36,12 +36,6 @@
 
   <dependencies>
     <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core</artifactId>
       <version>${pom.version}</version>

Modified: directory/apacheds/trunk/jdbm-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/pom.xml?rev=897580&r1=897579&r2=897580&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/pom.xml (original)
+++ directory/apacheds/trunk/jdbm-partition/pom.xml Sun Jan 10 00:03:43 2010
@@ -37,9 +37,19 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-jdbm-store</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core</artifactId>
       <version>${pom.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-xdbm-search</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
   </dependencies>
 
   <build>

Modified: directory/apacheds/trunk/jdbm-store/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/pom.xml?rev=897580&r1=897579&r2=897580&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/pom.xml (original)
+++ directory/apacheds/trunk/jdbm-store/pom.xml Sun Jan 10 00:03:43 2010
@@ -42,12 +42,6 @@
 
   <dependencies>
     <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
       <groupId>${pom.groupId}</groupId>
       <version>${pom.version}</version>
       <artifactId>apacheds-jdbm</artifactId>
@@ -55,12 +49,6 @@
 
     <dependency>
       <groupId>${pom.groupId}</groupId>
-      <artifactId>apacheds-core-constants</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
       <artifactId>apacheds-core-entry</artifactId>
       <version>${pom.version}</version>
     </dependency>
@@ -73,30 +61,11 @@
 
     <dependency>
       <groupId>${pom.groupId}</groupId>
-      <artifactId>apacheds-xdbm-base</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
       <artifactId>apacheds-xdbm-tools</artifactId>
       <version>${pom.version}</version>
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-schema</artifactId>
-      <version>${org.apache.directory.shared.version}</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-schema-manager</artifactId>
-      <version>${org.apache.directory.shared.version}</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>

Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java?rev=897580&r1=897579&r2=897580&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java Sun Jan 10 00:03:43 2010
@@ -25,7 +25,6 @@
 import jdbm.helper.Serializer;
 import jdbm.helper.StringComparator;
 
-import org.apache.directory.server.core.entry.ServerEntrySerializer;
 import org.apache.directory.server.xdbm.MasterTable;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.comparators.SerializableComparator;

Copied: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializer.java (from r897425, directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntrySerializer.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializer.java?p2=directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializer.java&p1=directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntrySerializer.java&r1=897425&r2=897580&rev=897580&view=diff
==============================================================================
--- directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntrySerializer.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializer.java Sun Jan 10 00:03:43 2010
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.core.entry;
+package org.apache.directory.server.core.partition.impl.btree.jdbm;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -27,6 +27,7 @@
 
 import jdbm.helper.Serializer;
 
+import org.apache.directory.server.core.entry.DefaultServerEntry;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Copied: directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java (from r897425, directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerEntrySerializerTest.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java?p2=directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java&p1=directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerEntrySerializerTest.java&r1=897425&r2=897580&rev=897580&view=diff
==============================================================================
--- directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerEntrySerializerTest.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java Sun Jan 10 00:03:43 2010
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.core.entry;
+package org.apache.directory.server.core.partition.impl.btree.jdbm;
 
 
 import static org.junit.Assert.assertEquals;
@@ -28,6 +28,10 @@
 import java.util.List;
 import java.util.Map;
 
+import org.apache.directory.server.core.entry.DefaultServerAttribute;
+import org.apache.directory.server.core.entry.DefaultServerEntry;
+import org.apache.directory.server.core.entry.ServerEntry;
+import org.apache.directory.server.core.partition.impl.btree.jdbm.ServerEntrySerializer;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.name.LdapDN;

Modified: directory/apacheds/trunk/kerberos-shared/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/pom.xml?rev=897580&r1=897579&r2=897580&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/pom.xml (original)
+++ directory/apacheds/trunk/kerberos-shared/pom.xml Sun Jan 10 00:03:43 2010
@@ -36,11 +36,6 @@
   <packaging>jar</packaging>  
 
   <dependencies>
-    <dependency>
-      <groupId>org.apache.mina</groupId>
-      <artifactId>mina-core</artifactId>
-    </dependency>
-
     <!-- TODO remove dependency on JNDI core -->
     <dependency>
       <groupId>org.apache.directory.server</groupId>

Modified: directory/apacheds/trunk/ldap-api-test/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-api-test/pom.xml?rev=897580&r1=897579&r2=897580&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-api-test/pom.xml (original)
+++ directory/apacheds/trunk/ldap-api-test/pom.xml Sun Jan 10 00:03:43 2010
@@ -42,51 +42,17 @@
     </dependency>
 
     <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
       <groupId>commons-net</groupId>
       <artifactId>commons-net</artifactId>
       <scope>test</scope>
     </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-server-jndi</artifactId>
-      <version>${pom.version}</version>
-      <scope>test</scope>
-    </dependency>  
-
+    
     <dependency>
       <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-server-integ</artifactId>
+      <artifactId>apacheds-test-framework</artifactId>
       <version>${pom.version}</version>
       <scope>test</scope>
-    </dependency>  
-
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-interceptor-kerberos</artifactId>
-      <version>${pom.version}</version>
-      <scope>test</scope>
-    </dependency>  
-
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-core-integ</artifactId>
-      <version>${pom.version}</version>
-      <scope>test</scope>
-    </dependency>  
-
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-client-api</artifactId>
-      <version>${org.apache.directory.shared.version}</version>
-      <scope>test</scope>
-    </dependency>  
+    </dependency>      
   </dependencies>
 
   <build>

Modified: directory/apacheds/trunk/ldif-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/pom.xml?rev=897580&r1=897579&r2=897580&view=diff
==============================================================================
--- directory/apacheds/trunk/ldif-partition/pom.xml (original)
+++ directory/apacheds/trunk/ldif-partition/pom.xml Sun Jan 10 00:03:43 2010
@@ -37,18 +37,6 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-core-entry</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-core-avl</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-avl-partition</artifactId>
       <version>${pom.version}</version>
     </dependency>
@@ -58,51 +46,6 @@
       <artifactId>apacheds-core-mock</artifactId>
       <version>${pom.version}</version>
     </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-core-constants</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-core</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-xdbm-base</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-xdbm-search</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap</artifactId>
-      <version>${org.apache.directory.shared.version}</version>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-constants</artifactId>
-      <version>${org.apache.directory.shared.version}</version>
-    </dependency>    
-
-   <!-- this dependency exists only for using the DitToLdifWriter class.
-        should be dropped once the ldif partition moves into its own module -->
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-client-api</artifactId>
-      <version>${org.apache.directory.shared.version}</version>
-    </dependency>    
-
   </dependencies>
 
   <build>

Modified: directory/apacheds/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/pom.xml?rev=897580&r1=897579&r2=897580&view=diff
==============================================================================
--- directory/apacheds/trunk/pom.xml (original)
+++ directory/apacheds/trunk/pom.xml Sun Jan 10 00:03:43 2010
@@ -50,25 +50,7 @@
 
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
-        <artifactId>shared-asn1-codec</artifactId>
-        <version>${org.apache.directory.shared.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.directory.shared</groupId>
-        <artifactId>shared-ldap</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>
-
-      <dependency>
-        <groupId>org.apache.directory.shared</groupId>
-        <artifactId>shared-ldap-constants</artifactId>
+        <artifactId>shared-all</artifactId>
         <version>${org.apache.directory.shared.version}</version>
       </dependency>
 
@@ -300,7 +282,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap</artifactId>
+      <artifactId>shared-all</artifactId>
     </dependency>
 
     <!-- apacheds standard logging interface -->
@@ -328,6 +310,13 @@
       <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>

Modified: directory/apacheds/trunk/protocol-dhcp/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dhcp/pom.xml?rev=897580&r1=897579&r2=897580&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dhcp/pom.xml (original)
+++ directory/apacheds/trunk/protocol-dhcp/pom.xml Sun Jan 10 00:03:43 2010
@@ -37,11 +37,6 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.mina</groupId>
-      <artifactId>mina-core</artifactId>
-    </dependency>
-
-    <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-protocol-shared</artifactId>
       <version>${pom.version}</version>

Modified: directory/apacheds/trunk/protocol-ldap/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/pom.xml?rev=897580&r1=897579&r2=897580&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/pom.xml (original)
+++ directory/apacheds/trunk/protocol-ldap/pom.xml Sun Jan 10 00:03:43 2010
@@ -37,16 +37,6 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-asn1-codec</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap</artifactId>
-    </dependency>
-
-    <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-kerberos-shared</artifactId>
       <version>${pom.version}</version>
@@ -54,13 +44,7 @@
 
     <dependency>
       <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-core</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-protocol-shared</artifactId>
+      <artifactId>apacheds-xdbm-tools</artifactId>
       <version>${pom.version}</version>
     </dependency>
   </dependencies>

Modified: directory/apacheds/trunk/protocol-ntp/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ntp/pom.xml?rev=897580&r1=897579&r2=897580&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ntp/pom.xml (original)
+++ directory/apacheds/trunk/protocol-ntp/pom.xml Sun Jan 10 00:03:43 2010
@@ -36,24 +36,11 @@
   <packaging>jar</packaging>  
 
   <dependencies>
-
-    <dependency>
-      <groupId>org.apache.mina</groupId>
-      <artifactId>mina-core</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-protocol-shared</artifactId>
       <version>${pom.version}</version>
     </dependency>
-    
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-server-unit</artifactId>
-      <version>${pom.version}</version>
-      <scope>test</scope>
-    </dependency>
 
     <dependency>
       <groupId>commons-net</groupId>

Modified: directory/apacheds/trunk/protocol-ntp/src/test/java/org/apache/directory/server/ntp/NtpITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ntp/src/test/java/org/apache/directory/server/ntp/NtpITest.java?rev=897580&r1=897579&r2=897580&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ntp/src/test/java/org/apache/directory/server/ntp/NtpITest.java (original)
+++ directory/apacheds/trunk/protocol-ntp/src/test/java/org/apache/directory/server/ntp/NtpITest.java Sun Jan 10 00:03:43 2010
@@ -27,7 +27,6 @@
 import org.apache.commons.net.ntp.TimeInfo;
 import org.apache.directory.server.protocol.shared.transport.TcpTransport;
 import org.apache.directory.server.protocol.shared.transport.UdpTransport;
-import org.apache.directory.server.unit.AbstractServerTest;
 import org.apache.mina.filter.executor.ExecutorFilter;
 import org.apache.mina.util.AvailablePortFinder;
 import org.junit.After;
@@ -36,7 +35,7 @@
 import static org.junit.Assert.assertTrue;
 
 /**
- * An {@link AbstractServerTest} testing the Network Time Protocol (NTP).
+ * An test testing the Network Time Protocol (NTP).
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$

Modified: directory/apacheds/trunk/server-annotations/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-annotations/pom.xml?rev=897580&r1=897579&r2=897580&view=diff
==============================================================================
--- directory/apacheds/trunk/server-annotations/pom.xml (original)
+++ directory/apacheds/trunk/server-annotations/pom.xml Sun Jan 10 00:03:43 2010
@@ -43,29 +43,6 @@
     </dependency>
 
     <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-core-jndi</artifactId>
-      <version>${pom.version}</version>
-    </dependency>  
-
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-jdbm-partition</artifactId>
-      <version>${pom.version}</version>
-    </dependency>  
-
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-avl-partition</artifactId>
-      <version>${pom.version}</version>
-    </dependency>  
-
-    <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core-annotations</artifactId>
       <version>${pom.version}</version>
@@ -73,12 +50,6 @@
 
     <dependency>
       <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-ldif-partition</artifactId>
-      <version>${pom.version}</version>
-    </dependency>  
-
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-protocol-ldap</artifactId>
       <version>${pom.version}</version>
     </dependency>  

Modified: directory/apacheds/trunk/server-integ/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/pom.xml?rev=897580&r1=897579&r2=897580&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/pom.xml (original)
+++ directory/apacheds/trunk/server-integ/pom.xml Sun Jan 10 00:03:43 2010
@@ -42,11 +42,6 @@
     </dependency>
 
     <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-    </dependency>
-
-    <dependency>
       <groupId>commons-net</groupId>
       <artifactId>commons-net</artifactId>
       <scope>test</scope>
@@ -54,12 +49,6 @@
 
     <dependency>
       <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-server-jndi</artifactId>
-      <version>${pom.version}</version>
-    </dependency>  
-
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-interceptor-kerberos</artifactId>
       <version>${pom.version}</version>
     </dependency>  
@@ -71,19 +60,6 @@
     </dependency>  
 
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-test-framework</artifactId>
-      <version>${pom.version}</version>
-    </dependency>  
-
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-jdbm-partition</artifactId>
-      <version>${pom.version}</version>
-      <scope>test</scope>
-    </dependency>  
-
-    <dependency>
       <groupId>ldapsdk</groupId>
       <artifactId>ldapsdk</artifactId>
     </dependency>  

Modified: directory/apacheds/trunk/server-jndi/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-jndi/pom.xml?rev=897580&r1=897579&r2=897580&view=diff
==============================================================================
--- directory/apacheds/trunk/server-jndi/pom.xml (original)
+++ directory/apacheds/trunk/server-jndi/pom.xml Sun Jan 10 00:03:43 2010
@@ -38,50 +38,11 @@
   <packaging>jar</packaging>  
 
   <dependencies>
-<!--
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-protocol-changepw</artifactId>
-      <version>${pom.version}</version>
-    </dependency>  
--->
-
-<!--
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-protocol-ntp</artifactId>
-      <version>${pom.version}</version>
-    </dependency>  
--->
-
-<!--
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-protocol-kerberos</artifactId>
-      <version>${pom.version}</version>
-    </dependency>  
--->
-
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-protocol-ldap</artifactId>
       <version>${pom.version}</version>
     </dependency>  
-
-<!--
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-protocol-dns</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
--->
-
-    <!-- TODO remove dependency on JNDI core -->
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-core-jndi</artifactId>
-      <version>${pom.version}</version>
-    </dependency>  
   </dependencies>
 
   <build>

Modified: directory/apacheds/trunk/server-tools/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-tools/pom.xml?rev=897580&r1=897579&r2=897580&view=diff
==============================================================================
--- directory/apacheds/trunk/server-tools/pom.xml (original)
+++ directory/apacheds/trunk/server-tools/pom.xml Sun Jan 10 00:03:43 2010
@@ -96,12 +96,6 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <version>${org.apache.directory.shared.version}</version>
-      <artifactId>shared-cursor</artifactId>
-    </dependency>
-
-    <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
     </dependency>
@@ -110,18 +104,6 @@
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
     </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-schema</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>
   </dependencies>
 
   <build>

Modified: directory/apacheds/trunk/test-framework/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/test-framework/pom.xml?rev=897580&r1=897579&r2=897580&view=diff
==============================================================================
--- directory/apacheds/trunk/test-framework/pom.xml (original)
+++ directory/apacheds/trunk/test-framework/pom.xml Sun Jan 10 00:03:43 2010
@@ -7,7 +7,7 @@
     <version>1.5.6-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-test-framework</artifactId>
-  <name>ApacheDS test framework</name>
+  <name>ApacheDS Test Framework</name>
   <packaging>jar</packaging>
   
   <description>
@@ -28,44 +28,8 @@
 
     <dependency>
       <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-core-jndi</artifactId>
-      <version>${pom.version}</version>
-    </dependency>  
-
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-core-annotations</artifactId>
-      <version>${pom.version}</version>
-    </dependency>  
-
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-server-annotations</artifactId>
       <version>${pom.version}</version>
     </dependency>  
-
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-jdbm-partition</artifactId>
-      <version>${pom.version}</version>
-    </dependency>  
-
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-avl-partition</artifactId>
-      <version>${pom.version}</version>
-    </dependency>  
-
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-ldif-partition</artifactId>
-      <version>${pom.version}</version>
-    </dependency>  
-
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-protocol-shared</artifactId>
-      <version>${pom.version}</version>
-    </dependency>  
   </dependencies>
 </project>

Modified: directory/apacheds/trunk/xdbm-base/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/pom.xml?rev=897580&r1=897579&r2=897580&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/pom.xml (original)
+++ directory/apacheds/trunk/xdbm-base/pom.xml Sun Jan 10 00:03:43 2010
@@ -36,12 +36,6 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <version>${org.apache.directory.shared.version}</version>
-      <artifactId>shared-cursor</artifactId>
-    </dependency>
-
-    <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>apacheds-core-api</artifactId>
       <version>${pom.version}</version>

Modified: directory/apacheds/trunk/xdbm-search/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/pom.xml?rev=897580&r1=897579&r2=897580&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/pom.xml (original)
+++ directory/apacheds/trunk/xdbm-search/pom.xml Sun Jan 10 00:03:43 2010
@@ -36,12 +36,6 @@
       <artifactId>apacheds-xdbm-base</artifactId>
       <version>${pom.version}</version>
     </dependency>
-
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>1.4</version>
-    </dependency>
     
     <dependency>
       <groupId>org.apache.directory.server</groupId>
@@ -56,20 +50,6 @@
       <version>${pom.version}</version>
       <scope>test</scope>
     </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-schema</artifactId>
-      <version>${org.apache.directory.shared.version}</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-schema-manager</artifactId>
-      <version>${org.apache.directory.shared.version}</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <packaging>jar</packaging>

Modified: directory/apacheds/trunk/xdbm-tools/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-tools/pom.xml?rev=897580&r1=897579&r2=897580&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-tools/pom.xml (original)
+++ directory/apacheds/trunk/xdbm-tools/pom.xml Sun Jan 10 00:03:43 2010
@@ -41,12 +41,6 @@
       <artifactId>apacheds-xdbm-base</artifactId>
       <version>${pom.version}</version>
     </dependency>
-    
-      <dependency>
-        <groupId>org.apache.directory.shared</groupId>
-        <version>${org.apache.directory.shared.version}</version>
-        <artifactId>shared-cursor</artifactId>
-      </dependency>
   </dependencies>
 
   <packaging>jar</packaging>



Mime
View raw message