directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ccust...@apache.org
Subject svn commit: r559607 - in /directory/apacheds/branches/1.0: ./ benchmarks/ core-plugin/ core-shared/ core-unit/ core/ kerberos-shared/ protocol-changepw/ protocol-dhcp/ protocol-dns/ protocol-kerberos/ protocol-ldap/ protocol-ntp/ protocol-shared/ sar-p...
Date Wed, 25 Jul 2007 21:10:30 GMT
Author: ccustine
Date: Wed Jul 25 14:10:28 2007
New Revision: 559607

URL: http://svn.apache.org/viewvc?view=rev&rev=559607
Log:
DIRSERVER-1008 - Cleaned up logging configurations to get rid of commons-logging and use more
centralized config in parent poms.

Also renamed parent poms to provide unique project IDs for maven generated IDE projects.

Modified:
    directory/apacheds/branches/1.0/benchmarks/pom.xml
    directory/apacheds/branches/1.0/core-plugin/pom.xml
    directory/apacheds/branches/1.0/core-shared/pom.xml
    directory/apacheds/branches/1.0/core-unit/pom.xml
    directory/apacheds/branches/1.0/core/pom.xml
    directory/apacheds/branches/1.0/kerberos-shared/pom.xml
    directory/apacheds/branches/1.0/pom.xml
    directory/apacheds/branches/1.0/protocol-changepw/pom.xml
    directory/apacheds/branches/1.0/protocol-dhcp/pom.xml
    directory/apacheds/branches/1.0/protocol-dns/pom.xml
    directory/apacheds/branches/1.0/protocol-kerberos/pom.xml
    directory/apacheds/branches/1.0/protocol-ldap/pom.xml
    directory/apacheds/branches/1.0/protocol-ntp/pom.xml
    directory/apacheds/branches/1.0/protocol-shared/pom.xml
    directory/apacheds/branches/1.0/sar-plugin/pom.xml
    directory/apacheds/branches/1.0/schema-archetype/pom.xml
    directory/apacheds/branches/1.0/schema-archetype/src/main/resources/archetype-resources/pom.xml
    directory/apacheds/branches/1.0/server-installers/pom.xml
    directory/apacheds/branches/1.0/server-jndi/pom.xml
    directory/apacheds/branches/1.0/server-main/apacheds.sh
    directory/apacheds/branches/1.0/server-main/pom.xml
    directory/apacheds/branches/1.0/server-main/src/main/assembly/apacheds-main.xml
    directory/apacheds/branches/1.0/server-sar/pom.xml
    directory/apacheds/branches/1.0/server-ssl/pom.xml
    directory/apacheds/branches/1.0/server-tools/pom.xml
    directory/apacheds/branches/1.0/server-tools/src/main/manifest/MANIFEST.MF
    directory/apacheds/branches/1.0/server-unit/pom.xml
    directory/apacheds/branches/1.0/testcase-archetype/pom.xml
    directory/apacheds/branches/1.0/testcase-archetype/src/main/resources/archetype-resources/pom.xml

Modified: directory/apacheds/branches/1.0/benchmarks/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/benchmarks/pom.xml?view=diff&rev=559607&r1=559606&r2=559607
==============================================================================
--- directory/apacheds/branches/1.0/benchmarks/pom.xml (original)
+++ directory/apacheds/branches/1.0/benchmarks/pom.xml Wed Jul 25 14:10:28 2007
@@ -3,8 +3,8 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
-    <version>1.0.2-SNAPSHOT</version>
+    <artifactId>apacheds-parent</artifactId>
+    <version>1.0.3-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-benchmarks</artifactId>
   <name>ApacheDS Benchmarks</name>
@@ -12,12 +12,5 @@
     Set of programs to run to benchmark the performance of the server.
   </description>
   <packaging>jar</packaging>
-  <dependencies>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-      <version>1.2.25</version>
-    </dependency>
-  </dependencies>
 </project>
 

Modified: directory/apacheds/branches/1.0/core-plugin/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core-plugin/pom.xml?view=diff&rev=559607&r1=559606&r2=559607
==============================================================================
--- directory/apacheds/branches/1.0/core-plugin/pom.xml (original)
+++ directory/apacheds/branches/1.0/core-plugin/pom.xml Wed Jul 25 14:10:28 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.0.3-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-core-plugin</artifactId>

Modified: directory/apacheds/branches/1.0/core-shared/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core-shared/pom.xml?view=diff&rev=559607&r1=559606&r2=559607
==============================================================================
--- directory/apacheds/branches/1.0/core-shared/pom.xml (original)
+++ directory/apacheds/branches/1.0/core-shared/pom.xml Wed Jul 25 14:10:28 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.0.3-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-core-shared</artifactId>

