directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r569158 - in /directory/apacheds/trunk: ./ bootstrap-partition/ bootstrap-plugin/ mitosis/ protocol-changepw/ protocol-dhcp/ protocol-dns/ protocol-kerberos/ protocol-shared/ schema-bootstrap/ schema-extras/ schema-registries/ server-jndi/ ...
Date Thu, 23 Aug 2007 21:49:25 GMT
Author: djencks
Date: Thu Aug 23 14:49:23 2007
New Revision: 569158

URL: http://svn.apache.org/viewvc?rev=569158&view=rev
Log:
DIRSERVER-1028 use slf4j-log4j12 not nlog4j

Modified:
    directory/apacheds/trunk/bootstrap-partition/pom.xml
    directory/apacheds/trunk/bootstrap-plugin/pom.xml
    directory/apacheds/trunk/mitosis/pom.xml
    directory/apacheds/trunk/pom.xml
    directory/apacheds/trunk/protocol-changepw/pom.xml
    directory/apacheds/trunk/protocol-dhcp/pom.xml
    directory/apacheds/trunk/protocol-dns/pom.xml
    directory/apacheds/trunk/protocol-kerberos/pom.xml
    directory/apacheds/trunk/protocol-shared/pom.xml
    directory/apacheds/trunk/schema-bootstrap/pom.xml
    directory/apacheds/trunk/schema-extras/pom.xml
    directory/apacheds/trunk/schema-registries/pom.xml
    directory/apacheds/trunk/server-jndi/pom.xml
    directory/apacheds/trunk/server-main/pom.xml
    directory/apacheds/trunk/server-unit/pom.xml

Modified: directory/apacheds/trunk/bootstrap-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/bootstrap-partition/pom.xml?rev=569158&r1=569157&r2=569158&view=diff
==============================================================================
--- directory/apacheds/trunk/bootstrap-partition/pom.xml (original)
+++ directory/apacheds/trunk/bootstrap-partition/pom.xml Thu Aug 23 14:49:23 2007
@@ -26,12 +26,6 @@
     </dependency>
 
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-jdbm-store</artifactId>
       <version>${pom.version}</version>

Modified: directory/apacheds/trunk/bootstrap-plugin/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/bootstrap-plugin/pom.xml?rev=569158&r1=569157&r2=569158&view=diff
==============================================================================
--- directory/apacheds/trunk/bootstrap-plugin/pom.xml (original)
+++ directory/apacheds/trunk/bootstrap-plugin/pom.xml Thu Aug 23 14:49:23 2007
@@ -28,9 +28,10 @@
       <artifactId>maven-project</artifactId>
     </dependency>
 
+    <!-- plugin needs a logging implementation -->
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
+      <artifactId>slf4j-log4j12</artifactId>
     </dependency>
 
     <dependency>

Modified: directory/apacheds/trunk/mitosis/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/mitosis/pom.xml?rev=569158&r1=569157&r2=569158&view=diff
==============================================================================
--- directory/apacheds/trunk/mitosis/pom.xml (original)
+++ directory/apacheds/trunk/mitosis/pom.xml Thu Aug 23 14:49:23 2007
@@ -82,11 +82,6 @@
     </dependency>
 
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-    </dependency>
-
-    <dependency>
       <groupId>quartz</groupId>
       <artifactId>quartz</artifactId>
     </dependency>

Modified: directory/apacheds/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/pom.xml?rev=569158&r1=569157&r2=569158&view=diff
==============================================================================
--- directory/apacheds/trunk/pom.xml (original)
+++ directory/apacheds/trunk/pom.xml Thu Aug 23 14:49:23 2007
@@ -50,6 +50,12 @@
 
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
+        <artifactId>shared-ldap</artifactId>
+        <version>0.9.7-SNAPSHOT</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.directory.shared</groupId>
         <artifactId>shared-ldap-constants</artifactId>
         <version>0.9.7-SNAPSHOT</version>
       </dependency>
@@ -114,23 +120,23 @@
         <version>1.3</version>
       </dependency>
 
