Author: richard.opalka(a)jboss.com Date: 2009-08-03 02:52:31 -0400 (Mon, 03 Aug 2009) New Revision: 10449 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/wstools.bat stack/native/trunk/modules/resources/src/main/resources/bin/wstools.sh stack/native/trunk/modules/testsuite/native-tests/pom.xml stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java Log: fixing tests and tools against AS trunk Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.bat =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2009-07-31 21:33:03 UTC (rev 10448) +++ stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2009-08-03 06:52:31 UTC (rev 10449) @@ -19,6 +19,7 @@ set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/activation.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/getopt.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/wstx.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/wstx-lgpl.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/mail.jar Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.sh =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2009-07-31 21:33:03 UTC (rev 10448) +++ stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2009-08-03 06:52:31 UTC (rev 10449) @@ -53,6 +53,7 @@ WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/activation.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/getopt.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/wstx.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/wstx-lgpl.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/log4j.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/mail.jar" Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wstools.bat =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/bin/wstools.bat 2009-07-31 21:33:03 UTC (rev 10448) +++ stack/native/trunk/modules/resources/src/main/resources/bin/wstools.bat 2009-08-03 06:52:31 UTC (rev 10449) @@ -20,6 +20,7 @@ set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/getopt.jar set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/netty.jar set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/wstx.jar +set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/wstx-lgpl.jar set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/wsdl4j.jar set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wstools.sh =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/bin/wstools.sh 2009-07-31 21:33:03 UTC (rev 10448) +++ stack/native/trunk/modules/resources/src/main/resources/bin/wstools.sh 2009-08-03 06:52:31 UTC (rev 10449) @@ -50,6 +50,7 @@ WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/getopt.jar" WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/netty.jar" WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/wstx.jar" +WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/wstx-lgpl.jar" WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/wsdl4j.jar" WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar" WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/log4j.jar" Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/pom.xml 2009-07-31 21:33:03 UTC (rev 10448) +++ stack/native/trunk/modules/testsuite/native-tests/pom.xml 2009-08-03 06:52:31 UTC (rev 10449) @@ -27,6 +27,12 @@ <version>1.1.0.Beta5</version> <scope>test</scope> <type>sar</type> + <exclusions> + <exclusion> + <groupId>jboss</groupId> + <artifactId>jboss-common-logging-log4j</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2009-07-31 21:33:03 UTC (rev 10448) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2009-08-03 06:52:31 UTC (rev 10449) @@ -74,6 +74,9 @@ cp.append(PS + jbc + FS + "jbossws-native-client.jar"); cp.append(PS + jbc + FS + "jboss-common-core.jar"); cp.append(PS + jbc + FS + "jboss-logging-spi.jar"); + cp.append(PS + jbc + FS + "jcl-over-slf4j.jar"); + cp.append(PS + jbc + FS + "slf4j-api.jar"); + cp.append(PS + jbc + FS + "slf4j-jboss-logging.jar"); Runtime rt = Runtime.getRuntime();