[jbossws-commits] JBossWS SVN: r3786 - branches/jbossws-2.0/integration/native/ant-import.

jbossws-commits at lists.jboss.org jbossws-commits at lists.jboss.org
Mon Jul 2 11:10:48 EDT 2007


Author: heiko.braun at jboss.com
Date: 2007-07-02 11:10:47 -0400 (Mon, 02 Jul 2007)
New Revision: 3786

Modified:
   branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml
Log:
Update wsdl4j and jbossxb for 4.0.5 installations

Modified: branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml
===================================================================
--- branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml	2007-07-02 13:27:15 UTC (rev 3785)
+++ branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml	2007-07-02 15:10:47 UTC (rev 3786)
@@ -13,384 +13,395 @@
 
 <project>
 
-	<!-- ================================================================== -->
-	<!-- Deployment  JBossWS/Native                                         -->
-	<!-- ================================================================== -->
+   <!-- ================================================================== -->
+   <!-- Deployment  JBossWS/Native                                         -->
+   <!-- ================================================================== -->
 
-	<macrodef name="macro-deploy-native50">
-		<attribute name="spilibs"/>
-		<attribute name="jbosslibs"/>
-		<attribute name="corelibs"/>
-		<attribute name="stacklibs"/>
-		<attribute name="thirdpartylibs"/>
-		<sequential>
-			<fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
+   <macrodef name="macro-deploy-native50">
+      <attribute name="spilibs"/>
+      <attribute name="jbosslibs"/>
+      <attribute name="corelibs"/>
+      <attribute name="stacklibs"/>
+      <attribute name="thirdpartylibs"/>
+      <sequential>
+         <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
 
-      <!-- BIN SCRIPTS -->
-      <unzip dest="${jboss50.home}/bin" src="@{corelibs}/jbossws-core-scripts.zip"/>
-			<chmod dir="${jboss50.home}/bin" perm="+x" includes="*.sh"/>
-      
-			<!-- CLIENT JARS -->
-			<copy todir="${jboss50.home}/client" overwrite="true">				
-				<fileset dir="@{jbosslibs}">
-					<include name="jbossws-jboss50.jar"/>
-				</fileset>
-				<fileset dir="@{corelibs}">
-					<include name="jboss-jaxrpc.jar"/>
-					<include name="jboss-jaxws.jar"/>
-					<include name="jboss-saaj.jar"/>
-					<include name="jbossws-client.jar"/>
-				</fileset>
-				<fileset dir="@{thirdpartylibs}">
-					<include name="policy.jar"/>
-					<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="stax-ex.jar"/>
-					<include name="streambuffer.jar"/>
-					<include name="wsdl4j.jar"/>
-				</fileset>
-			</copy>
-			<copy todir="${jboss50.home}/lib" overwrite="true">
-				<fileset dir="@{thirdpartylibs}">
-					<include name="jaxb-api.jar"/>
-					<include name="jaxb-impl.jar"/>
-				</fileset>
-			</copy>
+         <!-- BIN SCRIPTS -->
+         <unzip dest="${jboss50.home}/bin" src="@{corelibs}/jbossws-core-scripts.zip"/>
+         <chmod dir="${jboss50.home}/bin" perm="+x" includes="*.sh"/>
 
-			<!-- SERVER JARS -->
-			<copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true">
-				<fileset dir="@{jbosslibs}">
-					<include name="jbossws-jboss50.jar"/>
-				</fileset>
-				<fileset dir="@{corelibs}">
-					<include name="jboss-jaxrpc.jar"/>
-					<include name="jboss-jaxws.jar"/>
-					<include name="jboss-saaj.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-native50-deployer.zip"/>
-			<mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
-			<unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native50.sar"/>
-			<mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
-			<unzip dest="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
-		</sequential>
-	</macrodef>
+         <!-- CLIENT JARS -->
+         <copy todir="${jboss50.home}/client" overwrite="true">
+            <fileset dir="@{jbosslibs}">
+               <include name="jbossws-jboss50.jar"/>
+            </fileset>
+            <fileset dir="@{corelibs}">
+               <include name="jboss-jaxrpc.jar"/>
+               <include name="jboss-jaxws.jar"/>
+               <include name="jboss-saaj.jar"/>
+               <include name="jbossws-client.jar"/>
+            </fileset>
+            <fileset dir="@{thirdpartylibs}">
+               <include name="policy.jar"/>
+               <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="stax-ex.jar"/>
+               <include name="streambuffer.jar"/>
+               <include name="wsdl4j.jar"/>
+            </fileset>
+         </copy>
+         <copy todir="${jboss50.home}/lib" overwrite="true">
+            <fileset dir="@{thirdpartylibs}">
+               <include name="jaxb-api.jar"/>
+               <include name="jaxb-impl.jar"/>
+            </fileset>
+         </copy>
 
