[jboss-cvs] JBossAS SVN: r89255 - trunk/build.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu May 21 14:26:19 EDT 2009


Author: pgier
Date: 2009-05-21 14:26:19 -0400 (Thu, 21 May 2009)
New Revision: 89255

Removed:
   trunk/build/build-distr.xml
Modified:
   trunk/build/build.xml
Log:
Remove build-distr.xml and minor improvements to build.xml

Deleted: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2009-05-21 17:34:23 UTC (rev 89254)
+++ trunk/build/build-distr.xml	2009-05-21 18:26:19 UTC (rev 89255)
@@ -1,1839 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [
-   <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent">
-]>
-
-<project name="JBoss Distribution Build" xmlns:maven="antlib:org.apache.maven.artifact.ant">
-
-  &libraries;
-
-  <!-- ================================================================== -->
-  <!-- Init the maven ant tasks -->
-  <!-- ================================================================== -->
-  
-  <path id="maven-ant-tasks.classpath" path="../tools/maven/ant-tasks/maven-ant-tasks-2.0.10-SNAPSHOT.jar" />
-  <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
-           uri="antlib:org.apache.maven.artifact.ant"
-           classpathref="maven-ant-tasks.classpath" />
-  
-  <!-- ================================================================== -->
-  <!-- Module Pass-through Hooks                                          -->
-  <!-- ================================================================== -->
-
-  <!--
-  | These hooks are executed after the above pass-through targets have
-  | finished with a given module.
-  -->
-
-  <!-- ======== -->
-  <!-- Remoting -->
-  <!-- ======== -->
-
-  <target name="_module-jbossas-remoting-most">
-    <property name="_module.name" value="jbossas-remoting" override="true"/>
-    <property name="_module.output" override="true" value="${project.root}/${_module.name}/target"/>
-
-    <!-- Copy the generated libraries -->
-    <mkdir dir="${install.all.lib}"/>
-    <copy file="${_module.output}/jboss-as-jbossas-remoting.jar"
-         tofile="${install.all.lib}/jbossas-remoting.jar" filtering="no"/>
-
-  </target>
-
-  <target name="_module-remoting-all" depends="_module-jbossas-remoting-most">
-    <!-- Copy the generated javadocs -->
-    <mkdir dir="${install.api}/${_module.name}"/>
-    <copy todir="${install.api}/${_module.name}" filtering="no">
-      <fileset dir="${_module.output}/api">
-        <include name="**/*"/>
-      </fileset>
-    </copy>
-
-  </target>
-
-  <!-- ============ -->
-  <!-- JMX Remoting -->
-  <!-- ============ -->
-
-  <target name="_module-jmx-remoting-most">
-    <property name="_module.name" value="jmx-remoting" override="true"/>
-    <property name="_module.output" override="true" value="${project.root}/${_module.name}/target"/>
-
-    <!-- Copy the generated libraries -->
-    <mkdir dir="${install.all.lib}"/>
-    <copy file="${_module.output}/jboss-as-jmx-remoting.jar"
-          tofile="${install.all.lib}/jboss-jmx-remoting.jar" filtering="no" />
-  </target>
-
-  <target name="_module-jmx-remoting-all" depends="_module-jmx-remoting-most">
-    <!-- Copy the generated javadocs -->
-    <mkdir dir="${install.api}/${_module.name}"/>
-    <copy todir="${install.api}/${_module.name}" filtering="no">
-      <fileset dir="${_module.output}/api">
-        <include name="**/*"/>
-      </fileset>
-    </copy>
-
-  </target>
-
-  <!-- ===================== -->
-  <!-- JBoss AS JMX Remoting -->
-  <!-- ===================== -->
-
-  <target name="_module-jbossas-jmx-remoting-most">
-    <property name="_module.name" value="jbossas-jmx-remoting" override="true"/>
-    <property name="_module.output" override="true" value="${project.root}/${_module.name}/target"/>
-
-    <unjar src="${_module.output}/jmx-remoting.sar" dest="${install.default}/deploy/jmx-remoting.sar"/>
-    <unjar src="${_module.output}/jmx-remoting.sar" dest="${install.all}/deploy/jmx-remoting.sar"/>
-
-  </target>
-
-  <target name="_module-jbossas-jmx-remoting-all" depends="_module-jbossas-jmx-remoting-most">
-    <!-- Copy the generated javadocs -->
-    <mkdir dir="${install.api}/${_module.name}"/>
-    <copy todir="${install.api}/${_module.name}" filtering="no">
-      <fileset dir="${_module.output}/api">
-        <include name="**/*"/>
-      </fileset>
-    </copy>
-
-  </target>
-
-  <!-- ======== -->
-  <!-- EJB 3.0 -->
-  <!-- ======== -->
-
-  <target name="_module-ejb3-most">
-    <property name="_module.name" value="ejb3" override="true"/>
-    <property name="_module.output" override="true" value="${project.root}/${_module.name}/target"/>
-
-    <copy todir="${install.server}/all/deploy" filtering="no">
-      <fileset dir="${_module.output}/resources">
-        <include name="ejb3-container-jboss-beans.xml"/>
-        <include name="ejb3-interceptors-aop.xml"/>
-        <include name="ejb3-timerservice-jboss-beans.xml"/>
-      	<include name="ejb3-connectors-jboss-beans.xml"/>
-      </fileset>
-    </copy>
-
-    <!-- Copy across client jars -->
-    <mkdir dir="${install.client}"/>
-    <copy file="${_module.output}/jboss-as-ejb3-client.jar"
-          tofile="${install.client}/jboss-appclient.jar" filtering="no" />
-    
-    <copy todir="${install.server}/all/deployers" filtering="no">
-      <fileset dir="${_module.output}">
-        <include name="ejb3.deployer/**"/>
-      </fileset>
-    </copy>
-
-  </target>
-
-  <target name="_module-ejb3-all" depends="_module-ejb3-most">
-    <!-- Copy the generated javadocs -->
-    <mkdir dir="${install.api}/${_module.name}"/>
-    <copy todir="${install.api}/${_module.name}" filtering="no">
-      <fileset dir="${_module.output}/api">
-        <include name="**/*"/>
-      </fileset>
-    </copy>
-
-  </target>
-
-  <!-- ======== -->
-  <!-- ASPECTS -->
-  <!-- ======== -->
-
-  <target name="_module-aspects-most">
-    <property name="_module.name" value="aspects" override="true"/>
-    <property name="_module.output" override="true" value="${project.root}/${_module.name}/target"/>
-
-    <property name="aop.deployer" value="jboss-aop-jboss5.deployer"/>
-    <!-- Copy the generated libraries -->
-    <unjar src="${_module.output}/jboss-as-aspects-jboss-aop-jboss5-deployer.jar" dest="${install.server}/all/deployers/${aop.deployer}"/>
-
-    <copy file="${_module.output}/jboss-as-aspects-jboss-aop-jboss5.jar"
-          tofile="${install.lib}/jboss-aop-jboss5.jar" filtering="no" />
-
-    <!-- Copy across client jars -->
-    <mkdir dir="${install.client}"/>
-    <copy file="${_module.output}/jboss-as-aspects-jboss-aspect-jdk50-client.jar"
-          tofile="${install.client}/jboss-aspect-jdk50-client.jar" filtering="no" />
-
-  </target>
-
-  <target name="_module-aspects-all" depends="_module-aspects-most">
-    <!-- Copy the generated javadocs -->
-    <mkdir dir="${install.api}/${_module.name}"/>
-    <copy todir="${install.api}/${_module.name}" filtering="no">
-      <fileset dir="${_module.output}/api">
-        <include name="**/*"/>
-      </fileset>
-    </copy>
-
-  </target>
-
-  <!-- ==== -->
-  <!-- Main -->
-  <!-- ==== -->
-
-  <target name="_module-main-most">
-    <property name="_module.name" value="main" override="true"/>
-    <property name="_module.output" override="true" value="${project.root}/${_module.name}/target"/>
-
-    <!-- Copy the generated libraries -->
-    <mkdir dir="${install.lib}"/>
-    <copy file="${_module.output}/jboss-as-main.jar" 
-      tofile="${install.lib}/jboss-main.jar" filtering="no"/>
-    <copy file="${_module.output}/jboss-as-main-log4j-boot.jar" 
-      tofile="${install.lib}/log4j-boot.jar" filtering="no"/>
-
-    <!-- Copy the generated client -->
-    <mkdir dir="${install.client}"/>
-    <copy file="${_module.output}/jboss-as-main-client.jar" 
-      tofile="${install.client}/jboss-main-client.jar" filtering="no"/>
-    
-    <!-- Copy the generated scripts & runnable jars -->
-    <mkdir dir="${install.bin}"/>
-    <copy todir="${install.bin}" filtering="no">
-      <fileset dir="${_module.output}/bin">
-        <include name="**/*"/>
-      </fileset>
-    </copy>
-    <copy file="${_module.output}/jboss-as-main-run.jar" tofile="${install.bin}/run.jar"/>
-    <chmod perm="+x">
-      <fileset dir="${install.bin}">
-        <include name="**/*.sh"/>
-      </fileset>
-    </chmod>
-
-  </target>
-
-  <target name="_module-main-all" depends="_module-main-most">
-    <!-- Copy the generated javadocs -->
-    <mkdir dir="${install.api}/${_module.name}"/>
-    <copy todir="${install.api}/${_module.name}" filtering="no">
-      <fileset dir="${_module.output}/api">
-        <include name="**/*"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <!-- ====== -->
-  <!-- System -->
-  <!-- ====== -->
-
-  <target name="_module-system-most">
-    <property name="_module.name" value="system" override="true"/>
-    <property name="_module.output" override="true" value="${project.root}/${_module.name}/target"/>
-
-    <!-- Copy the generated server jar -->
-    <mkdir dir="${install.lib}"/>
-    <copy file="${_module.output}/jboss-as-system.jar" 
-          tofile="${install.lib}/jboss-system.jar" filtering="no"/>
-
-    <!-- Copy the generated client jar -->
-    <mkdir dir="${install.client}"/>
-    <copy file="${_module.output}/jboss-as-system-client.jar" 
-          tofile="${install.client}/jboss-system-client.jar" filtering="no"/>
-    
-    <!-- Copy the DTDs -->
-    <mkdir dir="${install.dtd}"/>
-    <copy todir="${install.dtd}" filtering="no">
-      <fileset dir="${project.root}/${_module.name}/src/resources/dtd"/>
-    </copy>
-
-  </target>
-
-  <target name="_module-system-all" depends="_module-system-most">
-    <!-- Copy the generated javadocs -->
-    <mkdir dir="${install.api}/${_module.name}"/>
-    <copy todir="${install.api}/${_module.name}" filtering="no">
-      <fileset dir="${_module.output}/api">
-        <include name="**/*"/>
-      </fileset>
-    </copy>
-  </target>
-  
-  <!-- ========== -->
-  <!-- System JMX -->
-  <!-- ========== -->
-
-  <target name="_module-system-jmx-most">
-    <property name="_module.name" value="system-jmx" override="true"/>
-    <property name="_module.output" override="true" value="${project.root}/${_module.name}/target"/>
-
-    <!-- Copy the generated server jar -->
-    <mkdir dir="${install.lib}"/>
-    <copy file="${_module.output}/jboss-as-system-jmx.jar" 
-          tofile="${install.lib}/jboss-system-jmx.jar" filtering="no"/>
-
-    <!-- Copy the generated client jar -->
-    <mkdir dir="${install.client}"/>
-    <copy file="${_module.output}/jboss-as-system-jmx-client.jar" 
-          tofile="${install.client}/jboss-system-jmx-client.jar" filtering="no"/>
-    
-  </target>
-  
-  <target name="_module-system-jmx-all" depends="_module-system-jmx-most">
-  </target>
-
-  <!-- ====== -->
-  <!-- Server -->
-  <!-- ====== -->
-
-  <target name="_module-server-most">
-    <property name="_module.name" value="server" override="true"/>
-    <property name="_module.output" override="true" value="${project.root}/${_module.name}/target"/>
-
-    <!-- Copy the security-policies-service.xml -->
-    <copy todir="${install.server}/all/deploy" filtering="no">
-      <fileset dir="${_module.output}/resources">
-        <include name="security-jboss-beans.xml"/>
-        <include name="security-policies-service.xml"/>
-      </fileset>
-    </copy>
-
-    <!-- Copy the generated libraries -->
-    <mkdir dir="${install.all.lib}"/>
-    
-    <copy file="${_module.output}/jboss-as-server-jboss.jar"
-          tofile="${install.all.lib}/jboss.jar" filtering="no"/>
-    
-    <copy file="${_module.output}/jboss-as-server-jmx-adaptor-plugin.jar"
-          tofile="${install.all.lib}/jmx-adaptor-plugin.jar" filtering="no"/>
-    
-    <!-- Copy the generated client libraries -->
-    <mkdir dir="${install.client}"/>
-    
-    <copy file="${_module.output}/jboss-as-server-client.jar"
-          tofile="${install.client}/jboss-client.jar" filtering="no"/>
-    
-    <copy file="${_module.output}/jboss-as-server-jmx-invoker-adaptor-client.jar"
-          tofile="${install.client}/jmx-invoker-adaptor-client.jar" filtering="no"/>
-    
-    <!-- Copy the generated scripts & runnable jars -->
-    <mkdir dir="${install.bin}"/>
-    <copy todir="${install.bin}" filtering="no">
-      <fileset dir="${_module.output}/bin">
-        <include name="**/*"/>
-      </fileset>
-    </copy>
-    <chmod perm="+x">
-      <fileset dir="${install.bin}">
-        <include name="**/*.sh"/>
-      </fileset>
-    </chmod>
-    
-    <copy file="${_module.output}/jboss-as-server-shutdown.jar"
-          tofile="${install.bin}/shutdown.jar" filtering="no"/>    
-
-    <!-- Default server config -->
-
-    <mkdir dir="${install.server}/all/deploy"/>
-    <copy todir="${install.server}/all/deploy" filtering="no">
-      <!-- Deployable xml snipets -->
-      <fileset dir="${_module.output}/etc/deploy">
-        <include name="**"/>
-      </fileset>
-
-      <!-- Deployable archives -->
-      <fileset dir="${_module.output}">
-        <include name="uuid-key-generator.sar/**"/>
-        <include name="sqlexception-service.xml"/>
-      </fileset>
-    </copy>
-
-    <!-- Copy the deployers -->
-    <copy todir="${install.server}/all/deployers" filtering="no">
-      <fileset dir="${_module.output}/etc/deployers">
-        <include name="**"/>
-      </fileset>
-    </copy>
-
-    <copy file="${_module.output}/resources/jmx-invoker-adaptor/META-INF/jboss-service.xml" tofile="${install.all.deploy}/jmx-invoker-service.xml"/>
-
-    <!-- Copy the "all" configuration files -->
-    <mkdir dir="${install.server}/all/conf"/>
-    <copy todir="${install.server}/all/conf" filtering="no">
-      <fileset dir="${_module.output}/etc/conf/all"/>
-    </copy>
-
-  </target>
-
-  <target name="_module-server-all" depends="_module-server-most">
-
-    <!-- Copy the generated javadocs -->
-    <mkdir dir="${install.api}/${_module.name}"/>
-    <copy todir="${install.api}/${_module.name}" filtering="no">
-      <fileset dir="${_module.output}/api">
-        <include name="**/*"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <!-- ========= -->
-  <!-- Connector -->
-  <!-- ========= -->
-
-  <target name="_module-connector-most">
-    <property name="_module.name" value="connector" override="true"/>
-    <property name="_module.output" override="true" value="${project.root}/${_module.name}/target"/>
-
-    <mkdir dir="${install.server}/all/deployers"/>
-
-    <copy todir="${install.server}/all/deployers" filtering="no">
-      <fileset dir="${_module.output}">
-        <include name="jboss-jca.deployer/**"/>
-      </fileset>
-    </copy>
-
-    <!-- Copy the generated deployment libraries -->
-    <mkdir dir="${install.server}/all/deploy"/>
-    <copy todir="${install.server}/all/deploy" filtering="no">
-      <fileset dir="${_module.output}/">
-        <include name="jboss-local-jdbc.rar"/>
-        <include name="jboss-xa-jdbc.rar"/>
-        <include name="mail-ra.rar"/>
-        <include name="quartz-ra.rar"/>
-      </fileset>
-      <fileset dir="${_module.output}/resources/jca-sar">
-        <include name="jca-jboss-beans.xml"/>
-      </fileset>
-    </copy>
-    
-    <copy todir="${install.all.deploy}" filtering="no">
-      <fileset dir="${_module.output}">
-        <include name="jms-ra.rar"/>
-      </fileset>
-    </copy>
-
-    <mkdir dir="${install.server}/all/lib"/>
-    <copy file="${_module.output}/jboss-as-connector-jboss-common-jdbc-wrapper.jar"
-          tofile="${install.server}/all/lib/jboss-common-jdbc-wrapper.jar" filtering="no"/>
-    <copy file="${_module.output}/jboss-as-connector-jboss-jca.jar"
-          tofile="${install.server}/all/lib/jboss-jca.jar" filtering="no"/>
-    
-    <!-- Copy the dtds -->
-    <mkdir dir="${install.dtd}"/>
-    <copy todir="${install.dtd}" filtering="no">
-      <fileset dir="${_module.output}/resources/dtd"/>
-    </copy>
-
-    <!-- Copy example db configs -->
-    <mkdir dir="${install.examples.jca}"/>
-    <copy todir="${install.examples.jca}" filtering="no">
-      <fileset dir="${_module.output}/etc/example-config">
-        <include name="*.xml"/>
-      </fileset>
-    </copy>
-    <copy todir="${install.server}/all/deploy" filtering="no">
-      <fileset dir="${_module.output}/etc/example-config">
-        <!--include name="firebird-service.xml"/-->
-        <include name="hsqldb-ds.xml"/>
-        <!--include name="mysql-service.xml"/-->
-        <!--include name="oracle-service.xml"/-->
-        <!--include name="postgres-service.xml"/-->
-      </fileset>
-    </copy>
-
-    <!--
-    <mkdir dir="${install.all.deploy}/jms"/>
-    <copy todir="${install.all.deploy}/jms" filtering="no">
-    <fileset dir="${_module.output}/etc/example-config">
-    <include name="hajndi-jms-ds.xml"/>
-    </fileset>
-    </copy>
-    -->
-
-    <!-- Copy the generated client libraries -->
-    <mkdir dir="${install.client}"/>
-    <copy file="${_module.output}/jboss-as-connector-jbosscx-client.jar"
-          tofile="${install.server}/all/lib/jbosscx-client.jar" filtering="no"/>
-
-  </target>
-
-  <target name="_module-connector-all" depends="_module-connector-most">
-    <!-- Copy the generated javadocs -->
-    <mkdir dir="${install.api}/${_module.name}"/>
-    <copy todir="${install.api}/${_module.name}" filtering="no">
-      <fileset dir="${_module.output}/api">
-        <include name="**/*"/>
-      </fileset>
-    </copy>
-
-    <!--Copy generated jmx documentation -->
-    <mkdir dir="${install.jmx-api}"/>
-    <copy todir="${install.jmx-api}" filtering="no" failonerror="false">
-      <fileset dir="${_module.output}/jmx-api">
-        <include name="**/*"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <!-- ========= -->
-  <!-- Messaging -->
-  <!-- ========= -->
-
-  <target name="_module-messaging-most">
-    <property name="_module.name" value="messaging" override="true"/>
-    <property name="_module.output" override="true" value="${project.root}/${_module.name}/target"/>
-
-     <!--
-           jboss-messaging libraries, unscoped deployment, same for "all" and "default" configurations.
-     -->
-     <mkdir dir="${install.all.lib}"/>
-     
-     <copy file="${_module.output}/jboss-as-messaging.jar"
-           tofile="${install.all.lib}/jboss-messaging-int.jar" filtering="no" />
-    
-     <!--
-          Security metadata, same for "all" and "default" configurations.
-     -->
-     <mkdir dir="${install.all.conf}/props"/>
-     <copy todir="${install.all.conf}/props">
-        <fileset dir="${_module.output}/etc/deploy/common">
-           <include name="messaging-*.properties"/>
-        </fileset>
-     </copy>
-
-     <!--
-        Clustered Config, using HSQLDB (but not supposed to go into production mode, since clustering requires a shared DB)
-     -->
-     <mkdir dir="${install.all.deploy}/messaging"/>
-     <copy tofile="${install.all.deploy}/messaging/hsqldb-persistence-service.xml"
-         file="${jboss.messaging.resources}/clustered-hsqldb-persistence-service.xml"/>
-     <copy todir="${install.all.deploy}/messaging">
-        <fileset dir="${_module.output}/etc/deploy/common">
-           <include name="*-service.xml"/>
-            <include name="*-jboss-beans.xml"/>
-            <include name="jms-ds.xml"/>
-            <include name="destinations-service.xml"/>
-        </fileset>
-        <fileset dir="${jboss.messaging.resources}/">
-            <include name="connection-factories-service.xml"/>
-            <include name="remoting-bisocket-service.xml"/>
-        </fileset>
-     </copy>
-
-     <!--
-          Default configuration
-     -->
-     <mkdir dir="${install.default.deploy}/messaging"/>
-     <copy todir="${install.default.deploy}/messaging">
-        <fileset dir="${_module.output}/etc/deploy/common">
-           <include name="*-service.xml"/>
-           <include name="*-jboss-beans.xml"/>
-           <include name="jms-ds.xml"/>
-        </fileset>
-        <fileset dir="${jboss.messaging.resources}/">
-            <include name="connection-factories-service.xml"/>
-            <include name="hsqldb-persistence-service.xml"/>
-            <include name="remoting-bisocket-service.xml"/>
-        </fileset>
-     </copy>
-  	
-     <!-- copy example jms configs -->
-     <!-- we don't need them anymore, they are all in examples/config now
-     <mkdir dir="${install.examples.jms}"/>
-     <copy todir="${install.examples.jms}" filtering="no">
-       <fileset dir="${jboss.messaging.resources}">
-         <include name="*-persistence-service.xml"/>
-         <include name="remoting-*-service.xml"/>
-       </fileset>
-     </copy>
-     -->
-
-     <!-- the JBM bundled destinations-service.xml comes with many examples -->
-     <copy file="${jboss.messaging.resources}/destinations-service.xml"
-       tofile="${install.examples.jms}/example-destinations-service.xml"/>
-
-     <!-- JBM examples for JBoss 5 -->
-     <mkdir dir="${install.examples.jms}"/>
-     <copy todir="${install.examples.jms}" filtering="no">
-       <fileset dir="${_module.output}/etc/">
-       </fileset>
-     </copy>
-     <!-- need to copy the following files as AS5 build while change the contents of them -->
-     <copy todir="${install.examples.jms}/examples/secure-socket/etc/" overwrite="yes">
-       <fileset dir="${project.root}/${_module.name}/src/etc/examples/secure-socket/etc">
-         <include name="messaging.keystore"/>
-         <include name="messaging.truststore"/>
-       </fileset>
-     </copy>
-
-   </target>
-
-   <target name="_module-messaging-all" depends="_module-messaging-most">
-
-      <!-- Copy the generated javadocs -->
-      <mkdir dir="${install.api}/${_module.name}"/>
-      <copy todir="${install.api}/${_module.name}" filtering="no">
-         <fileset dir="${_module.output}/api">
-            <include name="**/*"/>
-         </fileset>
-      </copy>
-   </target>
-
-  <!-- ======== -->
-  <!-- Security -->
-  <!-- ======== -->
-
-  <target name="_module-security-most">
-    <property name="_module.name" value="security" override="true"/>
-    <property name="_module.output" override="true" value="${project.root}/${_module.name}/target"/>
-
-    <!-- Copy the generated libraries -->
-    <mkdir dir="${install.all.lib}"/>
-    <copy file="${_module.output}/jboss-as-security.jar"
-          tofile="${install.all.lib}/jbosssx-server.jar" filtering="no"/>
-
-    <copy file="${_module.output}/jboss-as-security-client.jar"
-          tofile="${install.client}/jbosssx-as-client.jar" filtering="no"/>
-
-   
-    <!-- Copy the security configuration files -->
-    <mkdir dir="${install.all.deploy}/security"/>
-    <copy todir="${install.all.deploy}/security">
-      <fileset dir="${_module.output}/etc/deploy/">
-        <include name="*-jboss-beans.xml"/>
-      </fileset>
-    </copy>
-
-    <!-- Install JBoss Security Password batch scripts -->
-    <copy todir="${install.bin}" flatten="true" overwrite="true">
-       <fileset dir="${_module.output}/etc/bin">
-          <include name="password_tool.*"/>
-       </fileset>
-    </copy>
-  </target>
-
-  <target name="_module-security-all" depends="_module-security-most">
-    <!-- Copy the generated javadocs -->
-    <mkdir dir="${install.api}/${_module.name}"/>
-    <copy todir="${install.api}/${_module.name}" filtering="no">
-      <fileset dir="${_module.output}/api">
-        <include name="**/*"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <!-- ======= -->
-  <!-- Cluster -->
-  <!-- ======= -->
-
-  <target name="_module-cluster-most">
-    <property name="_module.name" value="cluster" override="true"/>
-    <property name="_module.output" override="true" value="${project.root}/${_module.name}/target"/>
-
-    <!-- Copy the generated libraries -->
-    <mkdir dir="${install.all.lib}"/>
-    <copy file="${_module.output}/jboss-as-cluster.jar"
-          tofile="${install.all.lib}/jbossha.jar" filtering="no" />
-
-    <!-- Copy the generated client libraries -->
-    <mkdir dir="${install.client}"/>
-    <copy file="${_module.output}/jboss-as-cluster-jboss-ha-legacy-client.jar"
-          tofile="${install.client}/jboss-ha-legacy-client.jar" filtering="no" />
-
-    <!-- Copy the deployers -->
-    <copy todir="${install.server}/all/deployers" filtering="no">
-      <fileset dir="${_module.output}/etc">
-        <include name="clustering-deployer-jboss-beans.xml"/>
-      </fileset>
-    </copy>
-
-    <!-- Copy the deployables -->
-    <mkdir dir="${install.server}/all/deploy/cluster"/>
-    <copy todir="${install.server}/all/deploy/cluster" filtering="no">
-      <fileset dir="${_module.output}/etc">
-        <include name="hapartition-jboss-beans.xml"/>
-        <include name="deploy-hasingleton-jboss-beans.xml"/>
-        <include name="hajndi-jboss-beans.xml"/>
-        <include name="ha-legacy-jboss-beans.xml"/>
-        <include name="timestamps-jboss-beans.xml"/>
-        <include name="farm-deployment-jboss-beans.xml"/>
-      </fileset>
-    </copy>
-    <mkdir dir="${install.server}/all/deploy/cluster/jgroups-channelfactory.sar"/>
-    <copy todir="${install.server}/all/deploy/cluster/jgroups-channelfactory.sar" filtering="no">
-      <fileset dir="${_module.output}/resources/jgroups-channelfactory.sar">
-        <include name="**/*"/>
-      </fileset>
-    </copy>
-    <mkdir dir="${install.server}/all/deploy/cluster/jboss-cache-manager.sar"/>
-    <copy todir="${install.server}/all/deploy/cluster/jboss-cache-manager.sar" filtering="no">
-      <fileset dir="${_module.output}/resources/jboss-cache-manager.sar">
-        <include name="**/*"/>
-      </fileset>
-    </copy>
-    <mkdir dir="${install.server}/all/deploy-hasingleton"/>
-    <mkdir dir="${install.server}/all/deploy/deploy.last"/>
-
-    <!-- Copy the farmed deployables -->
-    <mkdir dir="${install.server}/all/farm"/>
-    <copy todir="${install.server}/all/farm" filtering="no">
-      <fileset dir="${_module.output}/etc">
-        <include name="cluster-examples-service.xml"/>
-      </fileset>
-    </copy>
-
-
-  </target>
-
-  <target name="_module-cluster-all" depends="_module-cluster-most">
-    <!-- Copy the examples -->
-    <mkdir dir="${install.docs}/${module}"/>
-    <copy todir="${install.docs}/${module}" filtering="no">
-      <fileset dir="${_module.output}">
-        <include name="examples/*"/>
-      </fileset>
-    </copy>
-
-    <!-- Copy the generated javadocs -->
-    <mkdir dir="${install.api}/${_module.name}"/>
-    <copy todir="${install.api}/${_module.name}" filtering="no">
-      <fileset dir="${_module.output}/api">
-        <include name="**/*"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <!-- ===== -->
-  <!-- Varia -->
-  <!-- ===== -->
-
-  <target name="_module-varia-most">
-    <property name="_module.name" value="varia" override="true"/>
-    <property name="_module.output" override="true" value="${project.root}/${_module.name}/target"/>
-
-    <!-- Copy the generated libraries -->
-    <mkdir dir="${install.all.lib}"/>
-    <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${_module.output}">
-        <include name="jboss-as-varia-mail-plugin.jar"/>
-        <include name="jboss-as-varia-scheduler-plugin.jar"/>
-        <include name="jboss-as-varia-scheduler-plugin-example.jar"/>
-        <include name="jboss-as-varia-hsqldb.jar"/>
-        <include name="jboss-as-varia-hsqldb-plugin.jar"/>
-        <include name="jboss-as-varia-autonumber-plugin.jar"/>
-        <include name="jboss-as-varia-properties-plugin.jar"/>
-        <include name="jboss-as-varia-jboss-bindingservice.jar"/>
-        <include name="jboss-as-varia-jboss-monitoring.jar"/>
-        <include name="jboss-as-varia-jboss-srp.jar"/>
-      </fileset>
-      <mapper type="glob" from="jboss-as-varia-*.jar" to="*.jar"/>
-    </copy>
-
-    <!-- Copy to docs/examples -->
-    <mkdir dir="${install.examples.varia}"/>
-    <copy todir="${install.examples.varia}" filtering="no">
-      <!--
-      <fileset dir="${project.root}/testsuite/src/etc/cluster-test">
-        <include name="jboss-bindings.xml"/>
-      </fileset>
-      -->
-      <fileset dir="${_module.output}">
-        <include name="jboss-as-varia-derby-plugin.jar"/>
-        <include name="jboss-as-varia-threaddump.war"/>
-      </fileset>
-      <mapper type="glob" from="jboss-as-varia-*" to="*"/>
-    </copy>
-
-    <mkdir dir="${install.examples}/jmx/persistent-service.sar"/>
-    <unjar src="${_module.output}/persistent-service.sar" dest="${install.examples}/jmx/persistent-service.sar"/>
-
-    <mkdir dir="${install.examples.varia}/deployment-service"/>
-    <copy todir="${install.examples.varia}/deployment-service">
-      <fileset dir="${_module.output}/">
-        <include name="deployment-service.sar"/>
-      </fileset>
-      <fileset dir="${_module.output}/resources/services/deployment">
-        <exclude name="META-INF/**"/>
-      </fileset>
-    </copy>
-
-    <!-- MBean Configurator sar for setting mbean attributes when registered -->
-    <mkdir dir="${install.examples}/jmx/mbean-configurator.sar"/>
-    <unjar src="${_module.output}/mbean-configurator.sar" dest="${install.examples}/jmx/mbean-configurator.sar"/>
-
-    <!-- Client jars -->
-    <mkdir dir="${install.client}"/>
-    <copy todir="${install.client}" filtering="no">
-      <fileset dir="${_module.output}">
-        <include name="jboss-as-varia-jbossjmx-ant.jar"/>
-        <include name="jboss-as-varia-jboss-srp-client.jar"/>
-      </fileset>
-      <mapper type="glob" from="jboss-as-varia-*.jar" to="*.jar"/>
-    </copy>
-
-    <!-- Default server config -->
-
-    <!-- Copy the deployables -->
-    <mkdir dir="${install.server}/all/deploy"/>
-    <copy todir="${install.server}/all/deploy" filtering="no">
-      <!-- Deployable configuration -->
-      <fileset dir="${_module.output}/etc">
-        <!-- These should move to example/deploy -->
-        <include name="monitoring-service.xml"/>
-        <include name="mail-service.xml"/>
-        <include name="schedule-manager-service.xml"/>
-        <include name="scheduler-service.xml"/>
-        <include name="properties-service.xml"/>
-      </fileset>
-    </copy>
-
-    <!-- copy snmp-adaptor.sar unpacked to deploy -->
-    <mkdir dir="${install.server}/all/deploy/snmp-adaptor.sar"/>
-    <unjar src="${_module.output}/snmp-adaptor.sar" dest="${install.server}/all/deploy/snmp-adaptor.sar"/>
-
-    <!-- Include the JMX console war unpacked -->
-    <mkdir dir="${install.server}/all/deploy/jmx-console.war"/>
-    <unjar src="${_module.output}/jboss-as-varia-jmx-console.war" dest="${install.server}/all/deploy/jmx-console.war"/>
-
-
-    <!-- Include the HTTP invoker service unpacked -->
-    <mkdir dir="${install.server}/all/deploy/httpha-invoker.sar"/>
-    <unjar src="${_module.output}/httpha-invoker.sar" dest="${install.server}/all/deploy/httpha-invoker.sar"/>
-
-    <!-- copy the ant jmx client -->
-    <mkdir dir="${install.client}"/>
-    <copy todir="${install.client}" filtering="no">
-      <fileset dir="${_module.output}">
-        <include name="jboss-as-varia-jbossjmx-ant.jar"/>
-      </fileset>
-      <mapper type="glob" from="jboss-as-varia-*.jar" to="*.jar"/>
-    </copy>
-
-    <!-- copy the netboot war tool -->
-    <mkdir dir="${install.examples.netboot}"/>
-    <copy todir="${install.examples.netboot}" filtering="no">
-      <fileset dir="${_module.output}">
-        <include name="jboss-as-varia-netboot.war"/>
-      </fileset>
-      <mapper type="glob" from="jboss-as-varia-*.jar" to="*.jar"/>
-    </copy>
-
-    <!-- copy the bsh.deployer and its associated beanshell lib from thirdparty -->
-    <mkdir dir="${install.server}/all/deployers"/>
-
-    <copy todir="${install.server}/all/deployers" filtering="no">
-       <fileset dir="${_module.output}/deployers">
-          <include name="**"/>
-      </fileset>
-    </copy>
-
-    <!-- copy the jboss-monitoring JAR -->
-    <copy file="${_module.output}/jboss-as-varia-jboss-monitoring.jar" 
-          tofile="${install.server}/all/lib/jboss-monitoring.jar"/>
-
-    <!-- copy the binding-manager sample file and JAR
-    <copy file="${project.root}/varia/output/lib/bindingservice-plugin.jar" todir="${install.server}/all/lib"/>
-    -->
-  	<!--
-    <mkdir dir="${install.examples.binding-manager}"/>
-    <copy file="${project.root}/varia/src/resources/services/binding/sample-bindings.xml" todir="${install.examples.binding-manager}"/>
-    -->
-  	
-    <!-- the bean deployer : obsolete in jboss5
-    <mkdir dir="${install.all.deploy}/jboss-bean.deployer"/>
-    <copy todir="${install.all.deploy}/jboss-bean.deployer" filtering="no">
-    <fileset dir="${_module.output}/lib/kernel/jboss-bean.deployer">
-    <include name="**/*"/>
-    </fileset>
-    </copy>
-    -->
-
-    <!-- copy the logging-monitor service to examples -->
-    <mkdir dir="${install.examples}/jmx/logging-monitor/lib"/>
-    <copy todir="${install.examples}/jmx/logging-monitor/lib" filtering="no">
-      <fileset dir="${_module.output}/">
-        <include name="jboss-as-varia-logging-monitor.jar"/>
-      </fileset>
-      <mapper type="glob" from="jboss-as-varia-*.jar" to="*.jar"/>
-    </copy>
-    <copy todir="${install.examples}/jmx/logging-monitor" filtering="no">
-      <fileset dir="${_module.output}/resources/services/loggingmonitor"/>
-    </copy>
-
-    <copy todir="${install.server}/all/deployers/jboss-threads.deployer/META-INF">
-      <fileset dir="${_module.output}/resources/threads"/>
-    </copy>
-
-    <copy todir="${install.server}/all/deploy/xnio-provider.jar/META-INF">
-      <fileset dir="${_module.output}/resources/xnio">
-        <include name="xnio-jboss-beans.xml"/>
-      </fileset>
-    </copy>
-
-    <copy todir="${install.server}/all/deployers/xnio.deployer/META-INF">
-      <fileset dir="${_module.output}/resources/xnio">
-        <include name="xnio-deployer-jboss-beans.xml"/>
-      </fileset>
-    </copy>
-
-  </target>
-
-  <target name="_module-varia-all" depends="_module-varia-most">
-    <!-- Copy the generated javadocs -->
-    <mkdir dir="${install.api}/${_module.name}"/>
-    <copy todir="${install.api}/${_module.name}" filtering="no">
-      <fileset dir="${_module.output}/api">
-        <include name="**/*"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <!-- ===== -->
-  <!-- JBoss Web -->
-  <!-- ===== -->
-
-  <target name="_module-tomcat-most">
-    <property name="_module.name" value="tomcat" override="true"/>
-    <property name="_module.output" override="true" value="${project.root}/${_module.name}/target"/>
-    <!--<property name="_module.ext" override="true" value="${project.root}/${_module.name}/ext"/>-->
-
-    <!-- Copy the deployers -->
-    <mkdir dir="${install.server}/all/deployers/jbossweb.deployer"/>
-    <copy todir="${install.server}/all/deployers/jbossweb.deployer">
-      <fileset dir="${_module.output}/deploy/jboss-web.deployer"/>
-    </copy>
-    <!--
-    <copy tofile="${install.server}/all/deployers/war-clustering-deployers-jboss-beans.xml"
-      file="${project.root}/${_module.name}/src/resources/war-clustering-deployers-jboss-beans.xml" overwrite="true"/>
-    -->
-  	
-  	 <!-- Copy the webserver runtime sar -->
-  	 <mkdir dir="${install.server}/all/deploy/jbossweb.sar"/>
-    <copy todir="${install.server}/all/deploy/jbossweb.sar">
-      <fileset dir="${_module.output}/deploy/jbossweb.sar"/>
-    </copy>
-  	
-    <!-- Copy the ROOT.war -->
-    <copy todir="${install.server}/all/deploy" filtering="no">
-      <fileset dir="${_module.output}/deploy">
-        <include name="ROOT.war/**"/>
-      </fileset>
-    </copy>
-    <!-- Copy the clustering service elements -->
-    <copy todir="${install.server}/all/deploy">
-      <fileset dir="${_module.output}/deploy">
-        <include name="cluster/**"/>
-      </fileset>
-    </copy>
-
-  </target>
-
-  <target name="_module-tomcat-all" depends="_module-tomcat-most">
-  </target>
-
-  <!-- ==== -->
-  <!-- IIOP -->
-  <!-- ==== -->
-
-  <target name="_module-iiop-most">
-    <property name="_module.name" value="iiop" override="true"/>
-    <property name="_module.output" override="true" value="${project.root}/${_module.name}/target"/>
-
-    <!-- Copy the jboss-iiop.jar -->
-    <copy file="${_module.output}/jboss-as-iiop.jar"
-          tofile="${install.all.lib}/jboss-iiop.jar" filtering="no" />
-
-    <!-- Copy the jboss-iiop-client.jar -->
-    <copy file="${_module.output}/jboss-as-iiop-client.jar"
-          tofile="${install.all.lib}/jboss-iiop-client.jar" filtering="no" />
-
-    <!-- Copy thirdparty code -->
-    <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${jacorb.jacorb.lib}">
-        <include name="jacorb.jar"/>
-      </fileset>
-      <fileset dir="${apache.avalon.lib}">
-        <include name="avalon-framework.jar"/>
-      </fileset>
-    </copy>
-
-    <!-- Copy thirdparty client code -->
-    <copy todir="${install.client}" filtering="no">
-      <fileset dir="${jacorb.jacorb.lib}">
-        <include name="jacorb.jar"/>
-      </fileset>
-      <fileset dir="${apache.avalon.lib}">
-        <include name="avalon-framework.jar"/>
-      </fileset>
-      <fileset dir="${apache.avalon.logkit.lib}">
-        <include name="logkit.jar"/>
-      </fileset>
-    </copy>
-
-    <!-- Copy thirdparty configuration file and jndi.properties file -->
-    <mkdir dir="${install.server}/all/conf"/>
-    <copy todir="${install.server}/all/conf" filtering="no" overwrite="true">
-      <fileset dir="${jacorb.jacorb.resources}">
-        <include name="jacorb.properties"/>
-      </fileset>
-      <fileset dir="${_module.output}/etc/conf">
-        <include name="jndi.properties"/>
-      </fileset>
-    </copy>
-
-    <mkdir dir="${install.server}/all/deploy"/>
-    <copy todir="${install.server}/all/deploy" filtering="no">
-      <!-- Deployable service -->
-      <fileset dir="${_module.output}/etc">
-        <include name="iiop-service.xml"/>
-      </fileset>
-    </copy>
-
-  </target>
-
-  <target name="_module-iiop-all" depends="_module-iiop-most">
-    <!-- Copy the generated javadocs -->
-    <mkdir dir="${install.api}/${_module.name}"/>
-    <copy todir="${install.api}/${_module.name}" filtering="no">
-      <fileset dir="${_module.output}/api">
-        <include name="**/*"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <!-- ========== -->
-  <!-- Management -->
-  <!-- ========== -->
-
-  <target name="_module-management-most">
-    <property name="_module.name" value="management" override="true"/>
-    <property name="_module.output" override="true" value="${project.root}/${_module.name}/target"/>
-
-    <!-- Copy the generated libraries -->
-    <mkdir dir="${install.all.lib}"/>
-    <copy file="${_module.output}/jboss-as-management.jar"
-          tofile="${install.all.lib}/jboss-management.jar" filtering="no" />
-    <copy file="${_module.output}/jboss-as-management-jsr77.jar"
-          tofile="${install.all.lib}/jboss-jsr77.jar" filtering="no" />
-
-    <mkdir dir="${install.examples}/jmx"/>
-    <copy file="${_module.output}/jboss-as-management-ejb-management.jar"
-          tofile="${install.examples}/jmx/ejb-management.jar" filtering="no" />
-
-    <!-- Copy the generated client libraries -->
-    <mkdir dir="${install.client}"/>
-    <copy file="${_module.output}/jboss-as-management-jsr77-client.jar"
-          tofile="${install.client}/jboss-jsr77-client.jar" filtering="no" />
-
-  </target>
-
-  <target name="_module-management-all" depends="_module-management-most">
-    <!-- Copy the generated javadocs -->
-    <mkdir dir="${install.api}/${_module.name}"/>
-    <copy todir="${install.api}/${_module.name}" filtering="no">
-      <fileset dir="${_module.output}/api">
-        <include name="**/*"/>
-      </fileset>
-    </copy>
-
-    <!-- Copy the generated todo docs -->
-    <mkdir dir="${install.todo}/${_module.name}"/>
-    <copy todir="${install.todo}/${_module.name}" filtering="no" failonerror="false">
-      <fileset dir="${_module.output}/todo">
-        <include name="**/*"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <!-- ======= -->
-  <!-- Console -->
-  <!-- ======= -->
-
-  <target name="_module-console-most">
-    <property name="_module.name" value="console" override="true"/>
-    <property name="_module.output" override="true" value="${project.root}/${_module.name}/target"/>
-
-    <!-- Copy the generated scripts & runnable jars -->
-    <mkdir dir="${install.bin}"/>
-    <copy todir="${install.bin}" filtering="no">
-      <fileset dir="${_module.output}/bin">
-        <include name="**/*"/>
-      </fileset>
-    </copy>
-    <copy file="${_module.output}/jboss-as-console-twiddle.jar"
-          tofile="${install.bin}/twiddle.jar" filtering="no" />
-    <chmod perm="+x">
-      <fileset dir="${install.bin}">
-        <include name="**/*.sh"/>
-      </fileset>
-    </chmod>
-
-    <!-- Copy the BeanShell JAR -->
-    <copy todir="${install.server}/all/lib" filtering="no">
-      <fileset dir="${beanshell.beanshell.lib}">
-        <include name="bsh.jar"/>
-      </fileset>
-    </copy>
-
-    <!-- Unpack the plugin manager SAR (embedded) and application WAR -->
-    <unjar src="${_module.output}/jboss-as-console-console-mgr-sar.jar" 
-           dest="${install.all.deploy}/management/console-mgr.sar"/>
-    <unjar src="${_module.output}/jboss-as-console-web-console.war" 
-           dest="${install.all.deploy}/management/console-mgr.sar/web-console.war"/>
-
-  </target>
-
-  <target name="_module-console-all" depends="_module-console-most">
-    <!-- Copy the generated javadocs -->
-    <mkdir dir="${install.api}/${_module.name}"/>
-    <copy todir="${install.api}/${_module.name}" filtering="no">
-      <fileset dir="${_module.output}/api">
-        <include name="**/*"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <!-- ============= -->
-  <!-- Compatibility -->
-  <!-- ============= -->
-  <target name="_module-compatibility-most">
-    <call target="make-compat"/>
-    <call target="check-compat"/>
-  </target>
-
-  <target name="make-compat" if="compatibility.make">
-    <!-- Create serialized versions of contract classes -->
-    <mkdir dir="${compatibility.dir}"/>
-    <java classname="${compatibility.bin}" fork="true" failonerror="true" dir="${compatibility.dir}">
-      <arg value="make"/>
-      <arg value="${contract.classes}"/>
-      <classpath>
-        <pathelement path="${compatibility.classpath}"/>
-      </classpath>
-    </java>
-  </target>
-
-  <target name="check-compat" if="compatibility.check">
-    <!-- Check compiled contract classes against serialized versions -->
-    <java classname="${compatibility.bin}" fork="true" failonerror="true" dir="${compatibility.dir}">
-      <arg value="check"/>
-      <arg value="${contract.classes}"/>
-      <classpath>
-        <pathelement path="${compatibility.classpath}"/>
-      </classpath>
-    </java>
-  </target>
-
-  <!-- ========== -->
-  <!-- Deployment -->
-  <!-- ========== -->
-
-  <target name="_module-deployment-most">
-    <property name="_module.name" value="deployment" override="true"/>
-    <property name="_module.output" override="true" value="${project.root}/${_module.name}/target"/>
-
-    <!-- Copy the generated libraries -->
-    <mkdir dir="${install.all.lib}"/>
-    <copy file="${_module.output}/jboss-as-deployment-jboss-jsr88.jar"
-      tofile="${install.all.lib}/jboss-jsr88.jar" filtering="no"/>
-
-    <copy todir="${install.all.deploy}" filtering="no">
-      <fileset dir="${_module.output}/etc">
-        <include name="jsr88-service.xml"/>
-      </fileset>
-    </copy>
-
-    <!-- Copy the generated client libraries -->
-    <mkdir dir="${install.client}"/>
-    <copy file="${_module.output}/jboss-as-deployment.jar"
-      tofile="${install.client}/jboss-deployment.jar" filtering="no"/>
-
-  </target>
-
-  <target name="_module-deployment-all" depends="_module-deployment-most">
-    <!-- Copy the generated javadocs -->
-    <mkdir dir="${install.api}/${_module.name}"/>
-    <copy todir="${install.api}/${_module.name}" filtering="no">
-      <fileset dir="${_module.output}/api">
-        <include name="**/*"/>
-      </fileset>
-    </copy>
-
-    <!-- Copy the generated todo docs -->
-    <mkdir dir="${install.todo}/${_module.name}"/>
-    <copy todir="${install.todo}/${_module.name}" filtering="no" failonerror="false">
-      <fileset dir="${_module.output}/todo">
-        <include name="**/*"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <!-- =========== -->
-  <!-- Webservices -->
-  <!-- =========== -->
-
-  <target name="_module-webservices-most">
-    <property name="_module.name" value="webservices" override="true"/>
-    <property name="_module.output" override="true" value="${project.root}/${_module.name}/target"/>
-
-    <available classname="java.io.Console" property="BUILT_ON_JDK6_AND_ABOVE"/>
-    <antcall target="extract-jbossws-resources"/>
-    <antcall target="install-jbossws-to-bin"/>
-    <antcall target="install-jbossws-to-client"/>
-    <antcall target="install-jbossws-to-endorsed"/>
-    <antcall target="install-jbossws-to-common-lib"/>
-    <antcall target="install-jbossws-to-deploy"/>
-    <antcall target="install-jbossws-to-deployers"/>
-  </target>
-
-  <target name="extract-jbossws-resources">
-    <delete dir="${_module.output}/jbossws-native-resources"/>
-    <mkdir dir="${_module.output}/jbossws-native-resources"/>
-    <unzip
-      src="${org.jboss.ws.native.lib}/jbossws-native-resources.jar"
-      dest="${_module.output}/jbossws-native-resources"
-    />
-  </target>
-
-  <target name="install-jbossws-to-bin">
-    <!-- Install JBossWS batch scripts -->
-    <copy todir="${install.bin}" flatten="true" overwrite="true">
-      <fileset dir="${_module.output}/jbossws-native-resources/bin">
-        <include name="wsconsume.bat"/>
-        <include name="wsconsume.sh"/>
-        <include name="wsprovide.bat"/>
-        <include name="wsprovide.sh"/>
-        <include name="wsrunclient.bat"/>
-        <include name="wsrunclient.sh"/>
-        <include name="wstools.bat"/>
-        <include name="wstools.sh"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <target name="install-jbossws-to-client">
-    <!-- Install JBossWS jars to client directory -->
-    <copy file="${_module.output}/jboss-as-webservices.jar"
-          tofile="${install.client}/jbossws-jboss60.jar" filtering="no" />
-    
-    <copy todir="${install.client}" flatten="true" overwrite="true">
-      <fileset dir="${org.jboss.ws.native.lib}">
-        <include name="jbossws-native-client.jar"/>
-        <include name="jbossws-native-core.jar"/>
-        <include name="jbossws-native-jaxrpc.jar"/>
-        <include name="jbossws-native-jaxws-ext.jar"/>
-        <include name="jbossws-native-jaxws.jar"/>
-        <include name="jbossws-native-saaj.jar"/>
-      </fileset>
-      <fileset dir="${org.jboss.ws.lib}">
-        <include name="jbossws-common.jar"/>
-        <include name="jbossws-framework.jar"/>
-        <include name="jbossws-spi.jar"/>
-      </fileset>
-      <fileset dir="${sun.fi.lib}">
-        <include name="FastInfoset.jar"/>
-      </fileset>
-      <fileset dir="${org.codehaus.jettison.lib}">
-        <include name="jettison.jar"/>
-      </fileset>
-      <fileset dir="${sun.jaxb.lib}">
-        <include name="jaxb-api.jar"/>
-      </fileset>
-      <fileset dir="${stax.api.lib}">
-        <include name="stax-api.jar"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <target name="install-jbossws-to-endorsed" if="BUILT_ON_JDK6_AND_ABOVE">
-    <!-- Endorse JBossWS jars on JDK1.6 and above -->
-    <copy todir="${install.lib}/endorsed" flatten="true" overwrite="true">
-      <fileset dir="${org.jboss.ws.native.lib}">
-        <include name="jbossws-native-jaxrpc.jar"/>
-        <include name="jbossws-native-jaxws.jar"/>
-        <include name="jbossws-native-jaxws-ext.jar"/>
-        <include name="jbossws-native-saaj.jar"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <target name="install-jbossws-to-common-lib">
-    <!-- Install JBossWS jars to common/lib directory -->
-    <copy todir="${install.common.lib}" flatten="true" overwrite="true">
-      <fileset dir="${org.jboss.ws.native.lib}">
-        <include name="jbossws-native-jaxrpc.jar"/>
-        <include name="jbossws-native-jaxws.jar"/>
-        <include name="jbossws-native-jaxws-ext.jar"/>
-        <include name="jbossws-native-saaj.jar"/>
-      </fileset>
-      <fileset dir="${org.jboss.ws.lib}">
-        <include name="jbossws-common.jar"/>
-        <include name="jbossws-framework.jar"/>
-        <include name="jbossws-spi.jar"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <target name="install-jbossws-to-deploy">
-    <!-- Install JBossWS web console to deploy directory -->
-    <mkdir dir="${install.all.deploy}/jbossws.sar"/>
-    <unzip
-      src="${org.jboss.ws.native.lib}/jbossws-native-management.war"
-      dest="${install.all.deploy}/jbossws.sar/jbossws-management.war"
-    />
-  </target>
-
-  <target name="install-jbossws-to-deployers">
-    <!-- Install JBossWS deployers, runtime jars and configs -->
-    <mkdir dir="${install.all.deployers}/jbossws.deployer"/>
-    <unzip dest="${install.all.deployers}/jbossws.deployer" 
-           src="${_module.output}/jboss-as-webservices-jbossws-jboss60-deployer.zip"/>
-    <copy todir="${install.all.deployers}/jbossws.deployer" flatten="true" overwrite="true">
-      <fileset dir="${sun.fi.lib}">
-        <include name="FastInfoset.jar"/>
-      </fileset>
-      <fileset dir="${jboss.jaxbintros.lib}">
-        <include name="jboss-jaxb-intros.jar"/>
-      </fileset>
-      <fileset dir="${org.jboss.ws.native.lib}">
-        <include name="jbossws-native-core.jar"/>
-      </fileset>
-      <fileset dir="${org.codehaus.jettison.lib}">
-        <include name="jettison.jar"/>
-      </fileset>
-      <fileset dir="${wscommons.policy.lib}">
-        <include name="policy.jar"/>
-      </fileset>
-      <fileset dir="${ibm.wsdl4j.lib}">
-        <include name="wsdl4j.jar"/>
-      </fileset>
-      <fileset dir="${org.apache.lib}">
-        <include name="xmlsec.jar"/>
-      </fileset>
-    </copy>
-    <copy todir="${install.all.deployers}/jbossws.deployer">
-      <fileset dir="${_module.output}/jbossws-native-resources/resources/jbossws-jboss600/jbossws.beans">
-        <include name="META-INF/**"/>
-      </fileset>
-    </copy>
-    <copy todir="${install.all.deployers}/jbossws.deployer/META-INF">
-      <fileset dir="${_module.output}/jbossws-native-resources/resources">
-        <include name="standard-*-config.xml"/>
-      </fileset>
-    </copy>
-    <copy todir="${install.all.deployers}/jbossws.deployer" flatten="true" overwrite="true">
-      <fileset dir="${org.jboss.ws.lib}">
-        <include name="jbossws-common.jar"/>
-        <include name="jbossws-framework.jar"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <target name="_module-webservices-all" depends="_module-webservices-most">
-    <!-- Copy the generated javadocs -->
-    <mkdir dir="${install.api}/${_module.name}"/>
-    <copy todir="${install.api}/${_module.name}" filtering="no">
-      <fileset dir="${_module.output}/api">
-        <include name="**/*"/>
-      </fileset>
-    </copy>
-
-    <!-- Copy the generated todo docs -->
-    <mkdir dir="${install.todo}/${_module.name}"/>
-    <copy todir="${install.todo}/${_module.name}" filtering="no" failonerror="false">
-      <fileset dir="${_module.output}/todo">
-        <include name="**/*"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <!-- ============ -->
-  <!-- Hibernate    -->
-  <!-- ============ -->
-
-  <target name="_module-hibernate-int-most">
-    <property name="_module.name" value="hibernate-int" override="true"/>
-    <property name="_module.output" override="true" value="${project.root}/${_module.name}/target"/>
-
-    <mkdir dir="${install.all.lib}"/>
-
-    <!-- The hibernate-int module output -->
-    <copy file="${_module.output}/jboss-as-hibernate-int.jar"
-          todir="${install.all.lib}/" filtering="no" />
-
-    <!-- The hibernate jar -->
-    <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${hibernate.lib}" includes="*.jar"
-               excludes="*-sources.jar, *-javadoc.jar"/>
-      <fileset dir="${org.hibernate.lib}" includes="*.jar"
-               excludes="*-sources.jar, *-javadoc.jar"/>
-    </copy>
-
-    <copy todir="${install.server}/all/deployers" filtering="no">
-      <fileset dir="${_module.output}/resources">
-        <include name="hibernate-deployer-jboss-beans.xml"/>
-      </fileset>
-    </copy>
-
-    <!-- ASM jars (cglib dependency)
-    <copy todir="${install.all.lib}" filtering="no">
-    <fileset dir="${asm.asm.lib}" includes="*.jar" />
-    </copy>
-    -->
-
-    <!-- ANTLR jar -->
-    <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${antlr.antlr.lib}" includes="antlr.jar"/>
-    </copy>
-    
-    <!-- Copy client libraries -->
-    <mkdir dir="${install.client}"/>
-    <copy todir="${install.client}" filtering="no">
-      <fileset dir="${antlr.antlr.lib}" includes="antlr.jar"/>
-    </copy>
-
-    <!-- CGLIB jar
-    <copy todir="${install.all.lib}" filtering="no">
-    <fileset dir="${cglib.lib}" includes="*.jar"/>
-    </copy>
-    -->
-
-    <!-- Commons collections jar -->
-    <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${apache.collections.lib}" includes="*.jar"
-               excludes="*-sources.jar, *-javadoc.jar"/>
-    </copy>
-
-  </target>
-
-  <target name="_module-hibernate-int-all" depends="_module-hibernate-int-most">
-    <!-- Copy the generated javadocs -->
-    <mkdir dir="${install.api}/${_module.name}"/>
-    <copy todir="${install.api}/${_module.name}" filtering="no">
-      <fileset dir="${_module.output}/api">
-        <include name="**/*"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <!-- ================= -->
-  <!--   ProfileService  -->
-  <!-- ================= -->
-
-  <target name="_module-profileservice-most">
-    
-    <property name="_module.name" value="profileservice" override="true"/>
-    <property name="_module.output" override="true" value="${project.root}/${_module.name}/target"/>
-
-    <mkdir dir="${install.all.lib}"/>
-
-    <!-- The profileservice module output -->
-    <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${_module.output}/" includes="jboss-as-profileservice.jar"/>
-    </copy>
-    <!-- Copy the profileservice hdscanner bean to deploy -->
-    <copy todir="${install.server}/all/deploy/"
-      file="${_module.output}/resources/hdscanner-jboss-beans.xml" />
-    <!-- Copy the profileservice beans to an optional file -->
-    <copy todir="${install.server}/all/deploy/"
-      file="${_module.output}/resources/profileservice-jboss-beans.xml" />
-    
-  </target>
-
-  <!-- ============ -->
-  <!--   Spring     -->
-  <!-- ============ -->
-
-   <target name="_module-spring-int-most">
-      <property name="_module.name" value="spring-int" override="true"/>
-      <property name="_module.output" override="true"
-                value="${project.root}/${_module.name}/output"/>
-
-      <!-- Uncomment this if you want jboss-spring.deployer in all configration -->
-<!--
-      <mkdir dir="${install.server}/all/deploy/jboss-spring.deployer"/>
-      <unjar src="${_module.output}/lib/jboss-spring.deployer"
-             dest="${install.server}/all/deploy/jboss-spring.deployer"/>
--->
-   </target>
-
-   <target name="_module-spring-int-all" depends="_module-spring-int-most">
-      <mkdir dir="${install.api}/${_module.name}"/>
-      <copy todir="${install.api}/${_module.name}" filtering="no">
-         <fileset dir="${_module.output}/api">
-            <include name="**/*"/>
-         </fileset>
-      </copy>
-   </target>
-
-  <!-- ============================================================== -->
-  <!--  Thirdparty dependencies consumed directly from the repository -->
-  <!-- ============================================================== -->
-
-  <target name="thirdparty" description="Copy thirdparty dependencies from the repository">
-
-    <!-- 
-      -  Initialize properties for each dependency in the thirdparty pom 
-      -  The properties take the form "groupId:artifactId:packaging"
-      -->
-    <maven:dependencies filesetId="pom.dependencies"
-                        versionsId="pom.dependencies.versions"
-                        scopes="compile, runtime" type="pom, jar, zip">
-      <pom file="../thirdparty/pom.xml"/>
-    </maven:dependencies>
-    
-    <!-- Due to MANTTASKS-148 files with jboss-sar packaging cannot be resolved directly in the pom -->
-    <xmlproperty file="../component-matrix/pom.xml" prefix="component-matrix"/>
-    <maven:dependencies>
-      <dependency groupId="jboss.jbossts" artifactId="jbossts-tools" 
-                  version="${component-matrix.project.properties.version.jboss.jbossts}" type="sar"/>
-      <dependency groupId="org.jboss.jaxr" artifactId="juddi-service" 
-                  version="${component-matrix.project.properties.version.jboss.jaxr}" type="sar"/>
-    </maven:dependencies>
-
-    <mkdir dir="${install.common.lib}"/>
-    <copy todir="${install.common.lib}" filtering="no">
-      <fileset file="${org.jboss.threads:jboss-threads:jar}"/>
-      <fileset file="${org.jboss.xnio:xnio-api:jar}"/>
-      <mapper classpathref="maven-ant-tasks.classpath"
-              classname="org.apache.maven.artifact.ant.VersionMapper"
-              from="${pom.dependencies.versions}" to="flatten" />
-    </copy>
-    
-    <!-- Copy thirdparty libraries to server/all/lib -->
-    <mkdir dir="${install.all.lib}"/>
-    <copy todir="${install.all.lib}" filtering="no">
-      <fileset file="${org.jboss.cache:jbosscache-core:jar}"/>
-      <fileset file="${org.jboss.cache:jbosscache-pojo:jar}"/>
-      <fileset file="${org.jboss.security:jboss-negotiation:jar}"/>
-      <fileset file="${org.jboss.security:jboss-security-spi:jar}"/>
-      <fileset file="${org.jboss.security:jbosssx:jar}"/>
-      <fileset file="${org.jboss.security:jbossxacml:jar}"/>
-      <fileset file="${org.slf4j:slf4j-api:jar}"/>
-      <fileset file="${org.jboss.slf4j:slf4j-jboss-logging:jar}"/>
-      <fileset file="${log4j:log4j:jar}"/>
-      <fileset file="${quartz:quartz:jar}"/>
-      <fileset file="${commons-logging:commons-logging:jar}"/>
-      <fileset file="${jaxen:jaxen:jar}"/>
-      <fileset file="${org.jboss.cluster:jboss-ha-client:jar}"/>
-      <fileset file="${org.jboss.cluster:jboss-ha-server-api:jar}"/>
-      <fileset file="${org.jboss.cluster:jboss-ha-server-cache-spi:jar}"/>
-      <fileset file="${org.jboss.cluster:jboss-ha-server-cache-jbc:jar}"/>
-      <fileset file="${org.jboss.integration:jboss-integration:jar}"/>
-      <fileset file="${org.jboss.metadata:jboss-metadata:jar}"/>
-      <fileset file="${org.jboss.javaee:jboss-jaspi-api:jar}"/>
-      <fileset file="${org.jboss.javaee:jboss-javaee:jar}"/>
-      <fileset file="${org.jboss.naming:jnpserver:jar}"/>
-      <fileset file="${jgroups:jgroups:jar}"/>
-      <fileset file="${net.jcip:jcip-annotations:jar}"/>
-
-      <!-- copy binary release of JBossTS (JTA part) from thirdparty repo -->
-      <fileset file="${jboss.jbossts:jbossjta:jar}"/>
-      <fileset file="${jboss.jbossts:jbossjta-integration:jar}"/>
-      <fileset file="${jboss.jbossts:jbossts-common:jar}"/>
-      
-      <fileset file="${org.jboss.remoting:jboss-remoting:jar}"/>
-      <fileset file="${jboss:jboss-serialization:jar}"/>
-      
-      <fileset file="${org.jboss.ejb3:jboss-ejb3-cache:jar}"/>
-      <fileset file="${org.jboss.ejb3:jboss-ejb3-common:jar}"/>
-      <fileset file="${org.jboss.ejb3:jboss-ejb3-core:jar}"/>
-      <fileset file="${org.jboss.ejb3:jboss-ejb3-deployers:jar}"/>
-      <fileset file="${org.jboss.ejb3:jboss-ejb3-endpoint:jar}"/>
-      <fileset file="${org.jboss.ejb3:jboss-ejb3-ext-api:jar}"/>
-      <fileset file="${org.jboss.ejb3:jboss-ejb3-ext-api-impl:jar}"/>
-      <fileset file="${org.jboss.ejb3:jboss-ejb3-interceptors:jar}"/>
-      <fileset file="${org.jboss.ejb3:jboss-ejb3-metadata:jar}"/>
-      <fileset file="${org.jboss.ejb3:jboss-ejb3-mc-int:jar}"/>
-      <fileset file="${org.jboss.ejb3:jboss-ejb3-proxy-impl:jar}"/>
-      <fileset file="${org.jboss.ejb3:jboss-ejb3-proxy-spi:jar}"/>
-      <fileset file="${org.jboss.ejb3:jboss-ejb3-proxy-clustered:jar}"/>
-      <fileset file="${org.jboss.ejb3:jboss-ejb3-security:jar}"/>
-      <fileset file="${org.jboss.ejb3:jboss-ejb3-timerservice-spi:jar}"/>
-      <fileset file="${org.jboss.ejb3:jboss-ejb3-transactions:jar}"/>
-      <fileset file="${org.hibernate:hibernate-commons-annotations:jar}"/>
-      <fileset file="${org.hibernate:ejb3-persistence:jar}"/>
-      <fileset file="${org.hibernate:hibernate-entitymanager:jar}"/>
-      <fileset file="${org.hibernate:hibernate-annotations:jar}"/>
-      <fileset file="${org.hibernate:hibernate-validator:jar}"/>
-      <fileset file="${org.jboss.jpa:jboss-jpa-deployers:jar}"/>
-      <fileset file="${org.jboss.aspects:jboss-current-invocation-aspects:jar}"/>
-      <fileset file="${org.jboss.aspects:jboss-remoting-aspects:jar}"/>
-      <fileset file="${org.jboss.aspects:jboss-security-aspects:jar}"/>
-      <fileset file="${org.jboss.aspects:jboss-transaction-aspects:jar}"/>
-      <fileset file="${bcel:bcel:jar}"/>
-      <fileset file="${javax.mail:mail:jar}"/>
-      <fileset file="${jboss.messaging:jboss-messaging:jar}"/>
-      <fileset file="${org.beanshell:bsh:jar}"/>
-      <fileset file="${joesnmp:joesnmp:jar}"/>
-      <fileset file="${wutka-dtdparser:dtdparser:jar}"/>
-      <fileset file="${apache-bsf:bsf:jar}"/>
-      <fileset file="${jboss.web:el-api:jar}"/>
-      <fileset file="${jboss.web:jsp-api:jar}"/>
-      <fileset file="${jboss.web:servlet-api:jar}"/>
-      <mapper classpathref="maven-ant-tasks.classpath"
-              classname="org.apache.maven.artifact.ant.VersionMapper"
-              from="${pom.dependencies.versions}" to="flatten" />
-    </copy>
-    <copy file="${snmptrapappender:snmpTrapAppender:jar}"
-          tofile="${install.all.lib}/log4j-snmp-appender.jar"/>
-
-
-    <!-- Copy the generated libraries to lib-->
-    <mkdir dir="${install.lib}"/>
-    <copy todir="${install.lib}" filtering="no">
-      <fileset file="${javassist:javassist:jar}"/>
-      <fileset file="${org.jboss.aop:jboss-aop:jar}"/>
-      <fileset file="${org.jboss.bootstrap:jboss-bootstrap:jar}"/>
-      <fileset file="${org.jboss:jboss-common-core:jar}"/>
-      <fileset file="${org.jboss.logging:jboss-logging-spi:jar}"/>
-      <fileset file="${org.jboss.logging:jboss-logging-jdk:jar}"/>
-      <fileset file="${org.jboss.logging:jboss-logging-log4j:jar}"/>
-      <fileset file="${org.jboss.logbridge:jboss-logbridge:jar}"/>
-      <fileset file="${org.jboss.logmanager:jboss-logmanager:jar}"/>
-      <fileset file="${org.jboss.integration:jboss-classloading-spi:jar}"/>
-      <fileset file="${org.jboss.integration:jboss-profileservice-spi:jar}"/>
-      <fileset file="${org.jboss:jboss-reflect:jar}"/>
-      <fileset file="${org.jboss:jboss-mdr:jar}"/>
-      <fileset file="${org.jboss.man:jboss-managed:jar}"/>
-      <fileset file="${org.jboss.man:jboss-metatype:jar}"/>
-      <fileset file="${oswego-concurrent:concurrent:jar}"/>
-      <fileset file="${dom4j:dom4j:jar}"/>
-      <fileset file="${org.jboss.mx:jboss-j2se:jar}"/>
-      <fileset file="${org.jboss.mx:jboss-mbeans:jar}"/>
-      <fileset file="${org.jboss.mx:jboss-jmx:jar}"/>
-      <fileset file="${org.jboss.cl:jboss-classloader:jar}"/>
-      <fileset file="${org.jboss.cl:jboss-classloading:jar}"/>
-      <fileset file="${org.jboss.cl:jboss-classloading-vfs:jar}"/>
-      <fileset file="${org.jboss.deployers:jboss-deployers-client:jar}"/>
-      <fileset file="${org.jboss.deployers:jboss-deployers-client-spi:jar}"/>
-      <fileset file="${org.jboss.deployers:jboss-deployers-core:jar}"/>
-      <fileset file="${org.jboss.deployers:jboss-deployers-core-spi:jar}"/>
-      <fileset file="${org.jboss.deployers:jboss-deployers-impl:jar}"/>
-      <fileset file="${org.jboss.deployers:jboss-deployers-spi:jar}"/>
-      <fileset file="${org.jboss.deployers:jboss-deployers-structure-spi:jar}"/>
-      <fileset file="${org.jboss.deployers:jboss-deployers-vfs:jar}"/>
-      <fileset file="${org.jboss.deployers:jboss-deployers-vfs-spi:jar}"/>
-      <fileset file="${org.jboss.microcontainer:jboss-aop-mc-int:jar}"/>
-      <fileset file="${org.jboss.microcontainer:jboss-dependency:jar}"/>
-      <fileset file="${org.jboss.microcontainer:jboss-kernel:jar}"/>
-      <fileset file="${org.jboss:jboss-vfs:jar}"/>
-      <fileset file="${org.osgi:osgi_R4_core:jar}"/>
-      <fileset file="${trove:trove:jar}"/>
-      <fileset file="${sun-jaxb:jaxb-impl:jar}"/>
-      <fileset file="${sun-jaxb:jaxb-xjc:jar}"/>
-      <fileset file="${org.codehaus.woodstox:wstx-lgpl:jar}"/>
-      <fileset file="${org.jboss.aop:jboss-aop-asintegration-core:jar}"/>
-      <fileset file="${org.jboss.aop:jboss-aop-asintegration-jmx:jar}"/>
-      <fileset file="${org.jboss.aop:jboss-aop-asintegration-mc:jar}"/>
-      <fileset file="${org.jboss.aop:jboss-aop-deployers:jar}"/>
-      <fileset file="${gnu-getopt:getopt:jar}"/>
-      <mapper classpathref="maven-ant-tasks.classpath"
-              classname="org.apache.maven.artifact.ant.VersionMapper"
-              from="${pom.dependencies.versions}" to="flatten" />
-    </copy>
-    <!-- 
-      -  Note: this is copied separately because the name (jboss-xml-binding) is 
-      -  hardcoded in the wsconsume scripts.  Once this is changed
-      -  in the scripts, this should be added to the list of lib jars above
-      -->
-    <copy file="${org.jboss:jbossxb:jar}"
-          tofile="${install.lib}/jboss-xml-binding.jar"/>
-
-    <!-- Copy the generated client libraries -->
-    <mkdir dir="${install.client}"/>
-    <copy todir="${install.client}" filtering="no">
-      <fileset file="${commons-logging:commons-logging:jar}"/>
-      <fileset file="${org.apache:xmlsec:jar}"/>
-      <fileset file="${wsdl4j:wsdl4j:jar}"/>
-      <fileset file="${javassist:javassist:jar}"/>
-      <fileset file="${org.jboss:jboss-common-core:jar}"/>
-      <fileset file="${org.jboss.logging:jboss-logging-spi:jar}"/>
-      <fileset file="${org.jboss.logging:jboss-logging-jdk:jar}"/>
-      <fileset file="${org.jboss.logging:jboss-logging-log4j:jar}"/>
-      <fileset file="${org.slf4j:slf4j-api:jar}"/>
-      <fileset file="${org.jboss.slf4j:slf4j-jboss-logging:jar}"/>
-      <fileset file="${org.jboss.integration:jboss-integration:jar}"/>
-      <fileset file="${org.jboss.ejb3:jboss-ejb3-ext-api:jar}"/>
-      <fileset file="${org.jboss.javaee:jboss-jaspi-api:jar}"/>
-      <fileset file="${org.jboss.javaee:jboss-javaee:jar}"/>
-      <fileset file="${org.jboss.security:jboss-security-spi:jar}"/>
-      <fileset file="${org.jboss.naming:jnp-client:jar}"/>
-      <fileset file="${org.jboss.security:jbosssx-client:jar}"/>
-      <fileset file="${org.jboss.mx:jboss-j2se:jar}"/>
-      <fileset file="${org.jboss.mx:jboss-jmx:jar}"/>
-      <fileset file="${org.jboss.metadata:jboss-metadata:jar}"/>
-      <fileset file="${org.jboss:jboss-mdr:jar}"/>
-      <fileset file="${org.jboss.deployers:jboss-deployers-client:jar}"/>
-      <fileset file="${org.jboss.deployers:jboss-deployers-client-spi:jar}"/>
-      <fileset file="${org.jboss.deployers:jboss-deployers-core:jar}"/>
-      <fileset file="${org.jboss.deployers:jboss-deployers-core-spi:jar}"/>
-      <fileset file="${org.jboss.deployers:jboss-deployers-vfs:jar}"/>
-      <fileset file="${org.jboss.deployers:jboss-deployers-vfs-spi:jar}"/>
-      <fileset file="${org.jboss.remoting:jboss-remoting:jar}"/>
-      <fileset file="${jboss:jboss-serialization:jar}"/>
-      <fileset file="${org.jboss.cluster:jboss-ha-client:jar}"/>
-      <fileset file="${javax.activation:activation:jar}"/>
-      <fileset file="${javax.mail:mail:jar}"/>
-      <fileset file="${sun-jaxb:jaxb-impl:jar}"/>
-      <fileset file="${sun-jaxb:jaxb-xjc:jar}"/>
-      <fileset file="${sun-jaxws:jaxws-tools:jar}"/>
-      <fileset file="${sun-jaxws:jaxws-rt:jar}"/>
-      <fileset file="${sun-jaxws:stax-ex:jar}"/>
-      <fileset file="${sun-jaxws:streambuffer:jar}"/>
-      <fileset file="${trove:trove:jar}"/>
-      <fileset file="${org.codehaus.woodstox:wstx-lgpl:jar}"/>
-      <fileset file="${wscommons-policy:policy:jar}"/>
-      <fileset file="${org.hibernate:ejb3-persistence:jar}"/>
-      <fileset file="${org.hibernate:hibernate-annotations:jar}"/>
-      <fileset file="${org.jboss.aop:jboss-aop:jar:client}"/>
-      <fileset file="${org.jboss.ejb3:jboss-ejb3-ext-api:jar}"/>
-      <!-- For JSR-250 impl -->
-      <fileset file="${org.jboss.ejb3:jboss-ejb3-ext-api-impl:jar}"/>
-      <fileset file="${org.jboss.ejb3:jboss-ejb3-common:jar:client}"/>
-      <fileset file="${org.jboss.ejb3:jboss-ejb3-core:jar:client}"/>
-      <fileset file="${org.jboss.ejb3:jboss-ejb3-proxy-impl:jar:client}"/>
-      <fileset file="${org.jboss.ejb3:jboss-ejb3-proxy-spi:jar:client}"/>
-      <fileset file="${org.jboss.ejb3:jboss-ejb3-proxy-clustered:jar:client}"/>
-      <fileset file="${org.jboss.ejb3:jboss-ejb3-security:jar:client}"/>
-      <fileset file="${log4j:log4j:jar}"/>
-      <fileset file="${gnu-getopt:getopt:jar}"/>
-      <fileset file="${oswego-concurrent:concurrent:jar}"/>
-      <fileset file="${jboss.messaging:jboss-messaging-client:jar}"/>
-      <fileset file="${org.jboss.security:jbosssx-client:jar}"/>
-      <fileset file="${apache-scout:scout:jar}"/>
-      <mapper classpathref="maven-ant-tasks.classpath"
-              classname="org.apache.maven.artifact.ant.VersionMapper"
-              from="${pom.dependencies.versions}" to="flatten" />
-    </copy>
-    <!-- 
-      -  Note: this is copied separately because the name (jboss-xml-binding) is 
-      -  hardcoded in the wsconsume scripts.  Once this is changed
-      -  in the scripts, this should be added to the list of client jars above
-      -->
-    <copy file="${org.jboss:jbossxb:jar}"
-          tofile="${install.client}/jboss-xml-binding.jar"/>
-
-    <!-- Copy thirdparty code to lib/endorsed -->
-    <mkdir dir="${install.lib}/endorsed"/>
-    <copy todir="${install.lib}/endorsed" filtering="no">
-      <fileset file="${xerces:xercesImpl:jar}"/>
-      <fileset file="${apache-xerces:resolver:jar}"/>
-      <fileset file="${apache-xalan:xalan:jar}"/>
-      <fileset file="${apache-xalan:serializer:jar}"/>
-      <fileset file="${sun-jaxb:jaxb-api:jar}"/>
-      <fileset file="${javax.activation:activation:jar}"/>
-      <fileset file="${stax:stax-api:jar}"/>
-      <mapper classpathref="maven-ant-tasks.classpath"
-              classname="org.apache.maven.artifact.ant.VersionMapper"
-              from="${pom.dependencies.versions}" to="flatten" />
-    </copy>
-    
-    <!-- avoid the duplicate copying of jaxb/stax apis from jbossws macros -->
-    <delete file="${install.lib}/jaxb-api.jar"/>
-    <delete file="${install.lib}/stax-api.jar"/>
-
-    <!-- Unpack the javaee dtds/schemas from jboss-metadata.jar -->
-    <mkdir dir="${install.dtd}"/>
-    <mkdir dir="${install.schema}"/>
-    <unzip src="${org.jboss.metadata:jboss-metadata:jar}" dest="${install.docs}">
-      <patternset>
-        <include name="dtd/*"/>
-        <include name="schema/*"/>
-      </patternset>
-    </unzip>
-
-    <copy todir="${install.all.conf}" filtering="no" file="${project.thirdparty}/jboss/jbossts/resources/jbossjta-properties.xml"/>
-
-    <mkdir dir="${install.examples}/jts"/>
-    <copy todir="${install.examples}/jts" filtering="no">
-      <fileset file="${jboss.jbossts:jbossjts:jar}"/>
-      <fileset file="${jboss.jbossts:jbossjts-integration:jar}"/>
-      <fileset file="${jboss.jbossts:jbossjts-jacorb:jar}"/>
-      <fileset file="${jboss.jbossts:jbossts-tools:sar}"/>
-      <mapper classpathref="maven-ant-tasks.classpath"
-              classname="org.apache.maven.artifact.ant.VersionMapper"
-              from="${pom.dependencies.versions}" to="flatten" />
-    </copy>
-    
-    <unzip src="${jboss.jbossts:resources:jar}" dest="${install.examples}/jts">
-      <patternset>
-        <include name="resources/jbossjts-properties.xml"/>
-      </patternset>
-      <mapper type="flatten"/>
-    </unzip>
-    <!-- copy JBossTS JTS install script and instructions from jbossas-jts module -->
-    <copy todir="${install.examples}/jts" filtering="no">
-      <fileset dir="${project.root}/jbossas-jts">
-        <include name="README.txt"/>
-        <include name="build.xml"/>
-      </fileset>
-    </copy>       
-
-    <chmod perm="+x">
-      <fileset dir="${install.bin}">
-        <include name="*.sh"/>
-      </fileset>
-    </chmod>
-   	
-    <copy todir="${install.server}/all/deployers" filtering="no">
-      <fileset file="${org.jboss.ejb3:jboss-ejb3-endpoint-deployer:jar}"/>
-      <mapper classpathref="maven-ant-tasks.classpath"
-              classname="org.apache.maven.artifact.ant.VersionMapper"
-              from="${pom.dependencies.versions}" to="flatten" />
-    </copy>
-
-    <unzip dest="${install.server}/all/deployers">
-      <fileset file="${org.jboss.webbeans.integration:webbeans-ri-int-deployer:zip}"/>
-    </unzip>
-
-    <!-- Copy varia stuff -->
-    
-    <!-- Include the juddi sar unpacked -->
-    <mkdir dir="${install.server}/all/deploy/juddi-service.sar"/>
-    <unjar src="${org.jboss.jaxr:juddi-service:sar}"
-       dest="${install.server}/all/deploy/juddi-service.sar" />
-
-    <!-- copy scout.jar and juddi.jar to juddi-service.sar directory -->
-    <copy todir="${install.server}/all/deploy/juddi-service.sar" filtering="no">
-      <fileset file="${apache-scout:scout:jar}"/>
-      <fileset file="${juddi:juddi:jar}"/>
-      <mapper classpathref="maven-ant-tasks.classpath"
-              classname="org.apache.maven.artifact.ant.VersionMapper"
-              from="${pom.dependencies.versions}" to="flatten" />
-    </copy>
-
-    <!-- Create optional libs; e.g. seam-integration -->
-    <mkdir dir="${install.server}/all/deployers/seam.deployer/lib-int"/>
-    <copy todir="${install.server}/all/deployers/seam.deployer/lib-int" filtering="no">
-      <fileset file="${org.jboss.seam.integration:jboss-seam-int-jbossas:jar}"/>
-      <mapper classpathref="maven-ant-tasks.classpath"
-              classname="org.apache.maven.artifact.ant.VersionMapper"
-              from="${pom.dependencies.versions}" to="flatten" />
-    </copy>
-
-    <!-- copy the threads deployer files into their proper places -->
-    <mkdir dir="${install.server}/all/deployers/jboss-threads.deployer/META-INF"/>
-    <copy todir="${install.server}/all/deployers/jboss-threads.deployer">
-      <fileset file="${org.jboss.threads:jboss-threads-metadata:jar}"/>
-      <mapper classpathref="maven-ant-tasks.classpath"
-              classname="org.apache.maven.artifact.ant.VersionMapper"
-              from="${pom.dependencies.versions}" to="flatten" />
-    </copy>
-
-    <!-- copy the xnio deployer files into their proper places -->
-    <mkdir dir="${install.server}/all/deploy/xnio-provider.jar/META-INF"/>
-    <copy todir="${install.server}/all/deploy/xnio-provider.jar">
-      <fileset file="${org.jboss.xnio:xnio-nio:jar}"/>
-      <mapper classpathref="maven-ant-tasks.classpath"
-              classname="org.apache.maven.artifact.ant.VersionMapper"
-              from="${pom.dependencies.versions}" to="flatten" />
-    </copy>
-
-    <mkdir dir="${install.server}/all/deployers/xnio.deployer/META-INF"/>
-    <copy todir="${install.server}/all/deployers/xnio.deployer">
-      <fileset file="${org.jboss.xnio:xnio-metadata:jar}"/>
-      <mapper classpathref="maven-ant-tasks.classpath"
-              classname="org.apache.maven.artifact.ant.VersionMapper"
-              from="${pom.dependencies.versions}" to="flatten" />
-    </copy>
-    <!-- End varia stuff -->
-  </target>
-</project>

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2009-05-21 17:34:23 UTC (rev 89254)
+++ trunk/build/build.xml	2009-05-21 18:26:19 UTC (rev 89255)
@@ -35,6 +35,34 @@
   </target>
 
 
