[jbossws-commits] JBossWS SVN: r5136 - in stack/native/trunk: src/main/distro and 1 other directory.

Author: thomas.diesler(a)jboss.com Date: 2007-11-28 11:39:06 -0500 (Wed, 28 Nov 2007) New Revision: 5136 Modified: stack/native/trunk/ant-import/build-deploy.xml stack/native/trunk/src/main/distro/bin-dist-deploy.xml Log: Fix deploy-jboss405 for distro Modified: stack/native/trunk/ant-import/build-deploy.xml =================================================================== --- stack/native/trunk/ant-import/build-deploy.xml 2007-11-28 16:38:12 UTC (rev 5135) +++ stack/native/trunk/ant-import/build-deploy.xml 2007-11-28 16:39:06 UTC (rev 5136) @@ -17,14 +17,14 @@ <import file="${core.dir}/ant-import/macros-deploy-native.xml"/> <!-- Deploy jbossws to jboss405 --> - <target name="deploy-jboss405" depends="jars-jboss40,undeploy-jboss405,deploy-jboss405-no-ejb3" description="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"> + <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="jars-jboss40,undeploy-jboss405,deploy-jboss405-ejb3" unless="jboss405.ejb3.available" + <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> Modified: stack/native/trunk/src/main/distro/bin-dist-deploy.xml =================================================================== --- stack/native/trunk/src/main/distro/bin-dist-deploy.xml 2007-11-28 16:38:12 UTC (rev 5135) +++ stack/native/trunk/src/main/distro/bin-dist-deploy.xml 2007-11-28 16:39:06 UTC (rev 5136) @@ -14,16 +14,15 @@ <project> <!-- Deploy jbossws/native to jboss405 --> - <target name="deploy-jboss405" depends="deploy-jboss405-no-ejb3" description="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-setup-native40-no-ejb3/> + <macro-deploy-native405-no-ejb3/> <echo>*********************************</echo> <echo>* JBossWS EJB3 support disabled *</echo> <echo>* All EJB3 tests will fail. *</echo>