-	<macrodef name="macro-undeploy-native50">
-		<sequential>
-			<fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
-      
-			<delete>
-        <!-- BIN SCRIPTS -->
-				<fileset dir="${jboss50.home}/bin">
-					<include name="wsconsume.*"/>
-					<include name="wsprovide.*"/>
-					<include name="wsrunclient.*"/>
-					<include name="wstools.*"/>
-				</fileset>
-        
-				<!-- 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="jboss-jaxrpc.jar"/>
-					<include name="jboss-jaxws.jar"/>
-					<include name="jboss-saaj.jar"/>
-					<include name="jbossws-client.jar"/>
-					<include name="jbossws-jboss50.jar"/>					
-					<include name="policy.jar"/>
-					<include name="stax-ex.jar"/>
-					<include name="streambuffer.jar"/>
-					<include name="wsdl4j.jar"/>
-          <!-- Remove only, do not deploy -->
-					<include name="jbossws-wsconsume-impl.jar"/>
-				</fileset>
+         <!-- SERVER JARS -->
+         <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true">
+            <fileset dir="@{jbosslibs}">
+               <include name="jbossws-jboss50.jar"/>
+            </fileset>
+            <fileset dir="@{corelibs}">
+               <include name="jboss-jaxrpc.jar"/>
+               <include name="jboss-jaxws.jar"/>
+               <include name="jboss-saaj.jar"/>
+            </fileset>
+         </copy>
 
-				<!-- SERVER JARS -->
-				<fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib">					
-					<include name="jbossws-jboss50.jar"/>
-					<include name="jboss-jaxrpc.jar"/>
-					<include name="jboss-jaxws.jar"/>
-					<include name="jboss-saaj.jar"/>
-				</fileset>
-			</delete>
-			<delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
-			<delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
-			<delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
-		</sequential>
-	</macrodef>
+         <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-native50-deployer.zip"/>
+         <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+         <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native50.sar"/>
+         <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+         <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+      </sequential>
+   </macrodef>
 
-	<macrodef name="macro-deploy-native42">
-		<attribute name="spilibs"/>
-		<attribute name="jbosslibs"/>
-		<attribute name="corelibs"/>
-		<attribute name="stacklibs"/>
-		<attribute name="thirdpartylibs"/>
-		<sequential>
-			<fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
-      
-      <!-- BIN SCRIPTS -->
-      <unzip dest="${jboss42.home}/bin" src="@{corelibs}/jbossws-core-scripts.zip"/>
-			<chmod dir="${jboss42.home}/bin" perm="+x" includes="*.sh"/>
-      
-			<!-- CLIENT JARS -->
-			<copy todir="${jboss42.home}/client" overwrite="true">							
-				<fileset dir="@{jbosslibs}">
-					<include name="jbossws-jboss42.jar"/>
-				</fileset>
-				<fileset dir="@{corelibs}">
-					<include name="jboss-jaxrpc.jar"/>
-					<include name="jboss-jaxws.jar"/>
-					<include name="jboss-saaj.jar"/>
-					<include name="jbossws-client.jar"/>
-				</fileset>
-				<fileset dir="@{thirdpartylibs}">
-					<include name="policy.jar"/>				  
-					<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="stax-ex.jar"/>
-					<include name="streambuffer.jar"/>
-					<include name="wsdl4j.jar"/>
-				</fileset>
-			</copy>
-      
-	    <!-- SERVER JARS -->
-			<copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true">												
-				<fileset dir="@{jbosslibs}">
-					<include name="jbossws-jboss42.jar"/>
-				</fileset>
-			</copy>
+   <macrodef name="macro-undeploy-native50">
+      <sequential>
+         <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
 
-			<mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
-			<unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native42.sar"/>
-			<mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
-			<unzip dest="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
-		</sequential>
-	</macrodef>
+         <delete>
+            <!-- BIN SCRIPTS -->
+            <fileset dir="${jboss50.home}/bin">
+               <include name="wsconsume.*"/>
+               <include name="wsprovide.*"/>
+               <include name="wsrunclient.*"/>
+               <include name="wstools.*"/>
+            </fileset>
 
