May 2008 - jbossws-commits - Jboss List Archives

JBossWS SVN: r6991 - in stack/native/trunk/modules/testsuite/native-tests: scripts and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-05-09 09:50:22 -0400 (Fri, 09 May 2008) New Revision: 6991 Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml Log: Fix compile of wstools generated artifacts Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/pom.xml 2008-05-09 10:27:32 UTC (rev 6990) +++ stack/native/trunk/modules/testsuite/native-tests/pom.xml 2008-05-09 13:50:22 UTC (rev 6991) @@ -70,6 +70,8 @@ <property name="maven.test.classpath" refid="maven.test.classpath"/> <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> <property name="tests.output.dir" value="${project.build.directory}"/> + <property name="jboss.bind.address" value="${jboss.bind.address}"/> + <property name="java.jdk15.home" value="${java.jdk15.home}"/> <ant antfile="scripts/antrun-wstools.xml" target="wstools"/> </tasks> </configuration> 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 10:27:32 UTC (rev 6990) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2008-05-09 13:50:22 UTC (rev 6991) @@ -14,75 +14,44 @@   - <target name="wstools" description="Generate the JAX-RPC artifacts."> + <target name="wstools" depends="generate-sources,compile-sources,copy-resources" description="Generate the JAX-RPC artifacts."> + </target> + +  + <target name="generate-sources"> -  <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools"> <classpath> <pathelement path="${maven.test.classpath}"/> </classpath> </taskdef> -  - <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"> - <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/wssecurity/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wssecurity/wstools-config.xml"> - <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> - </wstools> + <macro-wstools dest="jaxrpc/samples/docstyle/wrapped/WEB-INF" config="jaxrpc/samples/docstyle/wrapped/wstools-config.xml"/> + <macro-wstools dest="jaxrpc/samples/docstyle/bare/WEB-INF" config="jaxrpc/samples/docstyle/bare/wstools-config.xml"/> + <macro-wstools dest="jaxrpc/samples/dynamichandler/WEB-INF" config="jaxrpc/samples/dynamichandler/wstools-config.xml"/> + <macro-wstools dest="jaxrpc/samples/exception/WEB-INF" config="jaxrpc/samples/exception/wstools-config.xml"/> + <macro-wstools dest="jaxrpc/samples/handler/WEB-INF" config="jaxrpc/samples/handler/wstools-config.xml"/> + <macro-wstools dest="jaxrpc/samples/holder/WEB-INF" config="jaxrpc/samples/holder/wstools-config.xml"/> + <macro-wstools dest="jaxrpc/samples/jmstransport/META-INF" config="jaxrpc/samples/jmstransport/wstools-config.xml"/> + <macro-wstools dest="jaxrpc/samples/jsr109ejb/doclit/META-INF" config="jaxrpc/samples/jsr109ejb/doclit/wstools-config.xml"/> + <macro-wstools dest="jaxrpc/samples/jsr109ejb/rpclit/META-INF" config="jaxrpc/samples/jsr109ejb/rpclit/wstools-config.xml"/> + <macro-wstools dest="jaxrpc/samples/jsr109pojo/doclit/WEB-INF" config="jaxrpc/samples/jsr109pojo/doclit/wstools-config.xml"/> + <macro-wstools dest="jaxrpc/samples/jsr109pojo/rpclit/WEB-INF" config="jaxrpc/samples/jsr109pojo/rpclit/wstools-config.xml"/> + <macro-wstools dest="jaxrpc/samples/message/WEB-INF" config="jaxrpc/samples/message/wstools-config.xml"/> + <macro-wstools dest="jaxrpc/samples/oneway/WEB-INF" config="jaxrpc/samples/oneway/wstools-config.xml"/> + <macro-wstools dest="jaxrpc/samples/rpcstyle/WEB-INF" config="jaxrpc/samples/rpcstyle/wstools-config.xml"/> + <macro-wstools dest="jaxrpc/samples/secureejb/META-INF" config="jaxrpc/samples/secureejb/wstools-config.xml"/> + <macro-wstools dest="jaxrpc/samples/wsaddr/hello/WEB-INF" config="jaxrpc/samples/wsaddr/hello/wstools-config.xml"/> + <macro-wstools dest="jaxrpc/samples/wsaddr/replyto/WEB-INF" config="jaxrpc/samples/wsaddr/replyto/wstools-config.xml"/> +  + <macro-wstools dest="jaxrpc/samples/wssecurity/WEB-INF" config="jaxrpc/samples/wssecurity/wstools-config.xml"/> + </target> + +  + <target name="compile-sources"> + + <mkdir dir="${tests.output.dir}/wstools/java"/> <move todir="${tests.output.dir}/wstools/java"> <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/> </move> @@ -93,20 +62,46 @@ <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF" includes="org/**"/> </move> -  +  + <javac destdir="${tests.output.dir}/test-classes" debug="true" encoding="utf-8" deprecation="true" fork="true" + executable="${java.jdk15.home}/bin/javac" compiler="javac1.5"> + <src path="${tests.output.dir}/wstools/java"/> + <classpath> + <pathelement path="${maven.test.classpath}"/> + </classpath> + </javac> + </target> + +  + <target name="copy-resources"> + <copy todir="${tests.output.dir}/test-resources"> <fileset dir="${tests.output.dir}/wstools/resources"> <include name="**/*.wsdl"/> <include name="**/*.xml"/> </fileset> </copy> -  + <copy todir="${tests.output.dir}/test-resources/jaxrpc/samples" overwrite="true"> <fileset dir="${tests.resources.dir}/jaxrpc/samples-override"/> <filterset> - <filter token="jboss.bind.address" value="${node0}"/> + <filter token="jboss.bind.address" value="${jboss.bind.address}"/> </filterset> </copy> </target> +  + <macrodef name="macro-wstools"> + <attribute name="dest"/> + <attribute name="config"/> + <sequential> + <wstools dest="${tests.output.dir}/wstools/resources/@{dest}" config="${tests.resources.dir}/@{config}"> + <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> + </wstools> + </sequential> + </macrodef> + </project> \ No newline at end of file

