[MRM-1219] correct log4j configuration, consolidate logging APIs

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@794572 13f79535-47bb-0310-9956-ffa450edef68

8 files changed, 54 insertions, 51 deletions

diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml
index 52aabde3a..78721811c 100644
--- a/archiva-cli/pom.xml
+++ b/archiva-cli/pom.xml
@@ -61,7 +61,7 @@
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>jcl104-over-slf4j</artifactId>
+      <artifactId>jcl-over-slf4j</artifactId>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/archiva-modules/archiva-base/archiva-model/pom.xml b/archiva-modules/archiva-base/archiva-model/pom.xml
index c59fcf4a9..d3e59efb5 100755
--- a/archiva-modules/archiva-base/archiva-model/pom.xml
+++ b/archiva-modules/archiva-base/archiva-model/pom.xml
@@ -36,7 +36,7 @@
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>jcl104-over-slf4j</artifactId>
+      <artifactId>jcl-over-slf4j</artifactId>
       <scope>runtime</scope>
     </dependency>
   </dependencies>
@@ -175,4 +175,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/archiva-modules/archiva-base/archiva-policies/pom.xml b/archiva-modules/archiva-base/archiva-policies/pom.xml
index d015e9788..da6a18c2a 100644
--- a/archiva-modules/archiva-base/archiva-policies/pom.xml
+++ b/archiva-modules/archiva-base/archiva-policies/pom.xml
@@ -56,7 +56,7 @@
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>jcl104-over-slf4j</artifactId>
+      <artifactId>jcl-over-slf4j</artifactId>
       <scope>runtime</scope>
     </dependency>
   </dependencies>
diff --git a/archiva-modules/archiva-base/archiva-transaction/pom.xml b/archiva-modules/archiva-base/archiva-transaction/pom.xml
index fa8bb9e1c..96722daac 100644
--- a/archiva-modules/archiva-base/archiva-transaction/pom.xml
+++ b/archiva-modules/archiva-base/archiva-transaction/pom.xml
@@ -56,7 +56,7 @@
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>jcl104-over-slf4j</artifactId>
+      <artifactId>jcl-over-slf4j</artifactId>
       <scope>runtime</scope>
     </dependency>
   </dependencies>
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index af049d723..71a0bff85 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -242,6 +242,8 @@
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging-api</artifactId>
       <version>1.1</version>
