[jbossws-commits] JBossWS SVN: r3355 - in trunk/integration: sunri/ant-import and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: heiko.braun at jboss.com
Date: 2007-06-01 04:22:21 -0400 (Fri, 01 Jun 2007)
New Revision: 3355

Modified:
   trunk/integration/spi/etc/wsprovide.sh
   trunk/integration/sunri/ant-import/macros-deploy-sunri.xml
Log:
Additional binary dependencies for SunRIProviderImpl

Modified: trunk/integration/spi/etc/wsprovide.sh
===================================================================
--- trunk/integration/spi/etc/wsprovide.sh	2007-06-01 07:15:13 UTC (rev 3354)
+++ trunk/integration/spi/etc/wsprovide.sh	2007-06-01 08:22:21 UTC (rev 3355)
@@ -79,6 +79,10 @@
 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"
+   WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxws-api.jar"
+   WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jsr181-api.jar"
+   WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/saaj-api.jar"
+   WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/saaj-impl.jar"
 else
    echo "Seems to be a JBossWS-Native stack deployed"	
 	WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar"

Modified: trunk/integration/sunri/ant-import/macros-deploy-sunri.xml
===================================================================
--- trunk/integration/sunri/ant-import/macros-deploy-sunri.xml	2007-06-01 07:15:13 UTC (rev 3354)
+++ trunk/integration/sunri/ant-import/macros-deploy-sunri.xml	2007-06-01 08:22:21 UTC (rev 3355)
@@ -24,6 +24,8 @@
 		<attribute name="thirdpartylibs"/>
 		<sequential>
 			<fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
+
+			<!-- CLIENT JARS -->
 			<copy todir="${jboss50.home}/client" overwrite="true">
 				<fileset dir="@{spilibs}">
 					<include name="jbossws-spi.jar"/>
@@ -40,20 +42,28 @@
 					<include name="jaxb-xjc.jar"/>
 					<include name="jaxws-tools.jar"/>
 					<include name="jaxws-rt.jar"/>
+					<include name="jaxws-api.jar"/>
+					<include name="jsr181-api.jar"/>
+					<include name="saaj-api.jar"/>
+					<include name="saaj-impl.jar"/>
 				</fileset>
 			</copy>
+
+			<!--SERVER JARS -->
+			<copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true">
+				<fileset dir="@{jbosslibs}">
+					<include name="jbossws-jboss50.jar"/>
+				</fileset>
+			</copy>
+
+			<!-- BOOTSTRAP JARS -->
 			<copy todir="${jboss50.home}/lib" overwrite="true">
 				<fileset dir="@{thirdpartylibs}">
 					<include name="jaxb-api.jar"/>
 					<include name="jaxb-impl.jar"/>
 				</fileset>
 			</copy>
-			<copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true">
-				<fileset dir="@{jbosslibs}">
-					<include name="jbossws-jboss50.jar"/>
-				</fileset>
-			</copy>
-
+			
 			<mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
 			<unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="@{stacklibs}/jbossws-sunri50-deployer.zip"/>
 			<mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
@@ -69,16 +79,25 @@
 	<macrodef name="macro-undeploy-sunri50">
 		<sequential>
 			<delete>
+
+				<!-- CLIENT JARS -->
 				<fileset dir="${jboss50.home}/client">
 					<include name="jaxb-api.jar"/>
 					<include name="jaxb-impl.jar"/>
 					<include name="jaxb-xjc.jar"/>
 					<include name="jaxws-tools.jar"/>
 					<include name="jaxws-rt.jar"/>
+					<include name="jaxws-api.jar"/>
+					<include name="jsr181-api.jar"/>
+					<include name="saaj-api.jar"/>
+					<include name="saaj-impl.jar"/>
+
 					<include name="jbossws-jboss50.jar"/>
 					<include name="jbossws-spi.jar"/>
 					<include name="jbossws-sunri-client.jar"/>
 				</fileset>
+
+				<!-- SERVER JARS -->
 				<fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib">
 					<include name="jbossws-jboss50.jar"/>
 				</fileset>
@@ -112,6 +131,10 @@
 					<include name="jaxb-xjc.jar"/>
 					<include name="jaxws-tools.jar"/>
 					<include name="jaxws-rt.jar"/>
+					<include name="jaxws-api.jar"/>
+					<include name="jsr181-api.jar"/>
+					<include name="saaj-api.jar"/>
+					<include name="saaj-impl.jar"/>
 				</fileset>
 			</copy>
 			<copy todir="${jboss42.home}/lib" overwrite="true">
@@ -143,6 +166,11 @@
 					<include name="jaxb-xjc.jar"/>
 					<include name="jaxws-tools.jar"/>
 					<include name="jaxws-rt.jar"/>
+					<include name="jaxws-api.jar"/>
+					<include name="jsr181-api.jar"/>
+					<include name="saaj-api.jar"/>
+					<include name="saaj-impl.jar"/>
+
 					<include name="jbossws-jboss42.jar"/>
 					<include name="jbossws-spi.jar"/>
 					<include name="jbossws-sunri-client.jar"/>