svn commit: r1089599 - in /axis/axis2/java/rampart/trunk: ./ modules/rampart-integration/src/test/java/ modules/rampart-integration/src/test/resources/

[ve...@apache.org]

Author: veithen
Date: Wed Apr  6 19:43:25 2011
New Revision: 1089599

URL: http://svn.apache.org/viewvc?rev=1089599&view=rev
Log:
Attempt to get out of the SLF4J dependency hell and to make logging in the integration tests predictable. There is really no sense in having commons-logging, jcl-over-slf4j, log4j-over-slf4j, log4j and slf4j-jdk14 in the class path at the same time and then to configure commons-logging.properties to use SimpleLog. rampart-integration is now set up so that commons-logging and SLF4J both send logs to log4j.

Added:
    axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/log4j.properties
Removed:
    axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/java/commons-logging.properties
    axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/commons-logging.properties
Modified:
    axis/axis2/java/rampart/trunk/pom.xml

Added: axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/log4j.properties?rev=1089599&view=auto
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/log4j.properties (added)
+++ axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/log4j.properties Wed Apr  6 19:43:25 2011
@@ -0,0 +1,25 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+log4j.rootCategory=INFO, CONSOLE
+
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%d %-5p %c - %m%n
+

Modified: axis/axis2/java/rampart/trunk/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/pom.xml?rev=1089599&r1=1089598&r2=1089599&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/pom.xml Wed Apr  6 19:43:25 2011
@@ -242,11 +242,17 @@
             <groupId>org.opensaml</groupId>
             <artifactId>opensaml</artifactId>
             <version>2.2.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-jdk14</artifactId>
-            <version>1.5.2</version>
+            <exclusions>
+                <!-- Don't allow OpenSAML to impose a particular logging implementation -->
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>jcl-over-slf4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>log4j-over-slf4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
@@ -255,6 +261,12 @@
         </dependency>
 
         <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.5.5</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
             <version>${log4j.version}</version>