+      <!-- provided by jcl-over-slf4j, don't want this in the webapp -->
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.atlassian.xmlrpc</groupId>
@@ -325,7 +327,7 @@
                Specifically setting this to false to avoid accidental jar file creation. -->
           <archiveClasses>false</archiveClasses>
           <dependentWarExcludes>META-INF/**,WEB-INF/web.xml,WEB-INF/classes/xwork.xml,WEB-INF/lib/**</dependentWarExcludes>
-          <warSourceExcludes>WEB-INF/lib/xalan-*.jar,WEB-INF/lib/velocity-dep-*.jar,WEB-INF/lib/xml-apis-*.jar,WEB-INF/lib/wstx-asl-*.jar,WEB-INF/lib/stax-utils-*.jar,WEB-INF/lib/xercesImpl-*.jar,WEB-INF/lib/slf4j-api-1.5.6.jar,WEB-INF/lib/slf4j-log4j12-1.5.6.jar</warSourceExcludes>
+          <warSourceExcludes>WEB-INF/lib/xalan-*.jar,WEB-INF/lib/velocity-dep-*.jar,WEB-INF/lib/xml-apis-*.jar,WEB-INF/lib/wstx-asl-*.jar,WEB-INF/lib/stax-utils-*.jar,WEB-INF/lib/xercesImpl-*.jar</warSourceExcludes>
         </configuration>
         <!-- TODO: would be good to make the jetty plugin aware of these and remove the below -->
         <executions>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml
index b759c40bf..cc0aa6a40 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml
@@ -35,114 +35,97 @@
     <appender-ref ref="redbackAuditLog" />
   </logger>
 
+  <logger name="org.apache.archiva.AuditLog" additivity="false">
+    <level value="info" />
+    <appender-ref ref="auditlog" />
+  </logger>
+  
+<!-- INFO level loggers can use the default
  <logger name="org.apache.archiva.consumers">
     <level value="info"/>
-    <appender-ref ref="rolling" />
   </logger>
   
   <logger name="org.apache.archiva">
     <level value="info"/>
-    <appender-ref ref="rolling" />
   </logger>
   
   <logger name="org.apache.maven.archiva">
     <level value="info"/>
-    <appender-ref ref="rolling" />
-  </logger>
-  
-  <logger name="org.apache.archiva.AuditLog" additivity="false">
-    <level value="info" />
-    <appender-ref ref="auditlog" />
   </logger>
   
   <logger name="org.codehaus.redback">
     <level value="info"/>
-    <appender-ref ref="rolling" />
   </logger>
 
   <logger name="org.codehaus.plexus.redback">
     <level value="info"/>
-    <appender-ref ref="rolling" />
-  </logger>
-
-  <!-- squelch noisy objects (for now) -->
-  <logger name="org.apache.commons">
-    <level value="warn"/>
-    <appender-ref ref="rolling" />
-  </logger>
-
-  <logger name="net.sf.ehcache">
-    <level value="warn"/>
-    <appender-ref ref="rolling" />
   </logger>
 
   <logger name="org.codehaus.plexus.mailsender.MailSender">
     <level value="info"/>
-    <appender-ref ref="rolling" />
-  </logger>
-
-  <logger name="org.codehaus.plexus.velocity">
-    <level value="error"/>
-    <appender-ref ref="rolling" />
   </logger>
 
   <logger name="org.quartz">
     <level value="info"/>
-    <appender-ref ref="rolling" />
   </logger>
 
   <logger name="org.apache.jasper">
     <level value="info"/>
-    <appender-ref ref="rolling" />
   </logger>
 
   <logger name="com.opensymphony.xwork2">
     <level value="info"/>
-    <appender-ref ref="rolling" />
   </logger>
 
   <logger name="org.apache.struts2">
     <level value="info"/>
-    <appender-ref ref="rolling" />
   </logger>
 
   <logger name="org.codehaus.plexus.PlexusContainer">
     <level value="info"/>
-    <appender-ref ref="rolling" />
+  </logger>
+-->
+
+  <!-- squelch noisy objects (for now) -->
+  <logger name="org.apache.commons">
+    <level value="warn"/>
+  </logger>
+
+  <logger name="net.sf.ehcache">
+    <level value="warn"/>
+  </logger>
+
+  <logger name="org.codehaus.plexus.velocity">
+    <level value="error"/>
   </logger>
 
   <logger name="JPOX">
     <level value="warn"/>
-    <appender-ref ref="rolling" />
   </logger>
 
   <logger name="JPOX.MetaData">
     <level value="error"/>
-    <appender-ref ref="rolling" />
   </logger>
 
   <logger name="JPOX.RDBMS.SQL">
     <level value="error"/>
-    <appender-ref ref="rolling" />
   </logger>
 
   <logger name="SQL">
     <level value="error"/>
-    <appender-ref ref="rolling" />
   </logger>
 
   <logger name="freemarker">
     <level value="warn"/>
-    <appender-ref ref="rolling" />
   </logger>
 
   <logger name="org.codehaus.plexus.component.manager.ClassicSingletonComponentManager">
     <level value="error"/>
-    <appender-ref ref="rolling" />
   </logger>
 
   <root>
     <priority value ="info" />
+    <appender-ref ref="rolling" />
   </root>
 
 </log4j:configuration>
diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml
index 1a0b4c48d..b7c33027e 100644
--- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml
+++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml
@@ -42,7 +42,7 @@
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>jcl104-over-slf4j</artifactId>
+      <artifactId>jcl-over-slf4j</artifactId>
       <!-- Exec plugin doesn't use runtime scope - odd -->
       <scope>compile</scope> 
     </dependency>
diff --git a/pom.xml b/pom.xml
index 52ab923d1..b17e49896 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,6 +77,7 @@
                     <exclude>org.codehaus.plexus:plexus-container-default</exclude>
                     <exclude>org.codehaus.plexus:plexus-log4j-logging</exclude>
                     <exclude>commons-logging:commons-logging</exclude>
+                    <exclude>org.slf4j:jcl104-over-slf4j</exclude>
                     <exclude>velocity:velocity-dep</exclude>
                     <exclude>classworlds:classworlds</exclude>
                     <exclude>javax.transaction:jta</exclude>
@@ -84,6 +85,7 @@
                     <exclude>ant:ant-optional</exclude>
                     <exclude>xom:xom</exclude>
                     <exclude>org.codehaus.plexus:plexus-xwork-integration</exclude>
+                    <exclude>plexus:plexus-utils</exclude>
                   </excludes>
                 </bannedDependencies>
               </rules>
@@ -815,6 +817,10 @@
             <artifactId>classworlds</artifactId>
           </exclusion>
           <exclusion>
+            <groupId>plexus</groupId>
+            <artifactId>plexus-utils</artifactId>
+          </exclusion>
+          <exclusion>
             <groupId>velocity</groupId>
             <artifactId>velocity-dep</artifactId>
           </exclusion>
@@ -862,6 +868,11 @@
         </exclusions>
       </dependency>
       <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging-api</artifactId>
+        <version>1.1</version>
+      </dependency>
+      <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>servlet-api</artifactId>
         <version>2.4</version>
@@ -873,25 +884,31 @@
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
-        <artifactId>jcl104-over-slf4j</artifactId>
-        <version>1.5.0</version>
+        <artifactId>slf4j-api</artifactId>
+        <version>${slf4j.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>jcl-over-slf4j</artifactId>
+        <version>${slf4j.version}</version>
         <scope>runtime</scope>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <version>1.5.0</version>
+        <artifactId>slf4j-jdk14</artifactId>
+        <version>${slf4j.version}</version>
+        <scope>runtime</scope>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-simple</artifactId>
-        <version>1.5.0</version>
+        <version>${slf4j.version}</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-log4j12</artifactId>
-        <version>1.5.0</version>
+        <version>${slf4j.version}</version>
         <scope>runtime</scope>
       </dependency>
       <dependency>
@@ -1084,6 +1101,7 @@
     <wagon.version>1.0-beta-5</wagon.version>
     <redback.version>1.2.1</redback.version>
     <jetty.version>6.1.19</jetty.version>
+    <slf4j.version>1.5.8</slf4j.version>
     <binder.version>0.9</binder.version>
     <spring.version>2.5.6</spring.version>
   </properties>