-	<macrodef name="macro-undeploy-native42">
-		<sequential>
-			<fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
-			<delete>
-        
-        <!-- BIN SCRIPTS -->
-				<fileset dir="${jboss42.home}/bin">
-					<include name="wsconsume.*"/>
-					<include name="wsprovide.*"/>
-					<include name="wsrunclient.*"/>
-					<include name="wstools.*"/>
-				</fileset>
-        
-  			<!-- CLIENT JARS -->
-				<fileset dir="${jboss42.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="jboss-jaxrpc.jar"/>
-					<include name="jboss-jaxws.jar"/>
-					<include name="jboss-saaj.jar"/>
-					<include name="jbossws-client.jar"/>
-					<include name="jbossws-jboss42.jar"/>					
-					<include name="policy.jar"/>
-					<include name="stax-ex.jar"/>
-					<include name="streambuffer.jar"/>
-					<include name="wsdl4j.jar"/>
-          <!-- Remove only, do not deploy -->
-					<include name="jbossws-wsconsume-impl.jar"/>
-				</fileset>
-        
-        <!-- SERVER JARS -->
-				<fileset dir="${jboss42.home}/lib/endorsed">
-					<include name="jaxb-api.jar"/>
-				</fileset>
-				<fileset dir="${jboss42.home}/lib">
-          <!-- Remove only, do not deploy -->
-					<include name="jbossws-integration.jar"/>
-				</fileset>
-				<fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib">					
-					<include name="jbossws-jboss42.jar"/>
-					<include name="jboss-jaxrpc.jar"/>
-					<include name="jboss-jaxws.jar"/>
-					<include name="jboss-saaj.jar"/>
-				</fileset>
-			</delete>
-			<delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
-			<delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
-		</sequential>
-	</macrodef>
+            <!-- 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="jboss-jaxrpc.jar"/>
+               <include name="jboss-jaxws.jar"/>
+               <include name="jboss-saaj.jar"/>
+               <include name="jbossws-client.jar"/>
+               <include name="jbossws-jboss50.jar"/>
+               <include name="policy.jar"/>
+               <include name="stax-ex.jar"/>
+               <include name="streambuffer.jar"/>
+               <include name="wsdl4j.jar"/>
+               <!-- Remove only, do not deploy -->
+               <include name="jbossws-wsconsume-impl.jar"/>
+            </fileset>
 
-	<macrodef name="macro-deploy-native40">
-		<attribute name="spilibs"/>
-		<attribute name="jbosslibs"/>
-		<attribute name="corelibs"/>
-		<attribute name="stacklibs"/>
-		<attribute name="thirdpartylibs"/>
-		<sequential>
-			<fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/>
-      
-      <!-- BIN SCRIPTS -->
-      <unzip dest="${jboss40.home}/bin" src="@{corelibs}/jbossws-core-scripts.zip"/>
-			<chmod dir="${jboss40.home}/bin" perm="+x" includes="*.sh"/>
-      
-			<!-- CLIENT JARS -->
-			<copy todir="${jboss40.home}/client" overwrite="true">							
-				<fileset dir="@{jbosslibs}">
-					<include name="jbossws-jboss40.jar"/>
-				</fileset>
-				<fileset dir="@{corelibs}">
-					<include name="jboss-jaxrpc.jar"/>
-					<include name="jboss-jaxws.jar"/>
-					<include name="jboss-saaj.jar"/>
-					<include name="jbossws-client.jar"/>
-				</fileset>
-				<fileset dir="@{thirdpartylibs}">
-					<include name="policy.jar"/>
-					<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="stax-api.jar"/>
-					<include name="stax-ex.jar"/>
-				  <include name="streambuffer.jar"/>
-					<include name="wsdl4j.jar"/>
-				</fileset>
-			</copy>
-      
-  		<!-- SERVER JARS -->
-			<copy todir="${jboss40.home}/server/${jboss.server.instance}/lib" overwrite="true">												
-				<fileset dir="@{jbosslibs}">
-					<include name="jbossws-jboss40.jar"/>
-				</fileset>
-				<fileset dir="@{corelibs}">
-					<include name="jboss-jaxrpc.jar"/>
-					<include name="jboss-jaxws.jar"/>
-					<include name="jboss-saaj.jar"/>
-				</fileset>
-			</copy>
+            <!-- SERVER JARS -->
+            <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib">
+               <include name="jbossws-jboss50.jar"/>
+               <include name="jboss-jaxrpc.jar"/>
+               <include name="jboss-jaxws.jar"/>
+               <include name="jboss-saaj.jar"/>
+            </fileset>
+         </delete>
+         <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
+         <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+         <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+      </sequential>
+   </macrodef>
 