+  <target name="init-thirdparty-dependencies" depends="init"
+          description="Initialize thirdparty dependency configuration">
+    <!-- 
+      -  Initialize properties for each dependency in the thirdparty pom 
+      -  The properties take the form "groupId:artifactId:packaging"
+      -->
+    <maven:dependencies filesetId="pom.dependencies"
+                        versionsId="pom.dependencies.versions"
+                        scopes="compile, runtime" type="pom, jar, zip, war"
+                        addArtifactFileSetRefs="true">
+      <pom file="../thirdparty/pom.xml"/>
+    </maven:dependencies>
+
+    <mapper id="remove-versions" classpathref="maven-ant-tasks.classpath"
+              classname="org.apache.maven.artifact.ant.VersionMapper"
+              from="${pom.dependencies.versions}" to="flatten" />
+
+    <!-- Due to MANTTASKS-148 files with jboss-sar packaging cannot be resolved directly in the pom -->
+    <xmlproperty file="../component-matrix/pom.xml" prefix="component-matrix"/>
+    <maven:dependencies addArtifactFileSetRefs="true">
+      <dependency groupId="jboss.jbossts" artifactId="jbossts-tools" 
+                  version="${component-matrix.project.properties.version.jboss.jbossts}" type="sar"/>
+      <dependency groupId="org.jboss.jaxr" artifactId="juddi-service" 
+                  version="${component-matrix.project.properties.version.jboss.jaxr}" type="sar"/>
+    </maven:dependencies>
+
+  </target>
+
   <!-- ================================================================== -->
   <!-- Configuration                                                      -->
   <!-- ================================================================== -->
