[jbossws-commits] JBossWS SVN: r12460 - in stack/cxf/trunk/modules: testsuite and 2 other directories.

Author: alessio.soldano(a)jboss.com Date: 2010-06-10 12:23:18 -0400 (Thu, 10 Jun 2010) New Revision: 12460 Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml stack/cxf/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml stack/cxf/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/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2010-06-10 16:20:53 UTC (rev 12459) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2010-06-10 16:23:18 UTC (rev 12460) @@ -81,4 +81,4 @@ set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/wsdl4j.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/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2010-06-10 16:20:53 UTC (rev 12459) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2010-06-10 16:23:18 UTC (rev 12460) @@ -129,6 +129,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/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2010-06-10 16:20:53 UTC (rev 12459) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2010-06-10 16:23:18 UTC (rev 12460) @@ -88,4 +88,4 @@ set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/wstx.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/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2010-06-10 16:20:53 UTC (rev 12459) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2010-06-10 16:23:18 UTC (rev 12460) @@ -139,6 +139,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/cxf/trunk/modules/testsuite/framework-tests/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml 2010-06-10 16:20:53 UTC (rev 12459) +++ stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml 2010-06-10 16:23:18 UTC (rev 12460) @@ -98,6 +98,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/cxf/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml 2010-06-10 16:20:53 UTC (rev 12459) +++ stack/cxf/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml 2010-06-10 16:23:18 UTC (rev 12460) @@ -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" fork="true"> + <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" fork="true"> + <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/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2010-06-10 16:20:53 UTC (rev 12459) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2010-06-10 16:23:18 UTC (rev 12460) @@ -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 -->