Author: thomas.diesler(a)jboss.com Date: 2007-11-07 02:43:19 -0500 (Wed, 07 Nov 2007) New Revision: 5002 Modified: stack/native/branches/jbossws-native-2.0.2/ant-import/build-deploy.xml stack/native/branches/jbossws-native-2.0.2/ant-import/macros-deploy-native.xml stack/native/branches/jbossws-native-2.0.2/mergeinfo.txt Log: Rollback: Include jboss423 targets Modified: stack/native/branches/jbossws-native-2.0.2/ant-import/build-deploy.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.2/ant-import/build-deploy.xml 2007-11-07 06:11:49 UTC (rev 5001) +++ stack/native/branches/jbossws-native-2.0.2/ant-import/build-deploy.xml 2007-11-07 07:43:19 UTC (rev 5002) @@ -67,46 +67,30 @@ <!-- Deploy jbossws to jboss422 --> <target name="deploy-jboss422" depends="jars-jboss42,undeploy-jboss422,deploy-jboss422-endorsed" description="Deploy jbossws to jboss422"> - <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> - <macro-deploy-native422 jbosshome="${jboss422.home}" stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> - <macro-deploy-framework thirdpartylibs="${core.dir}/thirdparty" jbosshome="${jboss422.home}"/> + <macro-deploy-native422 + stacklibs="${core.dir}/output/lib" + thirdpartylibs="${core.dir}/thirdparty"/> + <macro-deploy-framework + thirdpartylibs="${core.dir}/thirdparty" + jbosshome="${jboss422.home}"/> </target> <target name="deploy-jboss422-endorsed" depends="prepare" if="HAVE_JDK_1.6"> - <macro-deploy-endorsed jbosshome="${jboss422.home}" stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> + <macro-deploy-endorsed + jbosshome="${jboss422.home}" + stacklibs="${core.dir}/output/lib" + thirdpartylibs="${core.dir}/thirdparty"/> </target> <!-- Remove jbossws from jboss422 --> <target name="undeploy-jboss422" depends="prepare,undeploy-jboss422-endorsed" description="Remove jbossws from jboss422"> - <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> - <macro-undeploy-native422 jbosshome="${jboss422.home}"/> + <macro-undeploy-native422/> <macro-undeploy-framework jbosshome="${jboss422.home}"/> </target> <target name="undeploy-jboss422-endorsed" depends="prepare"> <macro-undeploy-endorsed jbosshome="${jboss422.home}"/> </target> - <!-- Deploy jbossws to jboss423 --> - <target name="deploy-jboss423" depends="jars-jboss42,undeploy-jboss423,deploy-jboss423-endorsed" description="Deploy jbossws to jboss423"> - <!--fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/--> - <macro-deploy-native422 jbosshome="${jboss423.home}" stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> - <macro-deploy-framework thirdpartylibs="${core.dir}/thirdparty" jbosshome="${jboss423.home}"/> - </target> - - <target name="deploy-jboss423-endorsed" depends="prepare" if="HAVE_JDK_1.6"> - <macro-deploy-endorsed jbosshome="${jboss423.home}" stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> - </target> - - <!-- Remove jbossws from jboss423 --> - <target name="undeploy-jboss423" depends="prepare,undeploy-jboss423-endorsed" description="Remove jbossws from jboss423"> - <!--fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/--> - <macro-undeploy-native422 jbosshome="${jboss423.home}"/> - <macro-undeploy-framework jbosshome="${jboss423.home}"/> - </target> - <target name="undeploy-jboss423-endorsed" depends="prepare"> - <macro-undeploy-endorsed jbosshome="${jboss423.home}"/> - </target> - <!-- Deploy jbossws to jboss500 --> <target name="deploy-jboss500" depends="jars-jboss50,undeploy-jboss500,deploy-jboss500-endorsed" description="Deploy jbossws to jboss500"> <macro-deploy-native500 Modified: stack/native/branches/jbossws-native-2.0.2/ant-import/macros-deploy-native.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.2/ant-import/macros-deploy-native.xml 2007-11-07 06:11:49 UTC (rev 5001) +++ stack/native/branches/jbossws-native-2.0.2/ant-import/macros-deploy-native.xml 2007-11-07 07:43:19 UTC (rev 5002) @@ -309,16 +309,15 @@ <macrodef name="macro-deploy-native422"> <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> - <attribute name="jbosshome"/> <sequential> + <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> - <!-- BIN SCRIPTS --> - <unzip dest="@{jbosshome}/bin" src=&quot;(a){stacklibs}/jbossws-core-scripts.zip&quot;/&gt; - <chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/> + <unzip dest="${jboss422.home}/bin" src=&quot;(a){stacklibs}/jbossws-core-scripts.zip&quot;/&gt; + <chmod dir="${jboss422.home}/bin" perm="+x" includes="*.sh"/> <!-- CLIENT JARS --> - <copy todir="@{jbosshome}/client" overwrite="true"> + <copy todir="${jboss422.home}/client" overwrite="true"> <fileset dir="@{stacklibs}"> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> @@ -340,20 +339,20 @@ </copy> <!-- SERVER JARS --> - <mkdir dir=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar&quot;/&gt; - <unjar dest=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar&quot; src=&quot;(a){stacklibs}/jbossws-native42.sar&quot;/&gt; - <mkdir dir=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar&quot;/&gt; - <unzip dest=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar&quot; src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; + <mkdir dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <unjar dest="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src=&quot;(a){stacklibs}/jbossws-native42.sar&quot;/&gt; + <mkdir dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; </sequential> </macrodef> <macrodef name="macro-undeploy-native422"> - <attribute name="jbosshome"/> <sequential> + <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> <delete> <!-- BIN SCRIPTS --> - <fileset dir="@{jbosshome}/bin"> + <fileset dir="${jboss422.home}/bin"> <include name="wsconsume.*"/> <include name="wsprovide.*"/> <include name="wsrunclient.*"/> @@ -361,7 +360,7 @@ </fileset> <!-- CLIENT JARS --> - <fileset dir="@{jbosshome}/client"> + <fileset dir="${jboss422.home}/client"> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> <include name="jaxb-xjc.jar"/> @@ -381,14 +380,14 @@ </fileset> <!-- SERVER JARS --> - <fileset dir="@{jbosshome}/lib/endorsed"> + <fileset dir="${jboss422.home}/lib/endorsed"> <include name="jaxb-api.jar"/> </fileset> - <fileset dir="@{jbosshome}/lib"> + <fileset dir="${jboss422.home}/lib"> <!-- Remove only, do not deploy --> <include name="jbossws-integration.jar"/> </fileset> - <fileset dir=&quot;(a){jbosshome}/server/${jboss.server.instance}/lib&quot;&gt; + <fileset dir="${jboss422.home}/server/${jboss.server.instance}/lib"> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> <include name="jboss-jaxws-ext.jar"/> @@ -397,8 +396,8 @@ <include name="jbossws-integration.jar"/> </fileset> </delete> - <delete dir=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar&quot;/&gt; - <delete dir=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar&quot;/&gt; + <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> </sequential> </macrodef> @@ -510,4 +509,4 @@ </sequential> </macrodef> -</project> +</project> \ No newline at end of file Modified: stack/native/branches/jbossws-native-2.0.2/mergeinfo.txt =================================================================== --- stack/native/branches/jbossws-native-2.0.2/mergeinfo.txt 2007-11-07 06:11:49 UTC (rev 5001) +++ stack/native/branches/jbossws-native-2.0.2/mergeinfo.txt 2007-11-07 07:43:19 UTC (rev 5002) @@ -9,4 +9,7 @@ # $Id: mergeinfo.txt 3804 2007-07-05 17:24:44Z thomas.diesler(a)jboss.com $ thomas.diesler(a)jboss.com 22-Oct-2007 -svn merge -r4816:4838 https://svn.jboss.org/repos/jbossws/stack/native/branches/jbossws-2.0.2 +svn merge -r4816:4838 https://svn.jboss.org/repos/jbossws/stack/native/branches/jbossws-native-... + +thomas.diesler(a)jboss.com 01-Nov-2007 +svn merge -r4847:4956 https://svn.jboss.org/repos/jbossws/stack/native/branches/jbossws-native-...