Modified: directory/apacheds/branches/1.0/core-unit/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core-unit/pom.xml?view=diff&rev=559607&r1=559606&r2=559607
==============================================================================
--- directory/apacheds/branches/1.0/core-unit/pom.xml (original)
+++ directory/apacheds/branches/1.0/core-unit/pom.xml Wed Jul 25 14:10:28 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.0.3-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-core-unit</artifactId>
@@ -13,12 +13,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
       <scope>provided</scope>
     </dependency>
 

Modified: directory/apacheds/branches/1.0/core/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core/pom.xml?view=diff&rev=559607&r1=559606&r2=559607
==============================================================================
--- directory/apacheds/branches/1.0/core/pom.xml (original)
+++ directory/apacheds/branches/1.0/core/pom.xml Wed Jul 25 14:10:28 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.0.3-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-core</artifactId>
@@ -19,11 +19,6 @@
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
       <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>jdbm</groupId>

Modified: directory/apacheds/branches/1.0/kerberos-shared/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/kerberos-shared/pom.xml?view=diff&rev=559607&r1=559606&r2=559607
==============================================================================
--- directory/apacheds/branches/1.0/kerberos-shared/pom.xml (original)
+++ directory/apacheds/branches/1.0/kerberos-shared/pom.xml Wed Jul 25 14:10:28 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.0.3-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-kerberos-shared</artifactId>

Modified: directory/apacheds/branches/1.0/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/pom.xml?view=diff&rev=559607&r1=559606&r2=559607
==============================================================================
--- directory/apacheds/branches/1.0/pom.xml (original)
+++ directory/apacheds/branches/1.0/pom.xml Wed Jul 25 14:10:28 2007
@@ -9,7 +9,7 @@
   </parent>
 
   <groupId>org.apache.directory.server</groupId>
-  <artifactId>build</artifactId>
+  <artifactId>apacheds-parent</artifactId>
   <version>1.0.3-SNAPSHOT</version>
   <name>ApacheDS</name>
   <packaging>pom</packaging>
@@ -81,16 +81,6 @@
         <version>1.0</version>
       </dependency>
       <dependency>
-        <groupId>commons-logging</groupId>
-        <artifactId>commons-logging</artifactId>
-        <version>1.0.4</version>
-      </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>nlog4j</artifactId>
-        <version>1.2.25</version>
-      </dependency>
-      <dependency>
         <groupId>jdbm</groupId>
         <artifactId>jdbm</artifactId>
         <version>1.0</version>
@@ -126,6 +116,25 @@
         <artifactId>spring-context</artifactId>
         <version>1.2.8</version>
       </dependency>
+
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>1.4.0</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>jcl104-over-slf4j</artifactId>
+        <version>1.4.0</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>nlog4j</artifactId>
+        <version>1.2.25</version>
+      </dependency>
+
     </dependencies>
   </dependencyManagement>
   
@@ -155,6 +164,27 @@
   </mailingLists>
 
   <dependencies>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.4.0</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl104-over-slf4j</artifactId>
+      <version>1.4.0</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>nlog4j</artifactId>
+      <version>1.2.25</version>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

Modified: directory/apacheds/branches/1.0/protocol-changepw/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/protocol-changepw/pom.xml?view=diff&rev=559607&r1=559606&r2=559607
==============================================================================
--- directory/apacheds/branches/1.0/protocol-changepw/pom.xml (original)
+++ directory/apacheds/branches/1.0/protocol-changepw/pom.xml Wed Jul 25 14:10:28 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.0.3-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-protocol-changepw</artifactId>
@@ -13,11 +13,6 @@
   </description>
   <packaging>jar</packaging>  
   <dependencies>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-kerberos-shared</artifactId>

Modified: directory/apacheds/branches/1.0/protocol-dhcp/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/protocol-dhcp/pom.xml?view=diff&rev=559607&r1=559606&r2=559607
==============================================================================
--- directory/apacheds/branches/1.0/protocol-dhcp/pom.xml (original)
+++ directory/apacheds/branches/1.0/protocol-dhcp/pom.xml Wed Jul 25 14:10:28 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.0.3-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-protocol-dhcp</artifactId>
@@ -17,11 +17,6 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.mina</groupId>