-			<mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
-			<unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native40.sar"/>
-			<mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
-			<unzip dest="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>	
-		</sequential>
-	</macrodef>
-  
-  <macrodef name="macro-setup-native40-no-ejb3">
-		<sequential>
-      
-			<move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service-ejb3.xml"
-			  file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service.xml"/>
-			<move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service.xml"
-			  file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service-no-ejb3.xml"/>
-      
-			<move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans-ejb3.xml"
-			  file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans.xml"/>
-			<move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans.xml"
-			  file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml"/>
-      
-		</sequential>
-	</macrodef>
+   <macrodef name="macro-deploy-native42">
+      <attribute name="spilibs"/>
+      <attribute name="jbosslibs"/>
+      <attribute name="corelibs"/>
+      <attribute name="stacklibs"/>
+      <attribute name="thirdpartylibs"/>
+      <sequential>
+         <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
 
-	<macrodef name="macro-undeploy-native40">
-		<sequential>
-			<fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/>
-			<delete>
-        
-        <!-- BIN SCRIPTS -->
-				<fileset dir="${jboss40.home}/bin">
-					<include name="wsconsume.*"/>
-					<include name="wsprovide.*"/>
-					<include name="wsrunclient.*"/>
-					<include name="wstools.*"/>
-				</fileset>
-        
-  			<!-- CLIENT JARS -->
-				<fileset dir="${jboss40.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="jboss-jaxrpc.jar"/>
-					<include name="jboss-jaxws.jar"/>
-					<include name="jboss-saaj.jar"/>
-					<include name="jbossws-client.jar"/>
-					<include name="jbossws-jboss40.jar"/>					
-					<include name="policy.jar"/>
-					<include name="stax-api.jar"/>
-					<include name="stax-ex.jar"/>
-					<include name="streambuffer.jar"/>
-					<include name="wsdl4j.jar"/>
-          <!-- Remove only, do not deploy -->
-					<include name="jbossws-wsconsume-impl.jar"/>
-					<include name="jbossws14-client.jar"/>
-				</fileset>
-        
-        <!-- SERVER JARS -->
-				<fileset dir="${jboss40.home}/lib">
-          <!-- Remove only, do not deploy -->
-					<include name="jbossws-integration.jar"/>
-				</fileset>
-				<fileset dir="${jboss40.home}/server/${jboss.server.instance}/lib">					
-					<include name="jbossws-jboss40.jar"/>
-					<include name="jboss-jaxrpc.jar"/>
-					<include name="jboss-jaxws.jar"/>
-					<include name="jboss-saaj.jar"/>
-				</fileset>
-			</delete>
-			<delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
-			<delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
-      <!-- Remove only, do not deploy -->
-			<delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/>
-		</sequential>
-	</macrodef>
-  
-  <!-- Deploy API jars to lib/endorsed for usage with jdk1.6 -->
-	<macrodef name="macro-deploy-endorsed">
-		<attribute name="jbosshome"/>
-		<attribute name="corelibs"/>
-		<attribute name="thirdpartylibs"/>
-		<sequential>
-			<copy todir="@{jbosshome}/lib/endorsed" overwrite="true">
-				<fileset dir="@{thirdpartylibs}">
-					<include name="jaxb-api.jar"/>
-				</fileset>
-				<fileset dir="@{corelibs}">
-					<include name="jboss-jaxrpc.jar"/>
-					<include name="jboss-jaxws.jar"/>
-					<include name="jboss-saaj.jar"/>
-				</fileset>
-			</copy>
-		</sequential>
-	</macrodef>
+         <!-- BIN SCRIPTS -->
+         <unzip dest="${jboss42.home}/bin" src="@{corelibs}/jbossws-core-scripts.zip"/>
+         <chmod dir="${jboss42.home}/bin" perm="+x" includes="*.sh"/>
 