16 years, 8 months

1
0
0 / 0

JBossWS SVN: r6990 - in stack/native/trunk: modules/core/src/main/java/org/jboss/ws/extensions/policy/metadata and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-05-09 06:27:32 -0400 (Fri, 09 May 2008) New Revision: 6990 Modified: stack/native/trunk/.classpath stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml Log: Fix wssecurityAnnotatedpolicy Modified: stack/native/trunk/.classpath =================================================================== --- stack/native/trunk/.classpath 2008-05-09 09:13:21 UTC (rev 6989) +++ stack/native/trunk/.classpath 2008-05-09 10:27:32 UTC (rev 6990) @@ -1,6 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="modules/saaj/src/main/java"/> + <classpathentry kind="src" path="modules/testsuite/framework-tests/target/wsconsume/java"/> + <classpathentry kind="src" path="modules/testsuite/native-tests/target/wsconsume/java"/> + <classpathentry kind="src" path="modules/testsuite/framework-tests/src/test/java"/> + <classpathentry kind="src" path="modules/testsuite/native-tests/src/test/java"/> <classpathentry kind="src" path="modules/jaxrpc/src/main/java"/> <classpathentry kind="src" path="modules/jaxws/src/main/java"/> <classpathentry kind="src" path="modules/jaxws-ext/src/main/java"/> Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java 2008-05-09 09:13:21 UTC (rev 6989) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java 2008-05-09 10:27:32 UTC (rev 6990) @@ -21,6 +21,7 @@ */ package org.jboss.ws.extensions.policy.metadata; +import java.io.IOException; import java.io.InputStream; import java.util.List; import java.util.StringTokenizer; @@ -104,7 +105,7 @@ return builder; } - public void processPolicyAnnotations(EndpointMetaData epMetaData, Class<?> sepClass) + public void processPolicyAnnotations(EndpointMetaData epMetaData, Class<?> sepClass) throws IOException { UnifiedVirtualFile vfRoot = epMetaData.getServiceMetaData().getUnifiedMetaData().getRootFile(); for (org.jboss.ws.extensions.policy.annotation.Policy anPolicy : sepClass.getAnnotation(PolicyAttachment.class).value()) @@ -135,10 +136,6 @@ throw new WSException("Policy scope " + scope + " not supported yet!"); } } - catch (Exception e) - { - log.error(e); - } finally { try Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml 2008-05-09 09:13:21 UTC (rev 6989) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml 2008-05-09 10:27:32 UTC (rev 6990) @@ -21,7 +21,8 @@ <classpath> <pathelement path="${maven.test.classpath}"/> </classpath> - </taskdef> + <classpath location="${tests.output.dir}/test-resources/jaxws/samples/wssecurityAnnotatedpolicy"/> + </taskdef> <wsprovide resourcedestdir="${tests.output.dir}/test-resources/wsprovide/jaxws/samples/wssecurity" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean" destdir="${tests.output.dir}/test-classes" verbose="false"/> <wsprovide resourcedestdir="${tests.output.dir}/test-resources/wsprovide/jaxws/samples/wssecurityAnnotatedpolicy" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy.HelloJavaBean" destdir="${tests.output.dir}/test-classes" verbose="false"/>

16 years, 8 months

1
0
0 / 0

JBossWS SVN: r6989 - stack/cxf/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-05-09 05:13:21 -0400 (Fri, 09 May 2008) New Revision: 6989 Modified: stack/cxf/trunk/modules/testsuite/pom.xml Log: Use log4j.output.dir Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2008-05-09 09:11:53 UTC (rev 6988) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2008-05-09 09:13:21 UTC (rev 6989) @@ -110,8 +110,8 @@  <systemProperties> <property> - <name>build.testlog</name> - <value>${project.build.directory}/test-log</value> + <name>log4j.output.dir</name> + <value>${project.build.directory}</value> </property> <property> <name>java.naming.provider.url</name>

16 years, 8 months

1
0
0 / 0

JBossWS SVN: r6988 - in stack/metro/trunk/modules/testsuite: framework-tests and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-05-09 05:11:53 -0400 (Fri, 09 May 2008) New Revision: 6988 Added: stack/metro/trunk/modules/testsuite/framework-tests/src/ stack/metro/trunk/modules/testsuite/framework-tests/src/test/ stack/metro/trunk/modules/testsuite/framework-tests/src/test/etc/ stack/metro/trunk/modules/testsuite/framework-tests/src/test/etc/jndi.properties stack/metro/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml stack/metro/trunk/modules/testsuite/framework-tests/src/test/etc/tst.policy Modified: stack/metro/trunk/modules/testsuite/framework-tests/ stack/metro/trunk/modules/testsuite/pom.xml Log: Add log4j config Property changes on: stack/metro/trunk/modules/testsuite/framework-tests ___________________________________________________________________ Name: svn:ignore - src target + target Property changes on: stack/metro/trunk/modules/testsuite/framework-tests/src/test ___________________________________________________________________ Name: svn:ignore + ant-import java resources Added: stack/metro/trunk/modules/testsuite/framework-tests/src/test/etc/jndi.properties =================================================================== --- stack/metro/trunk/modules/testsuite/framework-tests/src/test/etc/jndi.properties (rev 0) +++ stack/metro/trunk/modules/testsuite/framework-tests/src/test/etc/jndi.properties 2008-05-09 09:11:53 UTC (rev 6988) @@ -0,0 +1,3 @@ +java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory +java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces +java.naming.provider.url=jnp://@jboss.bind.address@:1099 \ No newline at end of file Added: stack/metro/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml =================================================================== --- stack/metro/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml (rev 0) +++ stack/metro/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml 2008-05-09 09:11:53 UTC (rev 6988) @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> + + + + + + + + + + + +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> + +  +  +  + +  + <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender"> + <param name="File" value="${build.testlog}/test.log"/> + <param name="Append" value="false"/> + +  + <param name="DatePattern" value="'.'yyyy-MM-dd"/> + + <layout class="org.apache.log4j.PatternLayout"> +  + <param name="ConversionPattern" value="%d %-5p [%c:%L] %m%n"/> + </layout> + </appender> + +  +  +  + + <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> + <param name="Threshold" value="INFO"/> + <param name="Target" value="System.out"/> + + <layout class="org.apache.log4j.PatternLayout"> +  + <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/> + </layout> + </appender> + +  +  +  + + <category name="org.jboss.ws"> + <priority value="DEBUG"/> + </category> + +  +  +  + + <root> +  + <appender-ref ref="FILE"/> + </root> + +</log4j:configuration> Property changes on: stack/metro/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/modules/testsuite/framework-tests/src/test/etc/tst.policy =================================================================== --- stack/metro/trunk/modules/testsuite/framework-tests/src/test/etc/tst.policy (rev 0) +++ stack/metro/trunk/modules/testsuite/framework-tests/src/test/etc/tst.policy 2008-05-09 09:11:53 UTC (rev 6988) @@ -0,0 +1,4 @@ +grant { + permission java.security.AllPermission; +}; + Modified: stack/metro/trunk/modules/testsuite/pom.xml =================================================================== --- stack/metro/trunk/modules/testsuite/pom.xml 2008-05-09 08:59:46 UTC (rev 6987) +++ stack/metro/trunk/modules/testsuite/pom.xml 2008-05-09 09:11:53 UTC (rev 6988) @@ -127,8 +127,8 @@  <systemProperties> <property> - <name>build.testlog</name> - <value>${project.build.directory}/test-log</value> + <name>log4j.output.dir</name> + <value>${project.build.directory}</value> </property> <property> <name>java.naming.provider.url</name>

16 years, 8 months

1
0
0 / 0

JBossWS SVN: r6987 - in stack/native/trunk: modules/client and 5 other directories.

by jbossws-commits＠lists.jboss.org

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> -  -    <root> - +  <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 @@  <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/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/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> -  -    <root> - +  <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>

16 years, 8 months

1
0
0 / 0

JBossWS SVN: r6986 - in framework/trunk/testsuite/test: resources/jaxws/samples and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-05-09 03:30:09 -0400 (Fri, 09 May 2008) New Revision: 6986 Added: framework/trunk/testsuite/test/resources/jaxws/samples/wssecurity/ framework/trunk/testsuite/test/resources/jaxws/samples/wssecurity/wsse.keystore framework/trunk/testsuite/test/resources/jaxws/samples/wssecurity/wsse.truststore Modified: framework/trunk/testsuite/test/ant-import/build-testsuite.xml Log: Add wsse stores. jbossws-framework-3.0.2-20080509.072434-21 Modified: framework/trunk/testsuite/test/ant-import/build-testsuite.xml =================================================================== --- framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2008-05-09 07:15:09 UTC (rev 6985) +++ framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2008-05-09 07:30:09 UTC (rev 6986) @@ -408,8 +408,8 @@ <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/> <sysproperty key="jmx.authentication.username" value="${jmx.authentication.username}"/> <sysproperty key="jmx.authentication.password" value="${jmx.authentication.password}"/> - <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/wsse.keystore"/> - <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/wsse.truststore"/> + <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.output.dir}/test-resources/jaxws/samples/wssecurity/wsse.keystore"/> + <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.output.dir}/test-resources/jaxws/samples/wssecurity/wsse.truststore"/> <sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/> <sysproperty key="org.jboss.ws.wsse.trustStorePassword" value="jbossws"/> <sysproperty key="org.jboss.ws.wsse.keyStoreType" value="jks"/> @@ -458,8 +458,8 @@ <sysproperty key="jmx.authentication.password" value="${jmx.authentication.password}"/>   <sysproperty key="org.jboss.security.ignoreHttpsHost" value="true"/> - <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/wsse.keystore"/> - <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/wsse.truststore"/> + <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.output.dir}/test-resources/jaxws/samples/wssecurity/wsse.keystore"/> + <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.output.dir}/test-resources/jaxws/samples/wssecurity/wsse.truststore"/> <sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/> <sysproperty key="org.jboss.ws.wsse.trustStorePassword" value="jbossws"/> <sysproperty key="org.jboss.ws.wsse.keyStoreType" value="jks"/> Copied: framework/trunk/testsuite/test/resources/jaxws/samples/wssecurity/wsse.keystore (from rev 6981, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/wsse.keystore) =================================================================== (Binary files differ) Copied: framework/trunk/testsuite/test/resources/jaxws/samples/wssecurity/wsse.truststore (from rev 6981, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/wsse.truststore) =================================================================== (Binary files differ)

