Author: heiko.braun(a)jboss.com Date: 2007-10-30 05:13:25 -0400 (Tue, 30 Oct 2007) New Revision: 4930 Added: stack/native/trunk/src/test/resources/test-excludes-jboss423.txt 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: Added jboss-423 build targets Modified: stack/native/trunk/ant-import/build-deploy.xml =================================================================== --- stack/native/trunk/ant-import/build-deploy.xml 2007-10-30 09:12:29 UTC (rev 4929) +++ stack/native/trunk/ant-import/build-deploy.xml 2007-10-30 09:13:25 UTC (rev 4930) @@ -56,7 +56,8 @@ <!-- Deploy jbossws to jboss422 --> <target name="deploy-jboss422" depends="jars-jboss42,undeploy-jboss422,deploy-jboss422-endorsed" description="Deploy jbossws to jboss422"> - <macro-deploy-native422 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> + <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}"/> </target> @@ -66,12 +67,34 @@ <!-- Remove jbossws from jboss422 --> <target name="undeploy-jboss422" depends="prepare,undeploy-jboss422-endorsed" description="Remove jbossws from jboss422"> - <macro-undeploy-native422/> + <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> + <macro-undeploy-native422 jbosshome="${jboss422.home}"/> <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"> @@ -93,4 +116,4 @@ <macro-undeploy-endorsed jbosshome="${jboss500.home}"/> </target> -</project> \ No newline at end of file +</project> Modified: stack/native/trunk/ant-import/build-setup.xml =================================================================== --- stack/native/trunk/ant-import/build-setup.xml 2007-10-30 09:12:29 UTC (rev 4929) +++ stack/native/trunk/ant-import/build-setup.xml 2007-10-30 09:13:25 UTC (rev 4930) @@ -72,6 +72,7 @@ <or> <equals arg1="${jbossws.integration.target}" arg2="jboss421"/> <equals arg1="${jbossws.integration.target}" arg2="jboss422"/> + <equals arg1="${jbossws.integration.target}" arg2="jboss423"/> </or> </condition> <condition property="jbossws.integration.jboss50" value="true"> @@ -96,4 +97,4 @@ </tstamp> </target> -</project> \ No newline at end of file +</project> Modified: stack/native/trunk/ant-import/macros-deploy-native.xml =================================================================== --- stack/native/trunk/ant-import/macros-deploy-native.xml 2007-10-30 09:12:29 UTC (rev 4929) +++ stack/native/trunk/ant-import/macros-deploy-native.xml 2007-10-30 09:13:25 UTC (rev 4930) @@ -309,15 +309,16 @@ <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="${jboss422.home}/bin" src=&quot;(a){stacklibs}/jbossws-core-scripts.zip&quot;/&gt; - <chmod dir="${jboss422.home}/bin" perm="+x" includes="*.sh"/> + <unzip dest="@{jbosshome}/bin" src=&quot;(a){stacklibs}/jbossws-core-scripts.zip&quot;/&gt; + <chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/> <!-- CLIENT JARS --> - <copy todir="${jboss422.home}/client" overwrite="true"> + <copy todir="@{jbosshome}/client" overwrite="true"> <fileset dir="@{stacklibs}"> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> @@ -339,20 +340,21 @@ </copy> <!-- SERVER JARS --> - <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; + <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; </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="${jboss422.home}/bin"> + <fileset dir="@{jbosshome}/bin"> <include name="wsconsume.*"/> <include name="wsprovide.*"/> <include name="wsrunclient.*"/> @@ -360,7 +362,7 @@ </fileset> <!-- CLIENT JARS --> - <fileset dir="${jboss422.home}/client"> + <fileset dir="@{jbosshome}/client"> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> <include name="jaxb-xjc.jar"/> @@ -380,14 +382,14 @@ </fileset> <!-- SERVER JARS --> - <fileset dir="${jboss422.home}/lib/endorsed"> + <fileset dir="@{jbosshome}/lib/endorsed"> <include name="jaxb-api.jar"/> </fileset> - <fileset dir="${jboss422.home}/lib"> + <fileset dir="@{jbosshome}/lib"> <!-- Remove only, do not deploy --> <include name="jbossws-integration.jar"/> </fileset> - <fileset dir="${jboss422.home}/server/${jboss.server.instance}/lib"> + <fileset dir=&quot;(a){jbosshome}/server/${jboss.server.instance}/lib&quot;&gt; <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> <include name="jboss-jaxws-ext.jar"/> @@ -396,8 +398,8 @@ <include name="jbossws-integration.jar"/> </fileset> </delete> - <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <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; </sequential> </macrodef> @@ -509,4 +511,4 @@ </sequential> </macrodef> -</project> \ No newline at end of file +</project> Modified: stack/native/trunk/ant.properties.example =================================================================== --- stack/native/trunk/ant.properties.example 2007-10-30 09:12:29 UTC (rev 4929) +++ stack/native/trunk/ant.properties.example 2007-10-30 09:13:25 UTC (rev 4930) @@ -8,6 +8,7 @@ #jboss405.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA #jboss421.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA #jboss422.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA +#jboss423.home=/home/hbraun/dev/prj/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] Added: stack/native/trunk/src/test/resources/test-excludes-jboss423.txt =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss423.txt (rev 0) +++ stack/native/trunk/src/test/resources/test-excludes-jboss423.txt 2007-10-30 09:13:25 UTC (rev 4930) @@ -0,0 +1,7 @@ +# EJB3/Injection excludes +org/jboss/test/ws/jaxws/samples/webserviceref/** +org/jboss/test/ws/jaxws/webserviceref/** + +# [JBWS-1797] Setting .NET friendly Endpoint in web.xml +org/jboss/test/ws/jaxws/jbws1797/** + Property changes on: stack/native/trunk/src/test/resources/test-excludes-jboss423.txt ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF