[jbossws-commits] JBossWS SVN: r12463 - in stack/metro/trunk/modules: testsuite and 4 other directories.

Author: alessio.soldano(a)jboss.com Date: 2010-06-10 12:47:08 -0400 (Thu, 10 Jun 2010) New Revision: 12463 Modified: stack/metro/trunk/modules/resources/src/main/resources/bin/wsconsume.bat stack/metro/trunk/modules/resources/src/main/resources/bin/wsconsume.sh stack/metro/trunk/modules/resources/src/main/resources/bin/wsprovide.bat stack/metro/trunk/modules/resources/src/main/resources/bin/wsprovide.sh stack/metro/trunk/modules/testsuite/framework-tests/pom.xml stack/metro/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml stack/metro/trunk/modules/testsuite/metro-tests/pom.xml stack/metro/trunk/modules/testsuite/metro-tests/scripts/antrun-wsconsume.xml stack/metro/trunk/modules/testsuite/pom.xml Log: [JBWS-3063] Use wsconsume/wsprovide in forked mode to add log4j conf to the system env before invocation; fix bat/sh scripts Modified: stack/metro/trunk/modules/resources/src/main/resources/bin/wsconsume.bat =================================================================== --- stack/metro/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2010-06-10 16:43:58 UTC (rev 12462) +++ stack/metro/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2010-06-10 16:47:08 UTC (rev 12463) @@ -49,4 +49,4 @@ set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-metro-client.jar rem Execute the command -"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -classpath "%WSCONSUME_CLASSPATH%" org.jboss.wsf.spi.tools.cmd.WSConsume %* +"%JAVA%" %JAVA_OPTS% -Dlog4j.configuration=log4j.xml -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -classpath "%WSCONSUME_CLASSPATH%" org.jboss.wsf.spi.tools.cmd.WSConsume %* Modified: stack/metro/trunk/modules/resources/src/main/resources/bin/wsconsume.sh =================================================================== --- stack/metro/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2010-06-10 16:43:58 UTC (rev 12462) +++ stack/metro/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2010-06-10 16:47:08 UTC (rev 12463) @@ -88,6 +88,7 @@ # Execute the command "$JAVA" $JAVA_OPTS \ + -Dlog4j.configuration=log4j.xml \ -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ -classpath "$WSCONSUME_CLASSPATH" \ org.jboss.wsf.spi.tools.cmd.WSConsume "$@" Modified: stack/metro/trunk/modules/resources/src/main/resources/bin/wsprovide.bat =================================================================== --- stack/metro/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2010-06-10 16:43:58 UTC (rev 12462) +++ stack/metro/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2010-06-10 16:47:08 UTC (rev 12463) @@ -51,4 +51,4 @@ set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/saaj-impl.jar rem Execute the command -"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -classpath "%WSPROVIDE_CLASSPATH%" org.jboss.wsf.spi.tools.cmd.WSProvide %* +"%JAVA%" %JAVA_OPTS% -Dlog4j.configuration=log4j.xml -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -classpath "%WSPROVIDE_CLASSPATH%" org.jboss.wsf.spi.tools.cmd.WSProvide %* Modified: stack/metro/trunk/modules/resources/src/main/resources/bin/wsprovide.sh =================================================================== --- stack/metro/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2010-06-10 16:43:58 UTC (rev 12462) +++ stack/metro/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2010-06-10 16:47:08 UTC (rev 12463) @@ -90,6 +90,7 @@ # Execute the command "$JAVA" $JAVA_OPTS \ + -Dlog4j.configuration=log4j.xml \ -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ -classpath "$WSPROVIDE_CLASSPATH" \ org.jboss.wsf.spi.tools.cmd.WSProvide "$@" Modified: stack/metro/trunk/modules/testsuite/framework-tests/pom.xml =================================================================== --- stack/metro/trunk/modules/testsuite/framework-tests/pom.xml 2010-06-10 16:43:58 UTC (rev 12462) +++ stack/metro/trunk/modules/testsuite/framework-tests/pom.xml 2010-06-10 16:47:08 UTC (rev 12463) @@ -97,6 +97,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="log4j.conf" value="${basedir}/src/test/etc/log4j.xml" /> + <property name="log4j.output.dir" value="${log4j.output.dir}"/> <property name="project.version" value="${project.version}"/> <ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume"/> </tasks> Modified: stack/metro/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml =================================================================== --- stack/metro/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml 2010-06-10 16:43:58 UTC (rev 12462) +++ stack/metro/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml 2010-06-10 16:47:08 UTC (rev 12463) @@ -21,8 +21,14 @@ </classpath> </taskdef> - <wsconsume wsdl="${tests.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl" package="org.jboss.test.ws.jaxws.complex" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/> - <wsconsume wsdl="${tests.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl" package="org.jboss.test.ws.jaxws.holder" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/> + <wsconsume wsdl="${tests.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl" package="org.jboss.test.ws.jaxws.complex" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"> + <jvmarg line="-Dlog4j.configuration=file://${log4j.conf}"/> + <jvmarg line="-Dlog4j.output.dir=${log4j.output.dir}"/> + </wsconsume> + <wsconsume wsdl="${tests.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl" package="org.jboss.test.ws.jaxws.holder" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"> + <jvmarg line="-Dlog4j.configuration=file://${log4j.conf}"/> + <jvmarg line="-Dlog4j.output.dir=${log4j.output.dir}"/> + </wsconsume> </target> -</project> \ No newline at end of file +</project> Modified: stack/metro/trunk/modules/testsuite/metro-tests/pom.xml =================================================================== --- stack/metro/trunk/modules/testsuite/metro-tests/pom.xml 2010-06-10 16:43:58 UTC (rev 12462) +++ stack/metro/trunk/modules/testsuite/metro-tests/pom.xml 2010-06-10 16:47:08 UTC (rev 12463) @@ -58,6 +58,8 @@ <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> <property name="tests.output.dir" value="${project.build.directory}"/> <property name="project.version" value="${project.version}"/> + <property name="log4j.conf" value="${basedir}/src/test/etc/log4j.xml" /> + <property name="log4j.output.dir" value="${log4j.output.dir}"/> <ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume"/> </tasks> </configuration> Modified: stack/metro/trunk/modules/testsuite/metro-tests/scripts/antrun-wsconsume.xml =================================================================== --- stack/metro/trunk/modules/testsuite/metro-tests/scripts/antrun-wsconsume.xml 2010-06-10 16:43:58 UTC (rev 12462) +++ stack/metro/trunk/modules/testsuite/metro-tests/scripts/antrun-wsconsume.xml 2010-06-10 16:47:08 UTC (rev 12463) @@ -21,8 +21,14 @@ </classpath> </taskdef> - <wsconsume wsdl="${tests.resources.dir}/wsit/rm/WEB-INF/wsdl/Calc.wsdl" package="org.jboss.test.ws.wsit.rm" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/> - <wsconsume wsdl="${tests.resources.dir}/jaxws/jbws2403/WEB-INF/wsdl/TestService.wsdl" binding="${tests.resources.dir}/jaxws/jbws2403/WEB-INF/wsdl/mapping.xml" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/> + <wsconsume wsdl="${tests.resources.dir}/wsit/rm/WEB-INF/wsdl/Calc.wsdl" package="org.jboss.test.ws.wsit.rm" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"> + <jvmarg line="-Dlog4j.configuration=file://${log4j.conf}"/> + <jvmarg line="-Dlog4j.output.dir=${log4j.output.dir}"/> + </wsconsume> + <wsconsume wsdl="${tests.resources.dir}/jaxws/jbws2403/WEB-INF/wsdl/TestService.wsdl" binding="${tests.resources.dir}/jaxws/jbws2403/WEB-INF/wsdl/mapping.xml" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"> + <jvmarg line="-Dlog4j.configuration=file://${log4j.conf}"/> + <jvmarg line="-Dlog4j.output.dir=${log4j.output.dir}"/> + </wsconsume> </target> -</project> \ No newline at end of file +</project> Modified: stack/metro/trunk/modules/testsuite/pom.xml =================================================================== --- stack/metro/trunk/modules/testsuite/pom.xml 2010-06-10 16:43:58 UTC (rev 12462) +++ stack/metro/trunk/modules/testsuite/pom.xml 2010-06-10 16:47:08 UTC (rev 12463) @@ -26,6 +26,7 @@ <wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location> <hibernate.version>3.2.4.sp1</hibernate.version> <jboss.javaee.version>5.0.0.GA</jboss.javaee.version> + <log4j.output.dir>${project.build.directory}</log4j.output.dir> </properties> <!-- Modules -->