[jbossws-commits] JBossWS SVN: r6676 - in stack/cxf/trunk/src/main: scripts and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2008-04-24 14:51:49 -0400 (Thu, 24 Apr 2008)
New Revision: 6676

Modified:
   stack/cxf/trunk/src/main/distro/build-deploy.xml
   stack/cxf/trunk/src/main/distro/build.xml
   stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml
Log:
Fix bin-dist filtering

Modified: stack/cxf/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/build-deploy.xml	2008-04-24 18:23:44 UTC (rev 6675)
+++ stack/cxf/trunk/src/main/distro/build-deploy.xml	2008-04-24 18:51:49 UTC (rev 6676)
@@ -43,7 +43,7 @@
     <chmod dir="${jboss422.home}/bin" perm="+x" includes="*.sh"/>
   </target>
   
-  <target name="undeploy-jboss422" depends="target-jboss422, prepare" description="Remove jbossws from jboss422">
+  <target name="undeploy-jboss422" depends="target-jboss422,init" description="Remove jbossws from jboss422">
     <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
     <macro-undeploy-jbossws targetdir="${jboss422.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
   </target>
@@ -64,7 +64,7 @@
     <chmod dir="${jboss423.home}/bin" perm="+x" includes="*.sh"/>
   </target>
   
-  <target name="undeploy-jboss423" depends="target-jboss423, prepare" description="Remove jbossws from jboss423">
+  <target name="undeploy-jboss423" depends="target-jboss423,init" description="Remove jbossws from jboss423">
     <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
     <macro-undeploy-jbossws targetdir="${jboss423.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
   </target>
@@ -99,7 +99,7 @@
     <chmod dir="${jboss500.home}/bin" perm="+x" includes="*.sh"/>
   </target>
   
-  <target name="undeploy-jboss500" depends="target-jboss500, prepare" description="Remove jbossws from jboss500">
+  <target name="undeploy-jboss500" depends="target-jboss500,init" description="Remove jbossws from jboss500">
     <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
     <macro-undeploy-jbossws targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
   </target>
@@ -120,7 +120,7 @@
     <chmod dir="${jboss501.home}/bin" perm="+x" includes="*.sh"/>
   </target>
   
-  <target name="undeploy-jboss501" depends="target-jboss501, prepare" description="Remove jbossws from jboss501">
+  <target name="undeploy-jboss501" depends="target-jboss501,init" description="Remove jbossws from jboss501">
     <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
     <macro-undeploy-jbossws targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
   </target>

Modified: stack/cxf/trunk/src/main/distro/build.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/build.xml	2008-04-24 18:23:44 UTC (rev 6675)
+++ stack/cxf/trunk/src/main/distro/build.xml	2008-04-24 18:51:49 UTC (rev 6676)
@@ -19,9 +19,10 @@
   
   <property name="build.dir" value="${basedir}/build"/>
   <property name="docs.dir" value="${basedir}/docs"/>
+  <property name="output.dir" value="${basedir}/output"/>
   <property name="thirdparty.dir" value="${basedir}/deploy/lib"/>
   <property name="tests.dir" value="${basedir}/tests"/>
-  <property name="tests.output.dir" value="${basedir}/output"/>
+  <property name="tests.output.dir" value="${output.dir}"/>
   
   <property name="deploy.artifacts.dir" value="${basedir}/deploy"/>
   <property name="jbossws.default.deploy.conf" value="${build.dir}/jbossws-default-deploy.conf"/>
@@ -57,7 +58,7 @@
       </or>
     </condition>
     
-    <property name="deploy.structure" value="${stack.output.dir}/deploy-${jbossws.integration.target}"/>
+    <property name="deploy.structure" value="${output.dir}/deploy-${jbossws.integration.target}"/>
   </target>
   
   <target name="tests-init" depends="init,tests-classpath">

Modified: stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml	2008-04-24 18:23:44 UTC (rev 6675)
+++ stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml	2008-04-24 18:51:49 UTC (rev 6676)
@@ -28,7 +28,6 @@
     <fileSet>
       <directory>src/main/distro</directory>
       <outputDirectory>build</outputDirectory>
-      <filtered>true</filtered>
       <includes>
         <include>build-deploy.xml</include>
         <include>build-setup.xml</include>