@@ -485,7 +513,7 @@
   <!-- Clean up dist build output -->
   <target name="clean-dist" depends="configure"
           description="Cleans up distribution build.">
-    <delete includeEmptyDirs="true">
+    <delete includeEmptyDirs="true" failonerror="false">
        <fileset dir="${dist.module.output}"/>
     </delete>
   </target>
@@ -588,33 +616,9 @@
 
   </target>
 
-  <target name="init-thirdparty-dependencies" depends="init"
-          description="Initialize thirdparty dependency configuration">
-    <!-- 
-      -  Initialize properties for each dependency in the thirdparty pom 
-      -  The properties take the form "groupId:artifactId:packaging"
-      -->
-    <maven:dependencies filesetId="pom.dependencies"
-                        versionsId="pom.dependencies.versions"
-                        scopes="compile, runtime" type="pom, jar, zip, war"
-                        addArtifactFileSetRefs="true">
-      <pom file="../thirdparty/pom.xml"/>
-    </maven:dependencies>
 
-    <!-- Due to MANTTASKS-148 files with jboss-sar packaging cannot be resolved directly in the pom -->
-    <xmlproperty file="../component-matrix/pom.xml" prefix="component-matrix"/>
-    <maven:dependencies addArtifactFileSetRefs="true">
-      <dependency groupId="jboss.jbossts" artifactId="jbossts-tools" 
-                  version="${component-matrix.project.properties.version.jboss.jbossts}" type="sar"/>
-      <dependency groupId="org.jboss.jaxr" artifactId="juddi-service" 
-                  version="${component-matrix.project.properties.version.jboss.jaxr}" type="sar"/>
-    </maven:dependencies>
 
