You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by gi...@apache.org on 2012/03/29 20:54:53 UTC
svn commit: r1307049 - in /webservices/wss4j/branches/swssf: ./
cxf-integration/ cxf-integration/src/test/resources/ streaming-ws-policy/
streaming-ws-policy/src/test/resources/ streaming-ws-security/
streaming-ws-security/src/test/resources/ streaming...
Author: giger
Date: Thu Mar 29 18:54:53 2012
New Revision: 1307049
URL: http://svn.apache.org/viewvc?rev=1307049&view=rev
Log:
Logging configuration per module. WSS-368
Added:
webservices/wss4j/branches/swssf/cxf-integration/src/test/resources/log4j-cxf.xml
- copied, changed from r1305496, webservices/wss4j/branches/swssf/streaming-xml-security/src/test/resources/log4j.xml
webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/resources/log4j-wsp.xml
- copied, changed from r1305496, webservices/wss4j/branches/swssf/streaming-xml-security/src/test/resources/log4j.xml
webservices/wss4j/branches/swssf/streaming-ws-security/src/test/resources/log4j-wss.xml
- copied, changed from r1305496, webservices/wss4j/branches/swssf/streaming-xml-security/src/test/resources/log4j.xml
webservices/wss4j/branches/swssf/streaming-xml-security/src/test/resources/log4j-xmlsec.xml (contents, props changed)
- copied, changed from r1305496, webservices/wss4j/branches/swssf/streaming-xml-security/src/test/resources/log4j.xml
Removed:
webservices/wss4j/branches/swssf/streaming-xml-security/src/test/resources/log4j.xml
Modified:
webservices/wss4j/branches/swssf/cxf-integration/pom.xml
webservices/wss4j/branches/swssf/pom.xml
webservices/wss4j/branches/swssf/streaming-ws-policy/pom.xml
webservices/wss4j/branches/swssf/streaming-ws-security/pom.xml
webservices/wss4j/branches/swssf/streaming-xml-security/pom.xml
Modified: webservices/wss4j/branches/swssf/cxf-integration/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/cxf-integration/pom.xml?rev=1307049&r1=1307048&r2=1307049&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/cxf-integration/pom.xml (original)
+++ webservices/wss4j/branches/swssf/cxf-integration/pom.xml Thu Mar 29 18:54:53 2012
@@ -71,6 +71,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.16</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${cxf.version}</version>
@@ -144,6 +150,17 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.9</version>
+ <configuration>
+ <systemPropertyVariables>
+ <log4j.configuration>log4j-cxf.xml</log4j.configuration>
+ </systemPropertyVariables>
+ <!--<debugForkedProcess>true</debugForkedProcess>-->
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
Copied: webservices/wss4j/branches/swssf/cxf-integration/src/test/resources/log4j-cxf.xml (from r1305496, webservices/wss4j/branches/swssf/streaming-xml-security/src/test/resources/log4j.xml)
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/cxf-integration/src/test/resources/log4j-cxf.xml?p2=webservices/wss4j/branches/swssf/cxf-integration/src/test/resources/log4j-cxf.xml&p1=webservices/wss4j/branches/swssf/streaming-xml-security/src/test/resources/log4j.xml&r1=1305496&r2=1307049&rev=1307049&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-xml-security/src/test/resources/log4j.xml (original)
+++ webservices/wss4j/branches/swssf/cxf-integration/src/test/resources/log4j-cxf.xml Thu Mar 29 18:54:53 2012
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<log4j:configuration debug="false" xmlns:log4j="http://jakarta.apache.org/log4j/">
- <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
+ <appender name="FILE" class="org.apache.log4j.FileAppender">
<param name="File" value="target/logging.log"/>
<param name="DatePattern" value="yyyy-MM-dd"/>
<layout class="org.apache.log4j.PatternLayout">
@@ -16,45 +16,6 @@
<logger name="org.swssf">
<level value="INFO"/>
</logger>
- <logger name="org.swssf.policy.PolicyEnforcer">
- <level value="INFO"/>
- </logger>
- <logger name="org.swssf.xmlsec.impl.util.SignerOutputStream">
- <level value="INFO"/>
- </logger>
- <logger name="org.swssf.xmlsec.impl.util.DigestOutputStream">
- <level value="INFO"/>
- </logger>
- <logger name="org.apache.xml.security.utils.DigesterOutputStream">
- <level value="INFO"/>
- </logger>
- <logger name="org.jcp.xml.dsig.internal">
- <level value="INFO"/>
- </logger>
- <logger name="org.apache.xml.security.utils.SignerOutputStream">
- <level value="INFO"/>
- </logger>
- <logger name="org.apache.xml.security.encryption.XMLCipher">
- <level value="INFO"/>
- </logger>
- <logger name="org.apache.xml">
- <level value="INFO"/>
- </logger>
- <logger name="org.swssf.xmlsec.impl.InputProcessorChainImpl">
- <level value="INFO"/>
- </logger>
- <logger name="org.swssf.xmlsec.impl.OutputProcessorChainImpl">
- <level value="INFO"/>
- </logger>
- <logger name="org.swssf.wss.impl.processor.input">
- <level value="INFO"/>
- </logger>
- <logger name="org.swssf.wss.impl.saml.SAMLAssertionWrapper">
- <level value="INFO"/>
- </logger>
- <logger name="org.swssf.wss.test.AbstractTestBase$CustomWSS4JHandler">
- <level value="INFO"/>
- </logger>
<root>
<level value="INFO"/>
<appender-ref ref="FILE"/>
Modified: webservices/wss4j/branches/swssf/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/pom.xml?rev=1307049&r1=1307048&r2=1307049&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/pom.xml (original)
+++ webservices/wss4j/branches/swssf/pom.xml Thu Mar 29 18:54:53 2012
@@ -137,6 +137,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.9</version>
+ <inherited>true</inherited>
</plugin>
</plugins>
</build>
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/pom.xml?rev=1307049&r1=1307048&r2=1307049&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/pom.xml (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/pom.xml Thu Mar 29 18:54:53 2012
@@ -70,6 +70,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.16</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.ws.security</groupId>
<artifactId>wss4j</artifactId>
<scope>test</scope>
@@ -93,4 +99,19 @@
<scope>test</scope>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.9</version>
+ <configuration>
+ <systemPropertyVariables>
+ <log4j.configuration>log4j-wsp.xml</log4j.configuration>
+ </systemPropertyVariables>
+ <!--<debugForkedProcess>true</debugForkedProcess>-->
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Copied: webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/resources/log4j-wsp.xml (from r1305496, webservices/wss4j/branches/swssf/streaming-xml-security/src/test/resources/log4j.xml)
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/resources/log4j-wsp.xml?p2=webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/resources/log4j-wsp.xml&p1=webservices/wss4j/branches/swssf/streaming-xml-security/src/test/resources/log4j.xml&r1=1305496&r2=1307049&rev=1307049&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-xml-security/src/test/resources/log4j.xml (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/resources/log4j-wsp.xml Thu Mar 29 18:54:53 2012
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<log4j:configuration debug="false" xmlns:log4j="http://jakarta.apache.org/log4j/">
- <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
+ <appender name="FILE" class="org.apache.log4j.FileAppender">
<param name="File" value="target/logging.log"/>
- <param name="DatePattern" value="yyyy-MM-dd"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n"/>
</layout>
@@ -13,48 +12,9 @@
<param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n"/>
</layout>
</appender>
- <logger name="org.swssf">
- <level value="INFO"/>
- </logger>
<logger name="org.swssf.policy.PolicyEnforcer">
<level value="INFO"/>
</logger>
- <logger name="org.swssf.xmlsec.impl.util.SignerOutputStream">
- <level value="INFO"/>
- </logger>
- <logger name="org.swssf.xmlsec.impl.util.DigestOutputStream">
- <level value="INFO"/>
- </logger>
- <logger name="org.apache.xml.security.utils.DigesterOutputStream">
- <level value="INFO"/>
- </logger>
- <logger name="org.jcp.xml.dsig.internal">
- <level value="INFO"/>
- </logger>
- <logger name="org.apache.xml.security.utils.SignerOutputStream">
- <level value="INFO"/>
- </logger>
- <logger name="org.apache.xml.security.encryption.XMLCipher">
- <level value="INFO"/>
- </logger>
- <logger name="org.apache.xml">
- <level value="INFO"/>
- </logger>
- <logger name="org.swssf.xmlsec.impl.InputProcessorChainImpl">
- <level value="INFO"/>
- </logger>
- <logger name="org.swssf.xmlsec.impl.OutputProcessorChainImpl">
- <level value="INFO"/>
- </logger>
- <logger name="org.swssf.wss.impl.processor.input">
- <level value="INFO"/>
- </logger>
- <logger name="org.swssf.wss.impl.saml.SAMLAssertionWrapper">
- <level value="INFO"/>
- </logger>
- <logger name="org.swssf.wss.test.AbstractTestBase$CustomWSS4JHandler">
- <level value="INFO"/>
- </logger>
<root>
<level value="INFO"/>
<appender-ref ref="FILE"/>
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/pom.xml?rev=1307049&r1=1307048&r2=1307049&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/pom.xml (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/pom.xml Thu Mar 29 18:54:53 2012
@@ -247,6 +247,10 @@
<configuration>
<groups>${test.groups}</groups>
<argLine>-Xmx2000m</argLine>
+ <systemPropertyVariables>
+ <log4j.configuration>log4j-wss.xml</log4j.configuration>
+ </systemPropertyVariables>
+ <!--<debugForkedProcess>true</debugForkedProcess>-->
<excludes>
<exclude>**/ProfilingTest.java</exclude>
<exclude>**/PerformanceMemoryTest.java</exclude>
Copied: webservices/wss4j/branches/swssf/streaming-ws-security/src/test/resources/log4j-wss.xml (from r1305496, webservices/wss4j/branches/swssf/streaming-xml-security/src/test/resources/log4j.xml)
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/test/resources/log4j-wss.xml?p2=webservices/wss4j/branches/swssf/streaming-ws-security/src/test/resources/log4j-wss.xml&p1=webservices/wss4j/branches/swssf/streaming-xml-security/src/test/resources/log4j.xml&r1=1305496&r2=1307049&rev=1307049&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-xml-security/src/test/resources/log4j.xml (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/test/resources/log4j-wss.xml Thu Mar 29 18:54:53 2012
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<log4j:configuration debug="false" xmlns:log4j="http://jakarta.apache.org/log4j/">
- <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
+ <appender name="FILE" class="org.apache.log4j.FileAppender">
<param name="File" value="target/logging.log"/>
- <param name="DatePattern" value="yyyy-MM-dd"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n"/>
</layout>
@@ -13,12 +12,6 @@
<param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n"/>
</layout>
</appender>
- <logger name="org.swssf">
- <level value="INFO"/>
- </logger>
- <logger name="org.swssf.policy.PolicyEnforcer">
- <level value="INFO"/>
- </logger>
<logger name="org.swssf.xmlsec.impl.util.SignerOutputStream">
<level value="INFO"/>
</logger>
@@ -37,9 +30,6 @@
<logger name="org.apache.xml.security.encryption.XMLCipher">
<level value="INFO"/>
</logger>
- <logger name="org.apache.xml">
- <level value="INFO"/>
- </logger>
<logger name="org.swssf.xmlsec.impl.InputProcessorChainImpl">
<level value="INFO"/>
</logger>
Modified: webservices/wss4j/branches/swssf/streaming-xml-security/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-xml-security/pom.xml?rev=1307049&r1=1307048&r2=1307049&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-xml-security/pom.xml (original)
+++ webservices/wss4j/branches/swssf/streaming-xml-security/pom.xml Thu Mar 29 18:54:53 2012
@@ -168,6 +168,17 @@
</instrumentation>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.9</version>
+ <configuration>
+ <systemPropertyVariables>
+ <log4j.configuration>log4j-xmlsec.xml</log4j.configuration>
+ </systemPropertyVariables>
+ <!--<debugForkedProcess>true</debugForkedProcess>-->
+ </configuration>
+ </plugin>
</plugins>
</build>
<profiles>
Copied: webservices/wss4j/branches/swssf/streaming-xml-security/src/test/resources/log4j-xmlsec.xml (from r1305496, webservices/wss4j/branches/swssf/streaming-xml-security/src/test/resources/log4j.xml)
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-xml-security/src/test/resources/log4j-xmlsec.xml?p2=webservices/wss4j/branches/swssf/streaming-xml-security/src/test/resources/log4j-xmlsec.xml&p1=webservices/wss4j/branches/swssf/streaming-xml-security/src/test/resources/log4j.xml&r1=1305496&r2=1307049&rev=1307049&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-xml-security/src/test/resources/log4j.xml (original)
+++ webservices/wss4j/branches/swssf/streaming-xml-security/src/test/resources/log4j-xmlsec.xml Thu Mar 29 18:54:53 2012
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<log4j:configuration debug="false" xmlns:log4j="http://jakarta.apache.org/log4j/">
- <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
+ <appender name="FILE" class="org.apache.log4j.FileAppender">
<param name="File" value="target/logging.log"/>
- <param name="DatePattern" value="yyyy-MM-dd"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n"/>
</layout>
@@ -13,12 +12,6 @@
<param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n"/>
</layout>
</appender>
- <logger name="org.swssf">
- <level value="INFO"/>
- </logger>
- <logger name="org.swssf.policy.PolicyEnforcer">
- <level value="INFO"/>
- </logger>
<logger name="org.swssf.xmlsec.impl.util.SignerOutputStream">
<level value="INFO"/>
</logger>
@@ -28,9 +21,6 @@
<logger name="org.apache.xml.security.utils.DigesterOutputStream">
<level value="INFO"/>
</logger>
- <logger name="org.jcp.xml.dsig.internal">
- <level value="INFO"/>
- </logger>
<logger name="org.apache.xml.security.utils.SignerOutputStream">
<level value="INFO"/>
</logger>
@@ -46,15 +36,6 @@
<logger name="org.swssf.xmlsec.impl.OutputProcessorChainImpl">
<level value="INFO"/>
</logger>
- <logger name="org.swssf.wss.impl.processor.input">
- <level value="INFO"/>
- </logger>
- <logger name="org.swssf.wss.impl.saml.SAMLAssertionWrapper">
- <level value="INFO"/>
- </logger>
- <logger name="org.swssf.wss.test.AbstractTestBase$CustomWSS4JHandler">
- <level value="INFO"/>
- </logger>
<root>
<level value="INFO"/>
<appender-ref ref="FILE"/>