Author: alessio.soldano(a)jboss.com Date: 2010-06-10 12:27:46 -0400 (Thu, 10 Jun 2010) New Revision: 12461 Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.bat stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.sh stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.bat stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.sh stack/native/trunk/modules/testsuite/framework-tests/pom.xml stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsprovide.xml stack/native/trunk/modules/testsuite/native-tests/pom.xml stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml Log: [JBWS-3063] Provide log4j conf to the system env before invoking wsconsume/wsprovide during the build; fix bat/sh scripts Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.bat =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2010-06-10 16:23:18 UTC (rev 12460) +++ stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2010-06-10 16:27:46 UTC (rev 12461) @@ -63,4 +63,4 @@ set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/saaj-api.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/native/trunk/modules/resources/src/main/resources/bin/wsconsume.sh =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2010-06-10 16:23:18 UTC (rev 12460) +++ stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2010-06-10 16:27:46 UTC (rev 12461) @@ -100,6 +100,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/native/trunk/modules/resources/src/main/resources/bin/wsprovide.bat =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2010-06-10 16:23:18 UTC (rev 12460) +++ stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2010-06-10 16:27:46 UTC (rev 12461) @@ -63,4 +63,4 @@ set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/wsdl4j.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/native/trunk/modules/resources/src/main/resources/bin/wsprovide.sh =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2010-06-10 16:23:18 UTC (rev 12460) +++ stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2010-06-10 16:27:46 UTC (rev 12461) @@ -100,6 +100,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/native/trunk/modules/testsuite/framework-tests/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/framework-tests/pom.xml 2010-06-10 16:23:18 UTC (rev 12460) +++ stack/native/trunk/modules/testsuite/framework-tests/pom.xml 2010-06-10 16:27:46 UTC (rev 12461) @@ -97,7 +97,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.output.dir" value="{log4j.output.dir}"/> + <property name="log4j.conf" value="${basedir}/src/test/etc/log4j.xml" /> + <property name="log4j.output.dir" value="${log4j.output.dir}"/> <property name="jboss.home" value="${jboss.home}"/> <ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume" /> </tasks> @@ -114,7 +115,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.output.dir" value="{log4j.output.dir}"/> + <property name="log4j.conf" value="${basedir}/src/test/etc/log4j.xml" /> + <property name="log4j.output.dir" value="${log4j.output.dir}"/> <property name="jboss.home" value="${jboss.home}"/> <ant antfile="scripts/antrun-wsprovide.xml" target="wsprovide"/> <ant antfile="src/test/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" /> Modified: stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml =================================================================== --- stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml 2010-06-10 16:23:18 UTC (rev 12460) +++ stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml 2010-06-10 16:27:46 UTC (rev 12461) @@ -21,6 +21,7 @@ package="org.jboss.test.ws.jaxws.complex" outputDir="${tests.output.dir}" jbossHome="${jboss.home}" + log4jConf="${log4j.conf}" loggingDir="${log4j.output.dir}" /> @@ -29,6 +30,7 @@ package="org.jboss.test.ws.jaxws.holder" outputDir="${tests.output.dir}" jbossHome="${jboss.home}" + log4jConf="${log4j.conf}" loggingDir="${log4j.output.dir}" /> @@ -40,6 +42,7 @@ <attribute name="package"/> <attribute name="outputDir"/> <attribute name="jbossHome"/> + <attribute name="log4jConf"/> <attribute name="loggingDir"/> <sequential> @@ -55,6 +58,7 @@ fork="true" <jvmarg line="-Djava.endorsed.dirs=@{jbossHome}/lib/endorsed"/> + <jvmarg line="-Dlog4j.configuration=file://@{log4jConf}"/> <jvmarg line="-Dlog4j.output.dir=@{loggingDir}"/> </wsconsume> </sequential> Modified: stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsprovide.xml =================================================================== --- stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsprovide.xml 2010-06-10 16:23:18 UTC (rev 12460) +++ stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsprovide.xml 2010-06-10 16:27:46 UTC (rev 12461) @@ -21,6 +21,7 @@ destdir="jaxws/jbws2960" jbossHome="${jboss.home}" outputDir="${tests.output.dir}" + log4jConf="${log4j.conf}" loggingDir="${log4j.output.dir}" resourcesDir="jaxws/jbws2960" /> @@ -33,6 +34,7 @@ <attribute name="destDir"/> <attribute name="jbossHome"/> <attribute name="outputDir"/> + <attribute name="log4jConf"/> <attribute name="loggingDir"/> <attribute name="resourcesDir"/> @@ -47,6 +49,7 @@ resourcedestdir="@{outputDir}/test-resources/@{resourcesDir}" <jvmarg line="-Djava.endorsed.dirs=@{jbossHome}/lib/endorsed"/> + <jvmarg line="-Dlog4j.configuration=file://@{log4jConf}"/> <jvmarg line="-Dlog4j.output.dir=@{loggingDir}"/> </wsprovide> </sequential> Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/pom.xml 2010-06-10 16:23:18 UTC (rev 12460) +++ stack/native/trunk/modules/testsuite/native-tests/pom.xml 2010-06-10 16:27:46 UTC (rev 12461) @@ -54,6 +54,7 @@ <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}"/> <property name="jboss.home" value="${jboss.home}"/> <ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume" /> @@ -89,6 +90,7 @@ <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="jboss.home" value="${jboss.home}"/> <ant antfile="scripts/antrun-wsprovide.xml" target="wsprovide" /> Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml 2010-06-10 16:23:18 UTC (rev 12460) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml 2010-06-10 16:27:46 UTC (rev 12461) @@ -21,6 +21,7 @@ package="org.jboss.test.ws.benchmark.jaxws.doclit" outputDir="${tests.output.dir}" jbossHome="${jboss.home}" + log4jConf="${log4j.conf}" loggingDir="${log4j.output.dir}" /> @@ -29,6 +30,7 @@ package="org.jboss.test.ws.interop.soapwsdl.basedoclitb" outputDir="${tests.output.dir}" jbossHome="${jboss.home}" + log4jConf="${log4j.conf}" loggingDir="${log4j.output.dir}" /> @@ -37,6 +39,7 @@ package="org.jboss.test.ws.interop.soapwsdl.basedoclitw" outputDir="${tests.output.dir}" jbossHome="${jboss.home}" + log4jConf="${log4j.conf}" loggingDir="${log4j.output.dir}" /> @@ -45,6 +48,7 @@ package="org.jboss.test.ws.interop.soapwsdl.baserpclit" outputDir="${tests.output.dir}" jbossHome="${jboss.home}" + log4jConf="${log4j.conf}" loggingDir="${log4j.output.dir}" /> @@ -53,6 +57,7 @@ package="org.jboss.test.ws.jaxws.samples.wssecuritypolicy" outputDir="${tests.output.dir}" jbossHome="${jboss.home}" + log4jConf="${log4j.conf}" loggingDir="${log4j.output.dir}" /> @@ -61,6 +66,7 @@ package="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy" outputDir="${tests.output.dir}" jbossHome="${jboss.home}" + log4jConf="${log4j.conf}" loggingDir="${log4j.output.dir}" /> @@ -69,6 +75,7 @@ package="org.jboss.test.ws.jaxws.samples.wssecurity" outputDir="${tests.output.dir}" jbossHome="${jboss.home}" + log4jConf="${log4j.conf}" loggingDir="${log4j.output.dir}" /> @@ -80,6 +87,7 @@ <attribute name="package"/> <attribute name="outputDir"/> <attribute name="jbossHome"/> + <attribute name="log4jConf"/> <attribute name="loggingDir"/> <sequential> @@ -95,6 +103,7 @@ fork="true" <jvmarg line="-Djava.endorsed.dirs=@{jbossHome}/lib/endorsed"/> + <jvmarg line="-Dlog4j.configuration=file://@{log4jConf}"/> <jvmarg line="-Dlog4j.output.dir=@{loggingDir}"/> </wsconsume> </sequential> Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml 2010-06-10 16:23:18 UTC (rev 12460) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml 2010-06-10 16:27:46 UTC (rev 12461) @@ -22,6 +22,7 @@ destDir="" jbossHome="${jboss.home}" outputDir="${tests.output.dir}" + log4jConf="${log4j.conf}" loggingDir="${log4j.output.dir}" resourcesDir="wsprovide/jaxws/samples/wssecurity" /> @@ -31,6 +32,7 @@ destDir="" jbossHome="${jboss.home}" outputDir="${tests.output.dir}" + log4jConf="${log4j.conf}" loggingDir="${log4j.output.dir}" resourcesDir="wsprovide/jaxws/samples/wssecurityAnnotatedpolicy" /> @@ -43,6 +45,7 @@ <attribute name="destDir"/> <attribute name="jbossHome"/> <attribute name="outputDir"/> + <attribute name="log4jConf"/> <attribute name="loggingDir"/> <attribute name="resourcesDir"/> @@ -57,6 +60,7 @@ resourcedestdir="@{outputDir}/test-resources/@{resourcesDir}" <jvmarg line="-Djava.endorsed.dirs=@{jbossHome}/lib/endorsed"/> + <jvmarg line="-Dlog4j.configuration=file://@{log4jConf}"/> <jvmarg line="-Dlog4j.output.dir=@{loggingDir}"/> </wsprovide> </sequential>