Author: thomas.diesler(a)jboss.com Date: 2008-05-09 04:59:46 -0400 (Fri, 09 May 2008) New Revision: 6987 Added: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/ant/SysProperty.java Modified: stack/native/trunk/modules/client/pom.xml stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/ant/wstools.java stack/native/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml stack/native/trunk/modules/testsuite/native-tests/src/test/etc/log4j.xml stack/native/trunk/modules/testsuite/pom.xml stack/native/trunk/pom.xml Log: Fix wstools logging Modified: stack/native/trunk/modules/client/pom.xml =================================================================== --- stack/native/trunk/modules/client/pom.xml 2008-05-09 07:30:09 UTC (rev 6986) +++ stack/native/trunk/modules/client/pom.xml 2008-05-09 08:59:46 UTC (rev 6987) @@ -33,8 +33,8 @@ <version>${version}</version> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-log4j</artifactId> </dependency> </dependencies> Added: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/ant/SysProperty.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/ant/SysProperty.java (rev 0) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/ant/SysProperty.java 2008-05-09 08:59:46 UTC (rev 6987) @@ -0,0 +1,56 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.tools.ant; + +// $Id$ + +/** + * Nested sysproperty + * + * @author Thomas.Diesler(a)jboss.com + * @since 09-May-2008 + */ +public class SysProperty +{ + private String key; + private String value; + + public String getKey() + { + return key; + } + + public void setKey(String key) + { + this.key = key; + } + + public String getValue() + { + return value; + } + + public void setValue(String value) + { + this.value = value; + } +} Property changes on: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/ant/SysProperty.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/ant/wstools.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/ant/wstools.java 2008-05-09 07:30:09 UTC (rev 6986) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/ant/wstools.java 2008-05-09 08:59:46 UTC (rev 6987) @@ -21,6 +21,8 @@ */ package org.jboss.ws.tools.ant; +// $Id$ + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.types.Path; @@ -33,13 +35,11 @@ */ public class wstools extends MatchingTask { - protected Path compileClasspath = null; - private boolean verbose = false; + protected Path compileClasspath; + private boolean verbose; + private String dest; + private String config; - private String dest = null; - - private String config = null; - /** * Creates a nested classpath element. */ @@ -90,6 +90,11 @@ this.verbose = verbose; } + public void addConfiguredSysproperty(SysProperty prop) + { + System.setProperty(prop.getKey(), prop.getValue()); + } + public void execute() throws BuildException { ClassLoader prevCL = Thread.currentThread().getContextClassLoader(); Modified: stack/native/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml =================================================================== --- stack/native/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml 2008-05-09 07:30:09 UTC (rev 6986) +++ stack/native/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml 2008-05-09 08:59:46 UTC (rev 6987) @@ -69,20 +69,12 @@ <priority value="INFO"/> </category> - <!-- - <category name="org.jboss.xb"> - <priority value="TRACE" class="org.jboss.logging.XLevel"/> - </category> - --> - <!-- ======================= --> <!-- Setup the Root category --> <!-- ======================= --> <root> -<!-- - <appender-ref ref="CONSOLE"/> ---> + <!--appender-ref ref="CONSOLE"/--> <appender-ref ref="FILE"/> </root> Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2008-05-09 07:30:09 UTC (rev 6986) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2008-05-09 08:59:46 UTC (rev 6987) @@ -25,25 +25,64 @@ <!-- Generate JAX-RPC artifacts --> <mkdir dir="${tests.output.dir}/wstools/java"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/wrapped/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/bare/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/bare/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/dynamichandler/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/dynamichandler/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/exception/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/exception/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/handler/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/handler/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/holder/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/holder/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jmstransport/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jmstransport/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109ejb/doclit/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109ejb/rpclit/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109pojo/doclit/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109pojo/rpclit/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/message/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/message/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/oneway/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/oneway/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/rpcstyle/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/rpcstyle/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/secureejb/META-INF" config="${tests.resources.dir}/jaxrpc/samples/secureejb/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/hello/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsaddr/hello/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsaddr/replyto/wstools-config.xml"/> - <!--wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/wstools-config.xml"/--> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wssecurity/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wssecurity/wstools-config.xml"/> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/wrapped/wstools-config.xml"> + <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> + </wstools> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/bare/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/bare/wstools-config.xml"> + <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> + </wstools> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/dynamichandler/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/dynamichandler/wstools-config.xml"> + <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> + </wstools> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/exception/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/exception/wstools-config.xml"> + <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> + </wstools> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/handler/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/handler/wstools-config.xml"> + <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> + </wstools> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/holder/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/holder/wstools-config.xml"> + <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> + </wstools> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jmstransport/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jmstransport/wstools-config.xml"> + <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> + </wstools> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109ejb/doclit/wstools-config.xml"> + <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> + </wstools> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109ejb/rpclit/wstools-config.xml"> + <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> + </wstools> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109pojo/doclit/wstools-config.xml"> + <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> + </wstools> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109pojo/rpclit/wstools-config.xml"> + <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> + </wstools> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/message/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/message/wstools-config.xml"> + <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> + </wstools> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/oneway/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/oneway/wstools-config.xml"> + <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> + </wstools> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/rpcstyle/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/rpcstyle/wstools-config.xml"> + <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> + </wstools> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/secureejb/META-INF" config="${tests.resources.dir}/jaxrpc/samples/secureejb/wstools-config.xml"> + <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> + </wstools> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/hello/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsaddr/hello/wstools-config.xml"> + <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> + </wstools> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsaddr/replyto/wstools-config.xml"> + <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> + </wstools> + <!--wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/wstools-config.xml"> + <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> + </wstools--> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wssecurity/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wssecurity/wstools-config.xml"> + <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> + </wstools> + <move todir="${tests.output.dir}/wstools/java"> <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/> </move> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/etc/log4j.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/etc/log4j.xml 2008-05-09 07:30:09 UTC (rev 6986) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/etc/log4j.xml 2008-05-09 08:59:46 UTC (rev 6987) @@ -69,20 +69,12 @@ <priority value="INFO"/> </category> - <!-- - <category name="org.jboss.xb"> - <priority value="TRACE" class="org.jboss.logging.XLevel"/> - </category> - --> - <!-- ======================= --> <!-- Setup the Root category --> <!-- ======================= --> <root> -<!-- - <appender-ref ref="CONSOLE"/> ---> + <!--appender-ref ref="CONSOLE"/--> <appender-ref ref="FILE"/> </root> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2008-05-09 07:30:09 UTC (rev 6986) +++ stack/native/trunk/modules/testsuite/pom.xml 2008-05-09 08:59:46 UTC (rev 6987) @@ -164,6 +164,30 @@ <name>test.resources.directory</name> <value>${project.build.directory}/test-resources</value> </property> + <property> + <name>org.jboss.ws.wsse.keyStore</name> + <value>${project.build.directory}/test-resources/jaxws/samples/wssecurity/wsse.keystore</value> + </property> + <property> + <name>org.jboss.ws.wsse.trustStore</name> + <value>${project.build.directory}/test-resources/jaxws/samples/wssecurity/wsse.truststore</value> + </property> + <property> + <name>org.jboss.ws.wsse.keyStorePassword</name> + <value>jbossws</value> + </property> + <property> + <name>org.jboss.ws.wsse.trustStorePassword</name> + <value>jbossws</value> + </property> + <property> + <name>org.jboss.ws.wsse.keyStoreType</name> + <value>jks</value> + </property> + <property> + <name>org.jboss.ws.wsse.trustStoreType</name> + <value>jks</value> + </property> </systemProperties> </configuration> </plugin> Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2008-05-09 07:30:09 UTC (rev 6986) +++ stack/native/trunk/pom.xml 2008-05-09 08:59:46 UTC (rev 6987) @@ -55,12 +55,12 @@ <javassist.version>3.6.0.GA</javassist.version> <jboss.common.version>1.2.1.GA</jboss.common.version> <jboss.jaxbintros.version>1.0.0.beta2</jboss.jaxbintros.version> + <jboss.logging.version>2.0.5.GA</jboss.logging.version> <jboss.microcontainer.version>2.0.0.Beta11</jboss.microcontainer.version> <jboss.remoting.version>2.4.0.CR1</jboss.remoting.version> <jaxb.api.version>2.1</jaxb.api.version> <jaxb.impl.version>2.1.6</jaxb.impl.version> <juddi.service.version>1.2.0.GA</juddi.service.version> - <log4j.version>1.2.8</log4j.version> <sun.fastinfoset.version>1.2.2</sun.fastinfoset.version> <sun.jaxws.version>2.1.3</sun.jaxws.version> <woodstox.version>3.1.1</woodstox.version> @@ -267,16 +267,16 @@ <type>sar</type> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>${log4j.version}</version> - </dependency> - <dependency> <groupId>org.codehaus.jettison</groupId> <artifactId>jettison</artifactId> <version>${codehaus.jettison.version}</version> </dependency> <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-log4j</artifactId> + <version>${jboss.logging.version}</version> + </dependency> + <dependency> <groupId>wscommons-policy</groupId> <artifactId>policy</artifactId> <version>${wscommons.policy.version}</version>