-  </target>
 
-
-
-
   <!-- ================================================================== -->
   <!-- Module Pass-through Hooks                                          -->
   <!-- ================================================================== -->
@@ -1801,9 +1805,7 @@
       <fileset file="${org.jboss.ws.native:jbossws-native-jaxws:jar}"/>
       <fileset file="${org.jboss.ws.native:jbossws-native-jaxws-ext:jar}"/>
       <fileset file="${org.jboss.ws.native:jbossws-native-saaj:jar}"/>
-      <mapper classpathref="maven-ant-tasks.classpath"
-                classname="org.apache.maven.artifact.ant.VersionMapper"
-                from="${pom.dependencies.versions}" to="flatten" />
+      <mapper refid="remove-versions" />
     </copy>
   </target>
 
@@ -1828,9 +1830,7 @@
       <fileset file="${wscommons-policy:policy:jar}"/>
       <fileset file="${wsdl4j:wsdl4j:jar}"/>
       <fileset file="${org.apache:xmlsec:jar}"/>
-      <mapper classpathref="maven-ant-tasks.classpath"
-                classname="org.apache.maven.artifact.ant.VersionMapper"
-                from="${pom.dependencies.versions}" to="flatten" />
+      <mapper refid="remove-versions" />
     </copy>
     <unzip src="${org.jboss.ws.native:jbossws-native-resources:jar}"
            dest="${webservices.module.output}/jbossws-native-resources"/>
