[jbossws-commits] JBossWS SVN: r3339 - in trunk/integration: sunri/src/main/resources/jbossws-sunri-client.jar/META-INF/services and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: heiko.braun at jboss.com
Date: 2007-05-31 10:30:59 -0400 (Thu, 31 May 2007)
New Revision: 3339

Modified:
   trunk/integration/spi/etc/wsconsume.sh
   trunk/integration/spi/etc/wsprovide.sh
   trunk/integration/sunri/src/main/resources/jbossws-sunri-client.jar/META-INF/services/org.jboss.wsf.tools.ProviderFactoryImpl
Log:
Dynmic wsprovide classpath depending on the stack that's deployed

Modified: trunk/integration/spi/etc/wsconsume.sh
===================================================================
--- trunk/integration/spi/etc/wsconsume.sh	2007-05-31 14:21:01 UTC (rev 3338)
+++ trunk/integration/spi/etc/wsconsume.sh	2007-05-31 14:30:59 UTC (rev 3339)
@@ -38,7 +38,7 @@
 fi
 
 #JPDA options. Uncomment and modify as appropriate to enable remote debugging .
-#AVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y $JAVA_OPTS"
+#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y $JAVA_OPTS"
 
 # Setup JBoss sepecific properties
 JAVA_OPTS="$JAVA_OPTS"

Modified: trunk/integration/spi/etc/wsprovide.sh
===================================================================
--- trunk/integration/spi/etc/wsprovide.sh	2007-05-31 14:21:01 UTC (rev 3338)
+++ trunk/integration/spi/etc/wsprovide.sh	2007-05-31 14:30:59 UTC (rev 3339)
@@ -46,25 +46,44 @@
 # Setup the java endorsed dirs
 JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed"
 
-# Setup the wstools classpath
+# is it a JBossWS-native or SunRI installation?
+if [ -a $JBOSS_HOME/client/jbossws-client.jar ]; then
+    JBOSSWS_NATIVE="true"
+fi
+
+#
+# Setup the wsprovide classpath
+# The classpath is dynamically build depending on the stack that
+# is deployed. See $JBOSSWS_NATIVE above.
+#
+
+# shared libs
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-spi.jar"
 WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/activation.jar"
 WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/getopt.jar"
 WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/log4j.jar"
 WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/mail.jar"
 
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-spi.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/javassist.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-jaxws.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-saaj.jar"
-
+# shared jaxws libs
 WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxb-api.jar"
 WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxb-impl.jar"
 WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxb-xjc.jar"
 
+# stack specific dependencies
+if [ "x$JBOSSWS_NATIVE" = "x" ]; then
+   echo "Seems to be a Sun-RI stack deployed"
+   WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-sunri-client.jar"
+else
+   echo "Seems to be a JBossWS-Native stack deployed"	
+	WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar"
+   WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/javassist.jar"
+   WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar"
+   WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar"
+   WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-jaxws.jar"
+   WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc.jar"
+   WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-saaj.jar"   
+fi
+
 # For Cygwin, switch paths to Windows format before running java
 if $cygwin; then
     JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"`

Modified: trunk/integration/sunri/src/main/resources/jbossws-sunri-client.jar/META-INF/services/org.jboss.wsf.tools.ProviderFactoryImpl
===================================================================
--- trunk/integration/sunri/src/main/resources/jbossws-sunri-client.jar/META-INF/services/org.jboss.wsf.tools.ProviderFactoryImpl	2007-05-31 14:21:01 UTC (rev 3338)
+++ trunk/integration/sunri/src/main/resources/jbossws-sunri-client.jar/META-INF/services/org.jboss.wsf.tools.ProviderFactoryImpl	2007-05-31 14:30:59 UTC (rev 3339)
@@ -1 +1 @@
-TODO:SUNRIProviderImpl
\ No newline at end of file
+FIXME: JBWS-1667 (Implement WSContractProvider for Sun-RI integration)
\ No newline at end of file