You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2011/08/14 23:16:25 UTC
svn commit: r1157670 - in /axis/axis2/java/rampart/trunk:
modules/rampart-integration/pom.xml
modules/rampart-integration/src/test/resources/log4j.properties
modules/rampart-tests/pom.xml
modules/rampart-tests/test-resources/log4j.properties pom.xml
Author: veithen
Date: Sun Aug 14 21:16:00 2011
New Revision: 1157670
URL: http://svn.apache.org/viewvc?rev=1157670&view=rev
Log:
Set up log4j to make the unit tests less verbose.
Added:
axis/axis2/java/rampart/trunk/modules/rampart-tests/test-resources/log4j.properties
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/log4j.properties
axis/axis2/java/rampart/trunk/modules/rampart-tests/pom.xml
axis/axis2/java/rampart/trunk/pom.xml
Modified: axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml?rev=1157670&r1=1157669&r2=1157670&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml Sun Aug 14 21:16:00 2011
@@ -606,6 +606,14 @@
<version>${junit.version}</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
</dependencies>
<reporting>
Modified: 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=1157670&r1=1157669&r2=1157670&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/log4j.properties (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/log4j.properties Sun Aug 14 21:16:00 2011
@@ -17,7 +17,7 @@
# under the License.
#
-log4j.rootCategory=INFO, CONSOLE
+log4j.rootCategory=ERROR, CONSOLE
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
Modified: axis/axis2/java/rampart/trunk/modules/rampart-tests/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-tests/pom.xml?rev=1157670&r1=1157669&r2=1157670&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-tests/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-tests/pom.xml Sun Aug 14 21:16:00 2011
@@ -74,6 +74,14 @@
<artifactId>rampart-core</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
</dependencies>
<reporting>
Added: axis/axis2/java/rampart/trunk/modules/rampart-tests/test-resources/log4j.properties
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-tests/test-resources/log4j.properties?rev=1157670&view=auto
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-tests/test-resources/log4j.properties (added)
+++ axis/axis2/java/rampart/trunk/modules/rampart-tests/test-resources/log4j.properties Sun Aug 14 21:16:00 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=ERROR, 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=1157670&r1=1157669&r2=1157670&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/pom.xml Sun Aug 14 21:16:00 2011
@@ -251,45 +251,6 @@
<version>2.3</version>
</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>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.jms</groupId>
- <artifactId>jms</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jdmk</groupId>
- <artifactId>jmxtools</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jmx</groupId>
- <artifactId>jmxri</artifactId>
- </exclusion>
- <exclusion>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
<!-- Junit Dependency -->
<dependency>
<groupId>junit</groupId>
@@ -319,6 +280,43 @@
<artifactId>axiom-dom</artifactId>
<version>${axiom.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.5.5</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.15</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.jms</groupId>
+ <artifactId>jms</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jdmk</groupId>
+ <artifactId>jmxtools</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jmx</groupId>
+ <artifactId>jmxri</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -424,7 +422,6 @@
<bcprov.jdk15.version>140</bcprov.jdk15.version>
<junit.version>3.8.2</junit.version>
- <log4j.version>1.2.15</log4j.version>
<!-- distribution properties -->
<dist.dir>rampart-${project.version}</dist.dir>