@@ -1847,9 +1847,7 @@
     <copy todir="${install.all.deployers}/jbossws.deployer" flatten="true" overwrite="true">
       <fileset file="${org.jboss.ws:jbossws-common:jar}"/>
       <fileset file="${org.jboss.ws:jbossws-framework:jar}"/>
-      <mapper classpathref="maven-ant-tasks.classpath"
-                classname="org.apache.maven.artifact.ant.VersionMapper"
-                from="${pom.dependencies.versions}" to="flatten" />
+      <mapper refid="remove-versions" />
     </copy>
   </target>
 
@@ -1971,9 +1969,7 @@
       <fileset file="${org.jboss.ws:jbossws-common:jar}"/>
       <fileset file="${org.jboss.ws:jbossws-framework:jar}"/>
       <fileset file="${org.jboss.ws:jbossws-spi:jar}"/>
-      <mapper classpathref="maven-ant-tasks.classpath"
-                classname="org.apache.maven.artifact.ant.VersionMapper"
-                from="${pom.dependencies.versions}" to="flatten" />
+      <mapper refid="remove-versions" />
     </copy>
 
     <!-- Copy thirdparty libraries to server/all/lib -->
@@ -2054,9 +2050,7 @@
       <fileset file="${jboss.web:servlet-api:jar}"/>
       <fileset file="${jacorb:jacorb:jar}"/>
       <fileset file="${apache-avalon:avalon-framework:jar}"/>