16 years, 8 months

1
0
0 / 0

JBossWS SVN: r6985 - framework/trunk/testsuite/test/ant-import.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-05-09 03:15:09 -0400 (Fri, 09 May 2008) New Revision: 6985 Modified: framework/trunk/testsuite/test/ant-import/build-testsuite.xml Log: Use log4j.output.dir Modified: framework/trunk/testsuite/test/ant-import/build-testsuite.xml =================================================================== --- framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2008-05-09 07:12:52 UTC (rev 6984) +++ framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2008-05-09 07:15:09 UTC (rev 6985) @@ -82,8 +82,8 @@ <property name="node0.jndi.url" value="jnp://${node0}:1099"/> <property name="node0.hajndi.url" value="jnp://${node0}:1100"/> - <mkdir dir="${tests.output.dir}/test-log"/> - <delete file="${tests.output.dir}/test-log/test.log"/> + <mkdir dir="${tests.output.dir}"/> + <delete file="${tests.output.dir}/test.log"/> <property name="jboss.client" value="${jboss.home}/client"/> <property name="jboss.lib" value="${jboss.home}/lib"/> @@ -395,7 +395,7 @@ <jvmarg value="-Dcom.sun.xml.ws.transport.http.client.HttpTransportPipe.dump=true"/--> <sysproperty key="jdk.home" value="${env.JAVA_HOME}"/> - <sysproperty key="build.testlog" value="${tests.output.dir}/test-log"/> + <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> <sysproperty key="client.scenario" value="${client.scenario}"/> <sysproperty key="interop" value="${interop}"/> <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/> @@ -443,7 +443,7 @@ <jvmarg value="-Dcom.sun.xml.ws.transport.http.client.HttpTransportPipe.dump=true"/--> <sysproperty key="jdk.home" value="${env.JAVA_HOME}"/> - <sysproperty key="build.testlog" value="${tests.output.dir}/test-log"/> + <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> <sysproperty key="client.scenario" value="${client.scenario}"/> <sysproperty key="interop" value="${interop}"/> <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/>

