Author: thomas.diesler(a)jboss.com Date: 2007-12-12 03:21:19 -0500 (Wed, 12 Dec 2007) New Revision: 5263 Modified: stack/native/trunk/ant-import/build-deploy.xml stack/native/trunk/ant-import/build-setup.xml stack/native/trunk/ant-import/macros-deploy-native.xml stack/native/trunk/ant.properties.example Log: Fix deploy-jboss423 Modified: stack/native/trunk/ant-import/build-deploy.xml =================================================================== --- stack/native/trunk/ant-import/build-deploy.xml 2007-12-12 00:06:42 UTC (rev 5262) +++ stack/native/trunk/ant-import/build-deploy.xml 2007-12-12 08:21:19 UTC (rev 5263) @@ -77,8 +77,8 @@ <!-- 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"/> + <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> + <macro-deploy-native423 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> <macro-deploy-framework thirdpartylibs="${core.dir}/thirdparty" jbosshome="${jboss423.home}"/> </target> @@ -88,8 +88,8 @@ <!-- 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}"/> + <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> + <macro-undeploy-native423/> <macro-undeploy-framework jbosshome="${jboss423.home}"/> </target> <target name="undeploy-jboss423-endorsed" depends="prepare"> Modified: stack/native/trunk/ant-import/build-setup.xml =================================================================== --- stack/native/trunk/ant-import/build-setup.xml 2007-12-12 00:06:42 UTC (rev 5262) +++ stack/native/trunk/ant-import/build-setup.xml 2007-12-12 08:21:19 UTC (rev 5263) @@ -42,6 +42,12 @@ <property name="jboss422.server.lib" value="${jboss422.server}/lib"/> <property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/> + <property name="jboss423.lib" value="${jboss423.home}/lib"/> + <property name="jboss423.client" value="${jboss423.home}/client"/> + <property name="jboss423.server" value="${jboss423.home}/server/${jboss.server.instance}"/> + <property name="jboss423.server.lib" value="${jboss423.server}/lib"/> + <property name="jboss423.server.deploy" value="${jboss423.server}/deploy"/> + <property name="jboss500.lib" value="${jboss500.home}/lib"/> <property name="jboss500.client" value="${jboss500.home}/client"/> <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/> @@ -54,12 +60,14 @@ <property name="jboss405.available.file" value="${jboss405.client}/jboss-client.jar"/> <property name="jboss421.available.file" value="${jboss421.client}/jboss-client.jar"/> <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/> + <property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/> <property name="jboss500.available.file" value="${jboss500.client}/jboss-ejb3-client.jar"/> <available property="jboss405.available" file="${jboss405.available.file}"/> <available property="jboss405.ejb3.available" file="${jboss405.client}/jboss-ejb3-client.jar"/> <available property="jboss421.available" file="${jboss421.available.file}"/> <available property="jboss422.available" file="${jboss422.available.file}"/> + <available property="jboss423.available" file="${jboss423.available.file}"/> <available property="jboss500.available" file="${jboss500.available.file}"/> <condition property="jbossws.integration.jboss40" value="true"> Modified: stack/native/trunk/ant-import/macros-deploy-native.xml =================================================================== --- stack/native/trunk/ant-import/macros-deploy-native.xml 2007-12-12 00:06:42 UTC (rev 5262) +++ stack/native/trunk/ant-import/macros-deploy-native.xml 2007-12-12 08:21:19 UTC (rev 5263) @@ -401,6 +401,104 @@ </macrodef> <!-- ================================================================== --> + <!-- Deployment JBoss-4.2.3 --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-native423"> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> + + <!-- BIN SCRIPTS --> + <unzip dest="${jboss423.home}/bin" src=&quot;(a){stacklibs}/jbossws-core-scripts.zip&quot;/&gt; + <chmod dir="${jboss423.home}/bin" perm="+x" includes="*.sh"/> + + <!-- CLIENT JARS --> + <copy todir="${jboss423.home}/client" overwrite="true"> + <fileset dir="@{stacklibs}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + </fileset> + <fileset dir="@{thirdpartylibs}"> + <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="policy.jar"/> + <include name="stax-ex.jar"/> + <include name="streambuffer.jar"/> + <include name="wsdl4j.jar"/> + </fileset> + </copy> + + <!-- SERVER JARS --> + <mkdir dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <unjar dest="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src=&quot;(a){stacklibs}/jbossws-native42.sar&quot;/&gt; + <mkdir dir="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; + </sequential> + </macrodef> + + <macrodef name="macro-undeploy-native423"> + <sequential> + + <delete> + + <!-- BIN SCRIPTS --> + <fileset dir="${jboss423.home}/bin"> + <include name="wsconsume.*"/> + <include name="wsprovide.*"/> + <include name="wsrunclient.*"/> + <include name="wstools.*"/> + </fileset> + + <!-- CLIENT JARS --> + <fileset dir="${jboss423.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-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.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="${jboss423.home}/lib/endorsed"> + <include name="jaxb-api.jar"/> + </fileset> + <fileset dir="${jboss423.home}/lib"> + <!-- Remove only, do not deploy --> + <include name="jbossws-integration.jar"/> + </fileset> + <fileset dir="${jboss423.home}/server/${jboss.server.instance}/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + <!-- Remove only, do not deploy --> + <include name="jbossws-integration.jar"/> + </fileset> + </delete> + <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + </sequential> + </macrodef> + + <!-- ================================================================== --> <!-- Deployment JBoss-5.0.0 --> <!-- ================================================================== --> Modified: stack/native/trunk/ant.properties.example =================================================================== --- stack/native/trunk/ant.properties.example 2007-12-12 00:06:42 UTC (rev 5262) +++ stack/native/trunk/ant.properties.example 2007-12-12 08:21:19 UTC (rev 5263) @@ -11,7 +11,7 @@ #jboss423.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.3.GA #jboss500.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3 -# The JBoss server under test. This can be [jboss405|jboss405.no.ejb3|jboss421|jboss422|jboss500] +# The JBoss server under test. This can be [jboss405|jboss405.no.ejb3|jboss421|jboss422|jboss423|jboss500] jbossws.integration.target=jboss500 # The JBoss server instance