-        <dependency>
-          <groupId>org.slf4j</groupId>
-          <artifactId>jcl104-over-slf4j</artifactId>
-          <version>1.4.0</version>
-        </dependency>
-
-        <dependency>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-          <version>1.4.0</version>
-        </dependency>
-
-        <dependency>
-          <groupId>org.slf4j</groupId>
-          <artifactId>nlog4j</artifactId>
-          <version>1.2.25</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>slf4j-log4j12</artifactId>
+        <version>1.4.3</version>
+      </dependency>
 
       <dependency>
         <groupId>jdbm</groupId>
@@ -234,9 +240,9 @@
     <system>JIRA</system>
     <url>http://issues.apache.org/jira/browse/DIRSERVER</url>
   </issueManagement>
-  
+
   <inceptionYear>2003</inceptionYear>
-  
+
   <mailingLists>
     <mailingList>
       <name>The Directory Developers List</name>
@@ -257,33 +263,31 @@
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldap</artifactId>
-      <version>0.9.7-SNAPSHOT</version>
     </dependency>
 
+    <!-- apacheds standard logging interface -->
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.4.0</version>
     </dependency>
 
+    <!-- not sure what this is used for -->
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl104-over-slf4j</artifactId>
-      <version>1.4.0</version>
       <scope>test</scope>
     </dependency>
 
+    <!-- standard logging implementation for tests -->
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-      <version>1.2.25</version>
+      <artifactId>slf4j-log4j12</artifactId>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -395,7 +399,7 @@
       <url>http://directory.apache.org/community/who/wesmckean.html</url>
     </developer>
   </developers>
-  
+
   <contributors>
     <contributor>
       <name>Nick Faiz</name>
@@ -432,7 +436,7 @@
             <argLine>-Xmx1024m</argLine>
           </configuration>
         </plugin>
-        
+
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
@@ -457,11 +461,11 @@
           <artifactId>maven-antlr-plugin</artifactId>
           <version>2.0-beta-1</version>
           <executions>
-             <execution>
-                <goals>
-                   <goal>generate</goal>
-                </goals>
-             </execution>
+            <execution>
+              <goals>
+                <goal>generate</goal>
+              </goals>
+            </execution>
           </executions>
         </plugin>
 
@@ -516,7 +520,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
       </plugin>
-     
+
       <!-- remove when project version 8 is released -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

Modified: directory/apacheds/trunk/protocol-changepw/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-changepw/pom.xml?rev=569158&r1=569157&r2=569158&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-changepw/pom.xml (original)
+++ directory/apacheds/trunk/protocol-changepw/pom.xml Thu Aug 23 14:49:23 2007
@@ -16,14 +16,6 @@
   <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/trunk/protocol-dhcp/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dhcp/pom.xml?rev=569158&r1=569157&r2=569158&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dhcp/pom.xml (original)
+++ directory/apacheds/trunk/protocol-dhcp/pom.xml Thu Aug 23 14:49:23 2007
@@ -17,20 +17,6 @@
 
   <dependencies>
     <dependency>
-      <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>
       <artifactId>mina-core</artifactId>
     </dependency>

Modified: directory/apacheds/trunk/protocol-dns/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dns/pom.xml?rev=569158&r1=569157&r2=569158&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dns/pom.xml (original)
+++ directory/apacheds/trunk/protocol-dns/pom.xml Thu Aug 23 14:49:23 2007
@@ -16,13 +16,6 @@
   <packaging>jar</packaging>  
 
   <dependencies>
-<!--
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-      <scope>provided</scope>
-    </dependency>
--->
 
     <dependency>
       <groupId>org.apache.mina</groupId>

Modified: directory/apacheds/trunk/protocol-kerberos/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-kerberos/pom.xml?rev=569158&r1=569157&r2=569158&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-kerberos/pom.xml (original)
+++ directory/apacheds/trunk/protocol-kerberos/pom.xml Thu Aug 23 14:49:23 2007
@@ -16,14 +16,6 @@
   <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/trunk/protocol-shared/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-shared/pom.xml?rev=569158&r1=569157&r2=569158&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-shared/pom.xml (original)
+++ directory/apacheds/trunk/protocol-shared/pom.xml Thu Aug 23 14:49:23 2007
@@ -16,14 +16,4 @@
   <name>ApacheDS Protocol Shared</name>
   <packaging>jar</packaging>
 