-      <mapper classpathref="maven-ant-tasks.classpath"
-                classname="org.apache.maven.artifact.ant.VersionMapper"
-                from="${pom.dependencies.versions}" to="flatten" />
+      <mapper refid="remove-versions" />
     </copy>
     <copy file="${snmptrapappender:snmpTrapAppender:jar}"
             tofile="${install.all.lib}/log4j-snmp-appender.jar"/>
@@ -2111,9 +2105,7 @@
       <fileset file="${org.jboss.aop:jboss-aop-asintegration-mc:jar}"/>
       <fileset file="${org.jboss.aop:jboss-aop-deployers:jar}"/>
       <fileset file="${gnu-getopt:getopt:jar}"/>
-      <mapper classpathref="maven-ant-tasks.classpath"
-                classname="org.apache.maven.artifact.ant.VersionMapper"
-                from="${pom.dependencies.versions}" to="flatten" />
+      <mapper refid="remove-versions" />
     </copy>
     <!-- 
         -  Note: this is copied separately because the name (jboss-xml-binding) is 
@@ -2202,9 +2194,7 @@
       <fileset file="${sun-jaxb:jaxb-api:jar}"/>
       <fileset file="${stax:stax-api:jar}"/>
       <fileset file="${org.codehaus.jettison:jettison:jar}"/>
