[jbossws-commits] JBossWS SVN: r5668 - in stack/native/trunk: ant-import and 1 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-02-14 06:47:59 -0500 (Thu, 14 Feb 2008) New Revision: 5668 Modified: stack/native/trunk/ant-import/build-deploy.xml stack/native/trunk/ant-import/build-setup.xml stack/native/trunk/ant.properties.example stack/native/trunk/src/main/distro/bin-dist-build.xml stack/native/trunk/src/main/distro/bin-dist-deploy.xml Log: More AS-5.0.1 Modified: stack/native/trunk/ant-import/build-deploy.xml =================================================================== --- stack/native/trunk/ant-import/build-deploy.xml 2008-02-14 11:46:13 UTC (rev 5667) +++ stack/native/trunk/ant-import/build-deploy.xml 2008-02-14 11:47:59 UTC (rev 5668) @@ -19,29 +19,6 @@ <import file="${core.dir}/ant-import/macros-deploy-native.xml" optional="true"/> <!-- ================================================================== --> - <!-- Deployment JBoss405 --> - <!-- ================================================================== --> - - <!-- Deploy jbossws to jboss405 --> - <target name="deploy-jboss405" depends="deploy-jboss405-ejb3,deploy-jboss405-no-ejb3" description="Deploy jbossws to jboss405"/> - - <target name="deploy-jboss405-ejb3" depends="jars-jboss40,undeploy-jboss405"> - <macro-deploy-native405 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> - <macro-deploy-framework thirdpartylibs="${core.dir}/thirdparty" jbosshome="${jboss405.home}"/> - </target> - - <target name="deploy-jboss405-no-ejb3" depends="deploy-jboss405-ejb3" unless="jboss405.ejb3.available" - description="Deploy jbossws to jboss405 without EJB3 support"> - <macro-deploy-native405-no-ejb3/> - </target> - - <!-- Remove jbossws from jboss405 --> - <target name="undeploy-jboss405" depends="prepare" description="Remove jbossws from jboss405"> - <macro-undeploy-native405/> - <macro-undeploy-framework jbosshome="${jboss405.home}"/> - </target> - - <!-- ================================================================== --> <!-- Deployment JBoss421 --> <!-- ================================================================== --> @@ -135,4 +112,27 @@ <macro-undeploy-framework jbosshome="${jboss500.home}"/> </target> + <!-- ================================================================== --> + <!-- Deployment JBoss501 --> + <!-- ================================================================== --> + + <!-- Deploy jbossws to jboss501 --> + <target name="deploy-jboss501" depends="jars-jboss50,undeploy-jboss501,deploy-jboss501-endorsed" description="Deploy jbossws to jboss501"> + <macro-deploy-native501 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> + <macro-deploy-framework thirdpartylibs="${core.dir}/thirdparty" jbosshome="${jboss501.home}"/> + </target> + + <target name="deploy-jboss501-endorsed" depends="prepare" if="HAVE_JDK_1.6"> + <macro-deploy-endorsed jbosshome="${jboss501.home}" stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> + </target> + + <!-- Remove jbossws from jboss501 --> + <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws from jboss501"> + <macro-undeploy-cxf501/> + <macro-undeploy-sunri501/> + <macro-undeploy-native501/> + <macro-undeploy-endorsed jbosshome="${jboss501.home}"/> + <macro-undeploy-framework jbosshome="${jboss501.home}"/> + </target> + </project> Modified: stack/native/trunk/ant-import/build-setup.xml =================================================================== --- stack/native/trunk/ant-import/build-setup.xml 2008-02-14 11:46:13 UTC (rev 5667) +++ stack/native/trunk/ant-import/build-setup.xml 2008-02-14 11:47:59 UTC (rev 5668) @@ -24,12 +24,6 @@ <property file="${basedir}/ant.properties"/> <property file="${basedir}/version.properties"/> - <property name="jboss405.lib" value="${jboss405.home}/lib"/> - <property name="jboss405.client" value="${jboss405.home}/client"/> - <property name="jboss405.server" value="${jboss405.home}/server/${jboss.server.instance}"/> - <property name="jboss405.server.lib" value="${jboss405.server}/lib"/> - <property name="jboss405.server.deploy" value="${jboss405.server}/deploy"/> - <property name="jboss421.lib" value="${jboss421.home}/lib"/> <property name="jboss421.client" value="${jboss421.home}/client"/> <property name="jboss421.server" value="${jboss421.home}/server/${jboss.server.instance}"/> @@ -55,27 +49,27 @@ <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/> <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/> + <property name="jboss501.lib" value="${jboss501.home}/lib"/> + <property name="jboss501.client" value="${jboss501.home}/client"/> + <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/> + <property name="jboss501.server.lib" value="${jboss501.server}/lib"/> + <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/> + <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/> + <property name="jboss.server.instance.${jboss.server.instance}" value="true"/> - <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"/> + <property name="jboss501.available.file" value="${jboss501.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}"/> + <available property="jboss501.available" file="${jboss501.available.file}"/> - <condition property="jbossws.integration.jboss40" value="true"> - <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss405"/> - <equals arg1="${jbossws.integration.target}" arg2="jboss405.no.ejb3"/> - </or> - </condition> <condition property="jbossws.integration.jboss42" value="true"> <or> <equals arg1="${jbossws.integration.target}" arg2="jboss421"/> @@ -84,7 +78,10 @@ </or> </condition> <condition property="jbossws.integration.jboss50" value="true"> - <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> + <or> + <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> + <equals arg1="${jbossws.integration.target}" arg2="jboss501"/> + </or> </condition> <available property="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/> Modified: stack/native/trunk/ant.properties.example =================================================================== --- stack/native/trunk/ant.properties.example 2008-02-14 11:46:13 UTC (rev 5667) +++ stack/native/trunk/ant.properties.example 2008-02-14 11:47:59 UTC (rev 5668) @@ -4,14 +4,13 @@ # $Id$ # Optional JBoss Home -#jboss405.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3 -#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/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.CR1 +#jboss500.home=/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_Beta4/build/output/jboss-5.0.0.Beta4 +#jboss501.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.CR1 -# The JBoss server under test. This can be [jboss405|jboss405.no.ejb3|jboss421|jboss422|jboss423|jboss500] +# The JBoss server under test. This can be [jboss421|jboss422|jboss423|jboss500|jboss501] jbossws.integration.target=jboss500 # The JBoss server instance Modified: stack/native/trunk/src/main/distro/bin-dist-build.xml =================================================================== --- stack/native/trunk/src/main/distro/bin-dist-build.xml 2008-02-14 11:46:13 UTC (rev 5667) +++ stack/native/trunk/src/main/distro/bin-dist-build.xml 2008-02-14 11:47:59 UTC (rev 5668) @@ -28,12 +28,6 @@ <property file="${basedir}/ant.properties"/> <property file="${basedir}/version.properties"/> - <property name="jboss405.lib" value="${jboss405.home}/lib"/> - <property name="jboss405.client" value="${jboss405.home}/client"/> - <property name="jboss405.server" value="${jboss405.home}/server/${jboss.server.instance}"/> - <property name="jboss405.server.lib" value="${jboss405.server}/lib"/> - <property name="jboss405.server.deploy" value="${jboss405.server}/deploy"/> - <property name="jboss421.lib" value="${jboss421.home}/lib"/> <property name="jboss421.client" value="${jboss421.home}/client"/> <property name="jboss421.server" value="${jboss421.home}/server/${jboss.server.instance}"/> @@ -59,27 +53,27 @@ <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/> <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/> + <property name="jboss501.lib" value="${jboss501.home}/lib"/> + <property name="jboss501.client" value="${jboss501.home}/client"/> + <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/> + <property name="jboss501.server.lib" value="${jboss501.server}/lib"/> + <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/> + <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/> + <property name="jboss.server.instance.${jboss.server.instance}" value="true"/> - <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"/> + <property name="jboss501.available.file" value="${jboss501.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}"/> + <available property="jboss501.available" file="${jboss501.available.file}"/> - <condition property="jbossws.integration.jboss40" value="true"> - <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss405"/> - <equals arg1="${jbossws.integration.target}" arg2="jboss405.no.ejb3"/> - </or> - </condition> <condition property="jbossws.integration.jboss42" value="true"> <or> <equals arg1="${jbossws.integration.target}" arg2="jboss421"/> @@ -88,7 +82,10 @@ </or> </condition> <condition property="jbossws.integration.jboss50" value="true"> - <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> + <or> + <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> + <equals arg1="${jbossws.integration.target}" arg2="jboss501"/> + </or> </condition> <!-- JDK Detection --> Modified: stack/native/trunk/src/main/distro/bin-dist-deploy.xml =================================================================== --- stack/native/trunk/src/main/distro/bin-dist-deploy.xml 2008-02-14 11:46:13 UTC (rev 5667) +++ stack/native/trunk/src/main/distro/bin-dist-deploy.xml 2008-02-14 11:47:59 UTC (rev 5668) @@ -14,31 +14,6 @@ <project> <!-- ================================================================== --> - <!-- Deployment JBoss405 --> - <!-- ================================================================== --> - - <!-- Deploy jbossws/native to jboss405 --> - <target name="deploy-jboss405" depends="deploy-jboss405-ejb3,deploy-jboss405-no-ejb3" description="Deploy jbossws/native to jboss405"/> - - <target name="deploy-jboss405-ejb3" depends="undeploy-jboss405"> - <macro-deploy-native405 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> - <macro-deploy-framework thirdpartylibs="${lib.dir}" jbosshome="${jboss405.home}"/> - </target> - - <target name="deploy-jboss405-no-ejb3" depends="deploy-jboss405-ejb3" unless="jboss405.ejb3.available"> - <macro-deploy-native405-no-ejb3/> - <echo>*********************************</echo> - <echo>* JBossWS EJB3 support disabled *</echo> - <echo>* All EJB3 tests will fail. *</echo> - <echo>*********************************</echo> - </target> - - <target name="undeploy-jboss405" depends="prepare" description="Remove jbossws/native from jboss405"> - <macro-undeploy-native405/> - <macro-undeploy-framework jbosshome="${jboss405.home}"/> - </target> - - <!-- ================================================================== --> <!-- Deployment JBoss421 --> <!-- ================================================================== --> @@ -120,4 +95,25 @@ <macro-undeploy-framework jbosshome="${jboss500.home}"/> </target> + <!-- ================================================================== --> + <!-- Deployment JBoss501 --> + <!-- ================================================================== --> + + <!-- Deploy jbossws/native to jboss501 --> + <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-jboss501-endorsed" description="Deploy jbossws/native to jboss501"> + <macro-deploy-native501 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> + <macro-deploy-framework thirdpartylibs="${lib.dir}" jbosshome="${jboss501.home}"/> + </target> + <target name="deploy-jboss501-endorsed" depends="prepare" if="HAVE_JDK_1.6"> + <macro-deploy-endorsed jbosshome="${jboss501.home}" stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> + </target> + + <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws from jboss501"> + <macro-undeploy-cxf501/> + <macro-undeploy-sunri501/> + <macro-undeploy-native501/> + <macro-undeploy-endorsed jbosshome="${jboss501.home}"/> + <macro-undeploy-framework jbosshome="${jboss501.home}"/> + </target> + </project>