-<!--
-  <dependencies>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
--->
-
 </project>

Modified: directory/apacheds/trunk/schema-bootstrap/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/schema-bootstrap/pom.xml?rev=569158&r1=569157&r2=569158&view=diff
==============================================================================
--- directory/apacheds/trunk/schema-bootstrap/pom.xml (original)
+++ directory/apacheds/trunk/schema-bootstrap/pom.xml Thu Aug 23 14:49:23 2007
@@ -35,14 +35,6 @@
       <version>${pom.version}</version>
     </dependency>
 
-<!--
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-      <scope>provided</scope>
-    </dependency>
--->
-
     <dependency>
       <groupId>jdbm</groupId>
       <artifactId>jdbm</artifactId>

Modified: directory/apacheds/trunk/schema-extras/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/schema-extras/pom.xml?rev=569158&r1=569157&r2=569158&view=diff
==============================================================================
--- directory/apacheds/trunk/schema-extras/pom.xml (original)
+++ directory/apacheds/trunk/schema-extras/pom.xml Thu Aug 23 14:49:23 2007
@@ -15,14 +15,6 @@
   </description>
 
   <dependencies>
-<!--
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-      <scope>provided</scope>
-    </dependency>
--->
-
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-schema-registries</artifactId>

Modified: directory/apacheds/trunk/schema-registries/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/schema-registries/pom.xml?rev=569158&r1=569157&r2=569158&view=diff
==============================================================================
--- directory/apacheds/trunk/schema-registries/pom.xml (original)
+++ directory/apacheds/trunk/schema-registries/pom.xml Thu Aug 23 14:49:23 2007
@@ -16,14 +16,6 @@
   <packaging>jar</packaging>
 
   <dependencies>
-<!--
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-      <scope>provided</scope>
-    </dependency>
--->
-
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>apacheds-core-shared</artifactId>

Modified: directory/apacheds/trunk/server-jndi/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-jndi/pom.xml?rev=569158&r1=569157&r2=569158&view=diff
==============================================================================
--- directory/apacheds/trunk/server-jndi/pom.xml (original)
+++ directory/apacheds/trunk/server-jndi/pom.xml Thu Aug 23 14:49:23 2007
@@ -18,21 +18,6 @@
   <packaging>jar</packaging>  
 
   <dependencies>
-<!--
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-      <scope>provided</scope>
-    </dependency>  
--->
-
-    <!--dependency>
-      <groupId>backport-util-concurrent</groupId>
-      <artifactId>backport-util-concurrent</artifactId>
-      <version>2.2</version>
-      <scope>compile</scope>
-    </dependency-->
-
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-protocol-changepw</artifactId>

Modified: directory/apacheds/trunk/server-main/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-main/pom.xml?rev=569158&r1=569157&r2=569158&view=diff
==============================================================================
--- directory/apacheds/trunk/server-main/pom.xml (original)
+++ directory/apacheds/trunk/server-main/pom.xml Thu Aug 23 14:49:23 2007
@@ -35,10 +35,12 @@
       <artifactId>jcl104-over-slf4j</artifactId>
     </dependency>
 
+<!--
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
+      <artifactId>slf4j-log4j12</artifactId>
     </dependency>
+-->
 
     <dependency>
       <groupId>org.springframework</groupId>

Modified: directory/apacheds/trunk/server-unit/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-unit/pom.xml?rev=569158&r1=569157&r2=569158&view=diff
==============================================================================
--- directory/apacheds/trunk/server-unit/pom.xml (original)
+++ directory/apacheds/trunk/server-unit/pom.xml Thu Aug 23 14:49:23 2007
@@ -19,15 +19,7 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>provided</scope>
-    </dependency>  
-
-<!--
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-      <scope>provided</scope>
-    </dependency>  
--->
+    </dependency>
 
     <dependency>
       <groupId>ldapsdk</groupId>
@@ -52,7 +44,8 @@
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core-unit</artifactId>
       <version>${pom.version}</version>
-    </dependency>  
+    </dependency>
+    
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-bootstrap-partition</artifactId>



Mime
View raw message