-  <!-- Undeploy API jars from lib/endorsed -->
-	<macrodef name="macro-undeploy-endorsed">
-		<attribute name="jbosshome"/>
-		<sequential>
-			<delete>
-				<fileset dir="@{jbosshome}/lib/endorsed">
-					<include name="jaxb-api.jar"/>
-					<include name="jboss-jaxrpc.jar"/>
-					<include name="jboss-jaxws.jar"/>
-					<include name="jboss-saaj.jar"/>
-				</fileset>
-			</delete>
-		</sequential>
-	</macrodef>
+         <!-- CLIENT JARS -->
+         <copy todir="${jboss42.home}/client" overwrite="true">
+            <fileset dir="@{jbosslibs}">
+               <include name="jbossws-jboss42.jar"/>
+            </fileset>
+            <fileset dir="@{corelibs}">
+               <include name="jboss-jaxrpc.jar"/>
+               <include name="jboss-jaxws.jar"/>
+               <include name="jboss-saaj.jar"/>
+               <include name="jbossws-client.jar"/>
+            </fileset>
+            <fileset dir="@{thirdpartylibs}">
+               <include name="policy.jar"/>
+               <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="stax-ex.jar"/>
+               <include name="streambuffer.jar"/>
+               <include name="wsdl4j.jar"/>
+            </fileset>
+         </copy>
 