16 years, 8 months

1
0
0 / 0

JBossWS SVN: r6984 - in stack/native/trunk/modules/testsuite/framework-tests/src/test: etc and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-05-09 03:12:52 -0400 (Fri, 09 May 2008) New Revision: 6984 Added: stack/native/trunk/modules/testsuite/framework-tests/src/test/etc/ stack/native/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml Removed: stack/native/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml Log: Add log4j config Copied: stack/native/trunk/modules/testsuite/framework-tests/src/test/etc (from rev 6981, stack/native/trunk/modules/testsuite/native-tests/src/test/etc) Deleted: stack/native/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/etc/log4j.xml 2008-05-09 06:21:47 UTC (rev 6981) +++ stack/native/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml 2008-05-09 07:12:52 UTC (rev 6984) @@ -1,89 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> - - - - - - - - - - - -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> - -  -  -  - -  - <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender"> - <param name="File" value="${build.testlog}/test.log"/> - <param name="Append" value="false"/> - -  - <param name="DatePattern" value="'.'yyyy-MM-dd"/> - - <layout class="org.apache.log4j.PatternLayout"> -  - <param name="ConversionPattern" value="%d %-5p [%c:%L] %m%n"/> - </layout> - </appender> - -  -  -  - - <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> - <param name="Threshold" value="INFO"/> - <param name="Target" value="System.out"/> - - <layout class="org.apache.log4j.PatternLayout"> -  - <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/> - </layout> - </appender> - -  -  -  - - <category name="org.jboss.ws"> - <priority value="DEBUG"/> - </category> - - <category name="org.jboss.ws.core.MessageTrace"> - <priority value="TRACE" class="org.jboss.logging.XLevel"/> - </category> - - <category name="org.jboss.remoting"> - <priority value="INFO"/> - </category> - -  - <category name="org.apache.xml.security"> - <priority value="INFO"/> - </category> - -  - -  -  -  - - <root> - - <appender-ref ref="FILE"/> - </root> - -</log4j:configuration> Copied: stack/native/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml (from rev 6983, stack/native/trunk/modules/testsuite/native-tests/src/test/etc/log4j.xml) =================================================================== --- stack/native/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml (rev 0) +++ stack/native/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml 2008-05-09 07:12:52 UTC (rev 6984) @@ -0,0 +1,89 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> + + + + + + + + + + + +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> + +  +  +  + +  + <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender"> + <param name="File" value="${log4j.output.dir}/test.log"/> + <param name="Append" value="false"/> + +  + <param name="DatePattern" value="'.'yyyy-MM-dd"/> + + <layout class="org.apache.log4j.PatternLayout"> +  + <param name="ConversionPattern" value="%d %-5p [%c:%L] %m%n"/> + </layout> + </appender> + +  +  +  + + <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> + <param name="Threshold" value="INFO"/> + <param name="Target" value="System.out"/> + + <layout class="org.apache.log4j.PatternLayout"> +  + <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/> + </layout> + </appender> + +  +  +  + + <category name="org.jboss.ws"> + <priority value="DEBUG"/> + </category> + + <category name="org.jboss.ws.core.MessageTrace"> + <priority value="TRACE" class="org.jboss.logging.XLevel"/> + </category> + + <category name="org.jboss.remoting"> + <priority value="INFO"/> + </category> + +  + <category name="org.apache.xml.security"> + <priority value="INFO"/> + </category> + +  + +  +  +  + + <root> + + <appender-ref ref="FILE"/> + </root> + +</log4j:configuration>