Modified: directory/apacheds/branches/1.0/protocol-dns/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/protocol-dns/pom.xml?view=diff&rev=559607&r1=559606&r2=559607
==============================================================================
--- directory/apacheds/branches/1.0/protocol-dns/pom.xml (original)
+++ directory/apacheds/branches/1.0/protocol-dns/pom.xml Wed Jul 25 14:10:28 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.0.3-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-protocol-dns</artifactId>
@@ -13,11 +13,6 @@
   </description>
   <packaging>jar</packaging>  
   <dependencies>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.mina</groupId>
       <artifactId>mina-core</artifactId>

Modified: directory/apacheds/branches/1.0/protocol-kerberos/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/protocol-kerberos/pom.xml?view=diff&rev=559607&r1=559606&r2=559607
==============================================================================
--- directory/apacheds/branches/1.0/protocol-kerberos/pom.xml (original)
+++ directory/apacheds/branches/1.0/protocol-kerberos/pom.xml Wed Jul 25 14:10:28 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.0.3-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-protocol-kerberos</artifactId>
@@ -13,11 +13,6 @@
   </description>
   <packaging>jar</packaging>  
   <dependencies>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-kerberos-shared</artifactId>

Modified: directory/apacheds/branches/1.0/protocol-ldap/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/protocol-ldap/pom.xml?view=diff&rev=559607&r1=559606&r2=559607
==============================================================================
--- directory/apacheds/branches/1.0/protocol-ldap/pom.xml (original)
+++ directory/apacheds/branches/1.0/protocol-ldap/pom.xml Wed Jul 25 14:10:28 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.0.3-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-protocol-ldap</artifactId>
@@ -13,11 +13,6 @@
   <name>ApacheDS Protocol Ldap</name>
   <packaging>jar</packaging>  
   <dependencies>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-asn1-codec</artifactId>

Modified: directory/apacheds/branches/1.0/protocol-ntp/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/protocol-ntp/pom.xml?view=diff&rev=559607&r1=559606&r2=559607
==============================================================================
--- directory/apacheds/branches/1.0/protocol-ntp/pom.xml (original)
+++ directory/apacheds/branches/1.0/protocol-ntp/pom.xml Wed Jul 25 14:10:28 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.0.3-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-protocol-ntp</artifactId>
@@ -13,11 +13,6 @@
   </description>
   <packaging>jar</packaging>  
   <dependencies>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.mina</groupId>
       <artifactId>mina-core</artifactId>

Modified: directory/apacheds/branches/1.0/protocol-shared/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/protocol-shared/pom.xml?view=diff&rev=559607&r1=559606&r2=559607
==============================================================================
--- directory/apacheds/branches/1.0/protocol-shared/pom.xml (original)
+++ directory/apacheds/branches/1.0/protocol-shared/pom.xml Wed Jul 25 14:10:28 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.0.3-SNAPSHOT</version>
   </parent>
   <groupId>org.apache.directory.server</groupId>
@@ -14,11 +14,6 @@
   <name>ApacheDS Protocol Shared</name>
   <packaging>jar</packaging>  
   <dependencies>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-      <scope>provided</scope>
-    </dependency>
 
     <!-- 
          protocol-common seems to have abstract test cases that need

Modified: directory/apacheds/branches/1.0/sar-plugin/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/sar-plugin/pom.xml?view=diff&rev=559607&r1=559606&r2=559607
==============================================================================
--- directory/apacheds/branches/1.0/sar-plugin/pom.xml (original)
+++ directory/apacheds/branches/1.0/sar-plugin/pom.xml Wed Jul 25 14:10:28 2007
@@ -1,7 +1,7 @@
 <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">
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.0.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: directory/apacheds/branches/1.0/schema-archetype/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/schema-archetype/pom.xml?view=diff&rev=559607&r1=559606&r2=559607
==============================================================================
--- directory/apacheds/branches/1.0/schema-archetype/pom.xml (original)
+++ directory/apacheds/branches/1.0/schema-archetype/pom.xml Wed Jul 25 14:10:28 2007
@@ -1,7 +1,7 @@
 <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">
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.0.3-SNAPSHOT</version>
   </parent>
 

Modified: directory/apacheds/branches/1.0/schema-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/schema-archetype/src/main/resources/archetype-resources/pom.xml?view=diff&rev=559607&r1=559606&r2=559607
==============================================================================
--- directory/apacheds/branches/1.0/schema-archetype/src/main/resources/archetype-resources/pom.xml
(original)
+++ directory/apacheds/branches/1.0/schema-archetype/src/main/resources/archetype-resources/pom.xml
Wed Jul 25 14:10:28 2007
@@ -26,12 +26,6 @@
       <version>3.8.1</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-      <version>1.2.25</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>