-      <mapper classpathref="maven-ant-tasks.classpath"
-                classname="org.apache.maven.artifact.ant.VersionMapper"
-                from="${pom.dependencies.versions}" to="flatten" />
+      <mapper refid="remove-versions" />
     </copy>
     <!-- 
         -  Note: this is copied separately because the name (jboss-xml-binding) is 
@@ -2224,9 +2214,7 @@
       <fileset file="${sun-jaxb:jaxb-api:jar}"/>
       <fileset file="${javax.activation:activation:jar}"/>
       <fileset file="${stax:stax-api:jar}"/>
-      <mapper classpathref="maven-ant-tasks.classpath"
-                classname="org.apache.maven.artifact.ant.VersionMapper"
-                from="${pom.dependencies.versions}" to="flatten" />
+      <mapper refid="remove-versions" />
     </copy>
 
     <!-- avoid the duplicate copying of jaxb/stax apis from jbossws macros -->
@@ -2258,9 +2246,7 @@
       <fileset file="${jboss.jbossts:jbossjts-integration:jar}"/>
       <fileset file="${jboss.jbossts:jbossjts-jacorb:jar}"/>
       <fileset file="${jboss.jbossts:jbossts-tools:sar}"/>
-      <mapper classpathref="maven-ant-tasks.classpath"
-                classname="org.apache.maven.artifact.ant.VersionMapper"
-                from="${pom.dependencies.versions}" to="flatten" />
+      <mapper refid="remove-versions" />
     </copy>
 
     <unzip src="${jboss.jbossts:resources:jar}" dest="${install.examples}/jts">
