Author: alessio.soldano(a)jboss.com Date: 2008-05-13 06:38:03 -0400 (Tue, 13 May 2008) New Revision: 7015 Modified: framework/trunk/src/main/etc/wsconsume.bat framework/trunk/src/main/etc/wsconsume.sh framework/trunk/src/main/etc/wsprovide.bat framework/trunk/src/main/etc/wsprovide.sh Log: Fixing wsconsume and wsprovide with the current native deployed files' name Modified: framework/trunk/src/main/etc/wsconsume.bat =================================================================== --- framework/trunk/src/main/etc/wsconsume.bat 2008-05-13 07:01:18 UTC (rev 7014) +++ framework/trunk/src/main/etc/wsconsume.bat 2008-05-13 10:38:03 UTC (rev 7015) @@ -50,7 +50,7 @@ set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/stax-ex.jar rem stack specific dependencies -if exist %JBOSS_HOME%/client/jbossws-client.jar goto else +if exist %JBOSS_HOME%/client/jbossws-native-client.jar goto else rem JBossWS-Metro stack libraries echo JBossWS-Metro stack deployed set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-metro-client.jar @@ -60,10 +60,11 @@ echo JBossWS-Native stack deployed set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/javassist.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar - set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar - set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxws.jar - set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxrpc.jar - set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-saaj.jar + set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-client.jar + set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-core.jar + set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-jaxws.jar + set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-jaxrpc.jar + set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-saaj.jar :endif rem Execute the JVM Modified: framework/trunk/src/main/etc/wsconsume.sh =================================================================== --- framework/trunk/src/main/etc/wsconsume.sh 2008-05-13 07:01:18 UTC (rev 7014) +++ framework/trunk/src/main/etc/wsconsume.sh 2008-05-13 10:38:03 UTC (rev 7015) @@ -66,7 +66,7 @@ fi # is it a JBossWS-native or SunRI installation? -if [ -f $LIBDIR/jbossws-client.jar ]; then +if [ -f $LIBDIR/jbossws-native-client.jar ]; then JBOSSWS_NATIVE="true" fi @@ -109,10 +109,11 @@ echo "JBossWS-Native stack deployed" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/javassist.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-xml-binding.jar" - WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-client.jar" - WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-jaxws.jar" - WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-jaxrpc.jar" - WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-saaj.jar" + WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-native-client.jar" + WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-native-core.jar" + WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-native-jaxws.jar" + WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-native-jaxrpc.jar" + WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-native-saaj.jar" fi ### Modified: framework/trunk/src/main/etc/wsprovide.bat =================================================================== --- framework/trunk/src/main/etc/wsprovide.bat 2008-05-13 07:01:18 UTC (rev 7014) +++ framework/trunk/src/main/etc/wsprovide.bat 2008-05-13 10:38:03 UTC (rev 7015) @@ -48,7 +48,7 @@ set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/stax-ex.jar rem stack specific dependencies -if exist %JBOSS_HOME%/client/jbossws-client.jar goto else +if exist %JBOSS_HOME%/client/jbossws-native-client.jar goto else rem JBossWS-Metro stack libraries echo JBossWS-Metro stack deployed set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-metro-client.jar @@ -63,10 +63,11 @@ set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/javassist.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar - set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar - set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxws.jar - set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxrpc.jar - set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-saaj.jar + set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-client.jar + set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-core.jar + set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-jaxws.jar + set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-jaxrpc.jar + set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-saaj.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/policy.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/wsdl4j.jar :endif Modified: framework/trunk/src/main/etc/wsprovide.sh =================================================================== --- framework/trunk/src/main/etc/wsprovide.sh 2008-05-13 07:01:18 UTC (rev 7014) +++ framework/trunk/src/main/etc/wsprovide.sh 2008-05-13 10:38:03 UTC (rev 7015) @@ -66,7 +66,7 @@ fi # is it a JBossWS-native or SunRI installation? -if [ -f $LIBDIR/jbossws-client.jar ]; then +if [ -f $LIBDIR/jbossws-native-client.jar ]; then JBOSSWS_NATIVE="true" fi @@ -112,10 +112,11 @@ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-xml-binding.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/javassist.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossall-client.jar" - WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-client.jar" - WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-jaxws.jar" - WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-jaxrpc.jar" - WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-saaj.jar" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-native-client.jar" + WSPROVIDE_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-native-core.jar" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-native-jaxws.jar" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-native-jaxrpc.jar" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-native-saaj.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/policy.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/wsdl4j.jar" fi