16 years, 8 months

1
0
0 / 0

JBossWS SVN: r6983 - in stack/native/trunk: modules/client and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-05-09 03:11:11 -0400 (Fri, 09 May 2008) New Revision: 6983 Added: stack/native/trunk/modules/testsuite/framework-tests/src/ stack/native/trunk/modules/testsuite/framework-tests/src/test/ Modified: stack/native/trunk/modules/client/pom.xml stack/native/trunk/modules/testsuite/framework-tests/ 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: Add log4j Modified: stack/native/trunk/modules/client/pom.xml =================================================================== --- stack/native/trunk/modules/client/pom.xml 2008-05-09 07:06:07 UTC (rev 6982) +++ stack/native/trunk/modules/client/pom.xml 2008-05-09 07:11:11 UTC (rev 6983) @@ -32,6 +32,10 @@ <artifactId>jbossws-native-core</artifactId> <version>${version}</version> </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> </dependencies> </project> Property changes on: stack/native/trunk/modules/testsuite/framework-tests ___________________________________________________________________ Name: svn:ignore - src target + target Property changes on: stack/native/trunk/modules/testsuite/framework-tests/src/test ___________________________________________________________________ Name: svn:ignore + ant-import java resources 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:06:07 UTC (rev 6982) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/etc/log4j.xml 2008-05-09 07:11:11 UTC (rev 6983) @@ -22,7 +22,7 @@  <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender"> - <param name="File" value="${build.testlog}/test.log"/> + <param name="File" value="${log4j.output.dir}/test.log"/> <param name="Append" value="false"/>  Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2008-05-09 07:06:07 UTC (rev 6982) +++ stack/native/trunk/modules/testsuite/pom.xml 2008-05-09 07:11:11 UTC (rev 6983) @@ -133,8 +133,8 @@ <argLine>${surefire.jvm.args}</argLine> <systemProperties> <property> - <name>build.testlog</name> - <value>${project.build.directory}/test-log</value> + <name>log4j.output.dir</name> + <value>${project.build.directory}</value> </property> <property> <name>java.naming.provider.url</name> Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2008-05-09 07:06:07 UTC (rev 6982) +++ stack/native/trunk/pom.xml 2008-05-09 07:11:11 UTC (rev 6983) @@ -60,6 +60,7 @@ <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> @@ -266,6 +267,11 @@ <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>

16 years, 8 months

1
0
0 / 0

JBossWS SVN: r6982 - framework/trunk/testsuite/test.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-05-09 03:06:07 -0400 (Fri, 09 May 2008) New Revision: 6982 Removed: framework/trunk/testsuite/test/etc/ Log: Remove testsuite/etc jbossws-framework-3.0.2-20080509.070033-19

16 years, 8 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits May 2008