@@ -2285,9 +2271,7 @@
 
     <copy todir="${install.server}/all/deployers" filtering="no">
       <fileset file="${org.jboss.ejb3:jboss-ejb3-endpoint-deployer:jar}"/>
-      <mapper classpathref="maven-ant-tasks.classpath"
-                classname="org.apache.maven.artifact.ant.VersionMapper"
-                from="${pom.dependencies.versions}" to="flatten" />
+      <mapper refid="remove-versions" />
     </copy>
 
     <unzip dest="${install.server}/all/deployers">
@@ -2305,44 +2289,34 @@
     <copy todir="${install.server}/all/deploy/juddi-service.sar" filtering="no">
       <fileset file="${apache-scout:scout:jar}"/>
       <fileset file="${juddi:juddi:jar}"/>
-      <mapper classpathref="maven-ant-tasks.classpath"
-                classname="org.apache.maven.artifact.ant.VersionMapper"
-                from="${pom.dependencies.versions}" to="flatten" />
+      <mapper refid="remove-versions" />
     </copy>
 
     <!-- Create optional libs; e.g. seam-integration -->
     <mkdir dir="${install.server}/all/deployers/seam.deployer/lib-int"/>
     <copy todir="${install.server}/all/deployers/seam.deployer/lib-int" filtering="no">
       <fileset file="${org.jboss.seam.integration:jboss-seam-int-jbossas:jar}"/>
-      <mapper classpathref="maven-ant-tasks.classpath"
-                classname="org.apache.maven.artifact.ant.VersionMapper"
-                from="${pom.dependencies.versions}" to="flatten" />
+      <mapper refid="remove-versions" />
     </copy>
 
     <!-- copy the threads deployer files into their proper places -->
     <mkdir dir="${install.server}/all/deployers/jboss-threads.deployer/META-INF"/>
     <copy todir="${install.server}/all/deployers/jboss-threads.deployer">
       <fileset file="${org.jboss.threads:jboss-threads-metadata:jar}"/>
-      <mapper classpathref="maven-ant-tasks.classpath"
-                classname="org.apache.maven.artifact.ant.VersionMapper"
-                from="${pom.dependencies.versions}" to="flatten" />
+      <mapper refid="remove-versions" />
     </copy>
 
     <!-- copy the xnio deployer files into their proper places -->
     <mkdir dir="${install.server}/all/deploy/xnio-provider.jar/META-INF"/>
     <copy todir="${install.server}/all/deploy/xnio-provider.jar">
       <fileset file="${org.jboss.xnio:xnio-nio:jar}"/>
-      <mapper classpathref="maven-ant-tasks.classpath"
-                classname="org.apache.maven.artifact.ant.VersionMapper"
-                from="${pom.dependencies.versions}" to="flatten" />
+      <mapper refid="remove-versions" />
     </copy>
 
     <mkdir dir="${install.server}/all/deployers/xnio.deployer/META-INF"/>
     <copy todir="${install.server}/all/deployers/xnio.deployer">
       <fileset file="${org.jboss.xnio:xnio-metadata:jar}"/>
-      <mapper classpathref="maven-ant-tasks.classpath"
-                classname="org.apache.maven.artifact.ant.VersionMapper"
-                from="${pom.dependencies.versions}" to="flatten" />
+      <mapper refid="remove-versions" />
     </copy>
     <!-- End varia stuff -->
   </target>




More information about the jboss-cvs-commits mailing list