+         <!-- SERVER JARS -->
+         <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true">
+            <fileset dir="@{jbosslibs}">
+               <include name="jbossws-jboss42.jar"/>
+            </fileset>
+         </copy>
+
+         <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+         <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native42.sar"/>
+         <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+         <unzip dest="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+      </sequential>
+   </macrodef>
+
+   <macrodef name="macro-undeploy-native42">
+      <sequential>
+         <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
+         <delete>
+
+            <!-- BIN SCRIPTS -->
+            <fileset dir="${jboss42.home}/bin">
+               <include name="wsconsume.*"/>
+               <include name="wsprovide.*"/>
+               <include name="wsrunclient.*"/>
+               <include name="wstools.*"/>
+            </fileset>
+
+            <!-- CLIENT JARS -->
+            <fileset dir="${jboss42.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="jboss-jaxrpc.jar"/>
+               <include name="jboss-jaxws.jar"/>
+               <include name="jboss-saaj.jar"/>
+               <include name="jbossws-client.jar"/>
+               <include name="jbossws-jboss42.jar"/>
+               <include name="policy.jar"/>
+               <include name="stax-ex.jar"/>
+               <include name="streambuffer.jar"/>
+               <include name="wsdl4j.jar"/>
+               <!-- Remove only, do not deploy -->
+               <include name="jbossws-wsconsume-impl.jar"/>
+            </fileset>
+
+            <!-- SERVER JARS -->
+            <fileset dir="${jboss42.home}/lib/endorsed">
+               <include name="jaxb-api.jar"/>
+            </fileset>
+            <fileset dir="${jboss42.home}/lib">
+               <!-- Remove only, do not deploy -->
+               <include name="jbossws-integration.jar"/>
+            </fileset>
+            <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib">
+               <include name="jbossws-jboss42.jar"/>
+               <include name="jboss-jaxrpc.jar"/>
+               <include name="jboss-jaxws.jar"/>
+               <include name="jboss-saaj.jar"/>
+            </fileset>
+         </delete>
+         <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+         <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+      </sequential>
+   </macrodef>
+
+   <macrodef name="macro-deploy-native40">
+      <attribute name="spilibs"/>
+      <attribute name="jbosslibs"/>
+      <attribute name="corelibs"/>
+      <attribute name="stacklibs"/>
+      <attribute name="thirdpartylibs"/>
+      <sequential>
+         <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/>
+
+         <!-- BIN SCRIPTS -->
+         <unzip dest="${jboss40.home}/bin" src="@{corelibs}/jbossws-core-scripts.zip"/>
+         <chmod dir="${jboss40.home}/bin" perm="+x" includes="*.sh"/>
+
+         <copy todir="${jboss40.home}/lib" overwrite="true">
+            <fileset dir="@{thirdpartylibs}">
+               <include name="jboss-xml-binding.jar"/>
+            </fileset>
+         </copy>
+
+         <!-- CLIENT JARS -->
+         <copy todir="${jboss40.home}/client" overwrite="true">
+            <fileset dir="@{jbosslibs}">
+               <include name="jbossws-jboss40.jar"/>
+            </fileset>
+            <fileset dir="@{corelibs}">
+               <include name="jboss-jaxrpc.jar"/>
+               <include name="jboss-jaxws.jar"/>
+               <include name="jboss-saaj.jar"/>
+               <include name="jbossws-client.jar"/>
+            </fileset>
+            <fileset dir="@{thirdpartylibs}">
+               <include name="policy.jar"/>
+               <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="stax-api.jar"/>
+               <include name="stax-ex.jar"/>
+               <include name="streambuffer.jar"/>
+               <include name="wsdl4j.jar"/>
+               <include name="jboss-xml-binding.jar"/>
+            </fileset>
+         </copy>
+
+         <!-- SERVER JARS -->
+         <copy todir="${jboss40.home}/server/${jboss.server.instance}/lib" overwrite="true">
+            <fileset dir="@{jbosslibs}">
+               <include name="jbossws-jboss40.jar"/>
+            </fileset>
+            <fileset dir="@{corelibs}">
+               <include name="jboss-jaxrpc.jar"/>
+               <include name="jboss-jaxws.jar"/>
+               <include name="jboss-saaj.jar"/>
+            </fileset>
+            <fileset dir="@{thirdpartylibs}">
+               <include name="wsdl4j.jar"/>
+            </fileset>
+
+         </copy>
+
+         <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+         <unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native40.sar"/>
+         <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+         <unzip dest="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+      </sequential>
+   </macrodef>
+
+   <macrodef name="macro-setup-native40-no-ejb3">
+      <sequential>
+
+         <move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service-ejb3.xml"
+               file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service.xml"/>
+         <move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service.xml"
+               file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service-no-ejb3.xml"/>
+
+         <move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans-ejb3.xml"
+               file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans.xml"/>
+         <move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans.xml"
+               file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml"/>
+
+      </sequential>
+   </macrodef>
+
+   <macrodef name="macro-undeploy-native40">
+      <sequential>
+         <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/>
+         <delete>
+
+            <!-- BIN SCRIPTS -->
+            <fileset dir="${jboss40.home}/bin">
+               <include name="wsconsume.*"/>
+               <include name="wsprovide.*"/>
+               <include name="wsrunclient.*"/>
+               <include name="wstools.*"/>
+            </fileset>
+
+            <!-- CLIENT JARS -->
+            <fileset dir="${jboss40.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="jboss-jaxrpc.jar"/>
+               <include name="jboss-jaxws.jar"/>
+               <include name="jboss-saaj.jar"/>
+               <include name="jbossws-client.jar"/>
+               <include name="jbossws-jboss40.jar"/>
+               <include name="policy.jar"/>
+               <include name="stax-api.jar"/>
+               <include name="stax-ex.jar"/>
+               <include name="streambuffer.jar"/>
+               <include name="wsdl4j.jar"/>
+               <!-- Remove only, do not deploy -->
+               <include name="jbossws-wsconsume-impl.jar"/>
+               <include name="jbossws14-client.jar"/>
+            </fileset>
+
+            <!-- SERVER JARS -->
+            <fileset dir="${jboss40.home}/lib">
+               <!-- Remove only, do not deploy -->
+               <include name="jbossws-integration.jar"/>
+            </fileset>
+            <fileset dir="${jboss40.home}/server/${jboss.server.instance}/lib">
+               <include name="jbossws-jboss40.jar"/>
+               <include name="jboss-jaxrpc.jar"/>
+               <include name="jboss-jaxws.jar"/>
+               <include name="jboss-saaj.jar"/>
+            </fileset>
+         </delete>
+         <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+         <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+         <!-- Remove only, do not deploy -->
+         <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/>
+      </sequential>
+   </macrodef>
+
+   <!-- Deploy API jars to lib/endorsed for usage with jdk1.6 -->
+   <macrodef name="macro-deploy-endorsed">
+      <attribute name="jbosshome"/>
+      <attribute name="corelibs"/>
+      <attribute name="thirdpartylibs"/>
+      <sequential>
+         <copy todir="@{jbosshome}/lib/endorsed" overwrite="true">
+            <fileset dir="@{thirdpartylibs}">
+               <include name="jaxb-api.jar"/>
+            </fileset>
+            <fileset dir="@{corelibs}">
+               <include name="jboss-jaxrpc.jar"/>
+               <include name="jboss-jaxws.jar"/>
+               <include name="jboss-saaj.jar"/>
+            </fileset>
+         </copy>
+      </sequential>
+   </macrodef>
+
+   <!-- Undeploy API jars from lib/endorsed -->
+   <macrodef name="macro-undeploy-endorsed">
+      <attribute name="jbosshome"/>
+      <sequential>
+         <delete>
+            <fileset dir="@{jbosshome}/lib/endorsed">
+               <include name="jaxb-api.jar"/>
+               <include name="jboss-jaxrpc.jar"/>
+               <include name="jboss-jaxws.jar"/>
+               <include name="jboss-saaj.jar"/>
+            </fileset>
+         </delete>
+      </sequential>
+   </macrodef>
+
 </project>




More information about the jbossws-commits mailing list