Modified: directory/apacheds/branches/1.0/server-installers/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/server-installers/pom.xml?view=diff&rev=559607&r1=559606&r2=559607
==============================================================================
--- directory/apacheds/branches/1.0/server-installers/pom.xml (original)
+++ directory/apacheds/branches/1.0/server-installers/pom.xml Wed Jul 25 14:10:28 2007
@@ -3,8 +3,8 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
-    <version>1.0.2</version>
+    <artifactId>apacheds-parent</artifactId>
+    <version>1.0.3-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-server-installers</artifactId>
   <name>ApacheDS Server Installers</name>
@@ -29,10 +29,6 @@
       <version>${pom.version}</version>
     </dependency>  
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-    </dependency>
-    <dependency>
       <groupId>commons-daemon</groupId>
       <artifactId>commons-daemon</artifactId>
     </dependency>
@@ -53,13 +49,17 @@
       <artifactId>spring-beans</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>nlog4j</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl104-over-slf4j</artifactId>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
@@ -73,6 +73,7 @@
             <exclude>org.apache.directory.server:apacheds-server-tools</exclude>
 
             <exclude>ant:ant</exclude>
+            <exclude>commons-logging:commons-logging</exclude>
             <exclude>checkstyle:checkstyle</exclude>
             <exclude>aopalliance:aopalliance</exclude>
             <exclude>xerces:xerces</exclude>

Modified: directory/apacheds/branches/1.0/server-jndi/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/server-jndi/pom.xml?view=diff&rev=559607&r1=559606&r2=559607
==============================================================================
--- directory/apacheds/branches/1.0/server-jndi/pom.xml (original)
+++ directory/apacheds/branches/1.0/server-jndi/pom.xml Wed Jul 25 14:10:28 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.0.3-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-server-jndi</artifactId>
@@ -15,11 +15,6 @@
   </description>
   <packaging>jar</packaging>  
   <dependencies>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-      <scope>provided</scope>
-    </dependency>  
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-protocol-changepw</artifactId>

Modified: directory/apacheds/branches/1.0/server-main/apacheds.sh
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/server-main/apacheds.sh?view=diff&rev=559607&r1=559606&r2=559607
==============================================================================
--- directory/apacheds/branches/1.0/server-main/apacheds.sh (original)
+++ directory/apacheds/branches/1.0/server-main/apacheds.sh Wed Jul 25 14:10:28 2007
@@ -1,9 +1,9 @@
 #!/bin/sh
-if [ -e target/apacheds-server-main-1.0.2-app.jar ] ; then
+if [ -e target/apacheds-server-main-1.0.3-app.jar ] ; then
   echo uber jar exists
 else
   echo uber jar not found need to build it
   mvn clean assembly:assembly
 fi
 
-java -Dlog4j.configuration=file://$(pwd)/log4j.properties -jar target/apacheds-server-main-1.0.2-app.jar
server.xml
+java -Dlog4j.configuration=file://$(pwd)/log4j.properties -jar target/apacheds-server-main-1.0.3-SNAPSHOT-app.jar
server.xml

Modified: directory/apacheds/branches/1.0/server-main/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/server-main/pom.xml?view=diff&rev=559607&r1=559606&r2=559607
==============================================================================
--- directory/apacheds/branches/1.0/server-main/pom.xml (original)
+++ directory/apacheds/branches/1.0/server-main/pom.xml Wed Jul 25 14:10:28 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.0.3-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-server-main</artifactId>
@@ -20,10 +20,6 @@
       <artifactId>daemon-bootstrappers</artifactId>
     </dependency>  
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
     </dependency>
@@ -32,12 +28,16 @@
       <artifactId>spring-beans</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>nlog4j</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl104-over-slf4j</artifactId>
     </dependency>
   </dependencies>
   <build>

Modified: directory/apacheds/branches/1.0/server-main/src/main/assembly/apacheds-main.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/server-main/src/main/assembly/apacheds-main.xml?view=diff&rev=559607&r1=559606&r2=559607
==============================================================================
--- directory/apacheds/branches/1.0/server-main/src/main/assembly/apacheds-main.xml (original)
+++ directory/apacheds/branches/1.0/server-main/src/main/assembly/apacheds-main.xml Wed Jul
25 14:10:28 2007
@@ -16,6 +16,8 @@
       <unpack>true</unpack>
       <scope>runtime</scope>
       <excludes>
+        <exclude>commons-logging:commons-logging</exclude>
+        <exclude>log4j:log4j</exclude>
         <exclude>aopalliance:aopalliance</exclude>
         <exclude>jasperreports:jasperreports</exclude>
         <exclude>freemarker:freemarker</exclude>

Modified: directory/apacheds/branches/1.0/server-sar/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/server-sar/pom.xml?view=diff&rev=559607&r1=559606&r2=559607
==============================================================================
--- directory/apacheds/branches/1.0/server-sar/pom.xml (original)
+++ directory/apacheds/branches/1.0/server-sar/pom.xml Wed Jul 25 14:10:28 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.0.3-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-server-sar</artifactId>
@@ -28,20 +28,12 @@
       <version>3.2.3</version>
     </dependency>
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>

Modified: directory/apacheds/branches/1.0/server-ssl/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/server-ssl/pom.xml?view=diff&rev=559607&r1=559606&r2=559607
==============================================================================
--- directory/apacheds/branches/1.0/server-ssl/pom.xml (original)
+++ directory/apacheds/branches/1.0/server-ssl/pom.xml Wed Jul 25 14:10:28 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.0.3-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-server-ssl</artifactId>
@@ -13,11 +13,6 @@
   </description>
   <packaging>jar</packaging>  
   <dependencies>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-      <scope>provided</scope>
-    </dependency>  
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-server-jndi</artifactId>

Modified: directory/apacheds/branches/1.0/server-tools/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/server-tools/pom.xml?view=diff&rev=559607&r1=559606&r2=559607
==============================================================================
--- directory/apacheds/branches/1.0/server-tools/pom.xml (original)
+++ directory/apacheds/branches/1.0/server-tools/pom.xml Wed Jul 25 14:10:28 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.0.3-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-server-tools</artifactId>

Modified: directory/apacheds/branches/1.0/server-tools/src/main/manifest/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/server-tools/src/main/manifest/MANIFEST.MF?view=diff&rev=559607&r1=559606&r2=559607
==============================================================================
--- directory/apacheds/branches/1.0/server-tools/src/main/manifest/MANIFEST.MF (original)
+++ directory/apacheds/branches/1.0/server-tools/src/main/manifest/MANIFEST.MF Wed Jul 25
14:10:28 2007
@@ -19,9 +19,10 @@
  ../lib/mina-filter-ssl-1.0.3.jar 
  ../lib/commons-collections-3.2.jar 
  ../lib/commons-lang-2.1.jar 
- ../lib/commons-logging-1.0.4.jar 
- ../lib/commons-cli-1.0.jar 
- ../lib/jdbm-1.0.jar 
+ ../lib/commons-cli-1.0.jar
+  ../lib/jcl104-over-slf4j-1.4.0.jar
+ ../lib/nlog4j-1.2.25.jar
+ ../lib/jdbm-1.0.jar
  ../lib/spring-beans-1.2.8.jar 
  ../lib/spring-context-1.2.8.jar 
  ../lib/spring-core-1.2.8.jar 

Modified: directory/apacheds/branches/1.0/server-unit/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/server-unit/pom.xml?view=diff&rev=559607&r1=559606&r2=559607
==============================================================================
--- directory/apacheds/branches/1.0/server-unit/pom.xml (original)
+++ directory/apacheds/branches/1.0/server-unit/pom.xml Wed Jul 25 14:10:28 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.0.3-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-server-unit</artifactId>
@@ -16,11 +16,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <scope>provided</scope>
-    </dependency>  
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
       <scope>provided</scope>
     </dependency>  
     <dependency>

Modified: directory/apacheds/branches/1.0/testcase-archetype/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/testcase-archetype/pom.xml?view=diff&rev=559607&r1=559606&r2=559607
==============================================================================
--- directory/apacheds/branches/1.0/testcase-archetype/pom.xml (original)
+++ directory/apacheds/branches/1.0/testcase-archetype/pom.xml Wed Jul 25 14:10:28 2007
@@ -1,7 +1,7 @@
 <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">
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.0.3-SNAPSHOT</version>
   </parent>
 

Modified: directory/apacheds/branches/1.0/testcase-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/testcase-archetype/src/main/resources/archetype-resources/pom.xml?view=diff&rev=559607&r1=559606&r2=559607
==============================================================================
--- directory/apacheds/branches/1.0/testcase-archetype/src/main/resources/archetype-resources/pom.xml
(original)
+++ directory/apacheds/branches/1.0/testcase-archetype/src/main/resources/archetype-resources/pom.xml
Wed Jul 25 14:10:28 2007
@@ -21,11 +21,5 @@
       <version>3.8.1</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-      <version>1.2.25</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 </project>



Mime
View raw message