[jboss-cvs] JBossAS SVN: r61311 - in branches/Branch_AOP_1_5: aop and 2 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Mar 13 16:14:53 EDT 2007


Author: kabir.khan at jboss.com
Date: 2007-03-13 16:14:52 -0400 (Tue, 13 Mar 2007)
New Revision: 61311

Removed:
   branches/Branch_AOP_1_5/admin-console/
   branches/Branch_AOP_1_5/aspects/
   branches/Branch_AOP_1_5/cluster/
   branches/Branch_AOP_1_5/connector/
   branches/Branch_AOP_1_5/console/
   branches/Branch_AOP_1_5/deployment/
   branches/Branch_AOP_1_5/ejb3/
   branches/Branch_AOP_1_5/ejb3x/
   branches/Branch_AOP_1_5/hibernate-int/
   branches/Branch_AOP_1_5/iiop/
   branches/Branch_AOP_1_5/j2ee/
   branches/Branch_AOP_1_5/j2se/
   branches/Branch_AOP_1_5/jbossas/
   branches/Branch_AOP_1_5/jms/
   branches/Branch_AOP_1_5/jmx-remoting/
   branches/Branch_AOP_1_5/jmx/
   branches/Branch_AOP_1_5/management/
   branches/Branch_AOP_1_5/mbeans/
   branches/Branch_AOP_1_5/messaging/
   branches/Branch_AOP_1_5/naming/
   branches/Branch_AOP_1_5/security/
   branches/Branch_AOP_1_5/server/
   branches/Branch_AOP_1_5/spring-int/
   branches/Branch_AOP_1_5/system/
   branches/Branch_AOP_1_5/testsuite/
   branches/Branch_AOP_1_5/tomcat/
   branches/Branch_AOP_1_5/transaction/
   branches/Branch_AOP_1_5/varia/
   branches/Branch_AOP_1_5/webservice/
Modified:
   branches/Branch_AOP_1_5/aop/build.xml
   branches/Branch_AOP_1_5/build/build-distr.xml
   branches/Branch_AOP_1_5/build/build-thirdparty.xml
   branches/Branch_AOP_1_5/build/build.xml
   branches/Branch_AOP_1_5/tools/etc/buildmagic/buildmagic.ent
   branches/Branch_AOP_1_5/tools/etc/buildmagic/modules.ent
Log:
Get rid of shit that is not needed on Branch_AOP_15

Modified: branches/Branch_AOP_1_5/aop/build.xml
===================================================================
--- branches/Branch_AOP_1_5/aop/build.xml	2007-03-13 20:06:54 UTC (rev 61310)
+++ branches/Branch_AOP_1_5/aop/build.xml	2007-03-13 20:14:52 UTC (rev 61311)
@@ -85,7 +85,7 @@
          <path refid="oswego.concurrent.classpath"/>
          <path refid="junit.junit.classpath"/>
          <path refid="jboss.profiler.jvmti.classpath"/>
-         <path refid="jboss.microcontainer.classpath"/>
+         <!--path refid="jboss.microcontainer.classpath"/-->
       </path>
 
       <!-- Defines jrockit.home -->

Modified: branches/Branch_AOP_1_5/build/build-distr.xml
===================================================================
--- branches/Branch_AOP_1_5/build/build-distr.xml	2007-03-13 20:06:54 UTC (rev 61310)
+++ branches/Branch_AOP_1_5/build/build-distr.xml	2007-03-13 20:14:52 UTC (rev 61311)
@@ -8,1853 +8,20 @@
   &libraries;
 
 
-  <!-- ================================================================== -->
-  <!-- Module Pass-through Hooks                                          -->
-  <!-- ================================================================== -->
-
-  <!--
-     | These hooks are executed after the above pass-through targets have
-     | finished with a given module.
-   -->
-
-   <!-- ======== -->
-   <!-- Test     -->
-   <!-- ======== -->
-
-   <target name="_module-test-most">
-     <property name="_module.name" value="test" override="true"/>
-     <property name="_module.output" override="true"
-           value="${project.root}/${_module.name}/output"/>
-   </target>
-
-   <target name="_module-test-all" depends="_module-test-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>
-
-  <!-- ======== -->
-  <!-- Remoting -->
-  <!-- ======== -->
-
-  <target name="_module-jbossas/remoting-most">
-    <property name="_module.name" value="remoting" override="true"/>
-    <property name="_module.output" override="true"
-          value="${project.root}/jbossas/${_module.name}/output"/>
-
-    <!-- Copy the generated libraries -->
-    <mkdir dir="${install.all.lib}"/>
-    <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-         <include name="jbossas-remoting.jar"/>
-      </fileset>
-    </copy>
-
-     <!-- Copy the third party libraries -->
-     <mkdir dir="${install.all.lib}"/>
-     <copy todir="${install.all.lib}" filtering="no">
-        <fileset dir="${jboss.remoting.lib}">
-          <include name="jboss-remoting.jar"/>
-        </fileset>
-     </copy>
-     <copy todir="${install.all.lib}" filtering="no">
-        <fileset dir="${jboss.serialization.lib}">
-          <include name="jboss-serialization.jar"/>
-        </fileset>
-     </copy>
-     <copy todir="${install.all.lib}" filtering="no">
-        <fileset dir="${apache.httpclient.lib}">
-          <include name="commons-httpclient.jar"/>
-        </fileset>
-     </copy>
-  </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}/output"/>
-
-      <!-- Copy the generated libraries -->
-      <mkdir dir="${install.all.lib}"/>
-      <copy todir="${install.all.lib}" filtering="no">
-         <fileset dir="${_module.output}/lib">
-            <include name="jboss-jmx-remoting.jar"/>
-         </fileset>
-      </copy>
-   </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>
-
-   <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>
-
-   <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}/output"/>
-
-      <unjar src="${project.root}/${_module.name}/output/lib/jmx-remoting.sar"
-         dest="${install.default}/deploy/jmx-remoting.sar"/>
-   </target>
-
-   <!-- ======== -->
-   <!-- EJB3X  -->
-   <!-- ======== -->
-
-   <target name="_module-ejb3x-most">
-     <property name="_module.name" value="ejb3x" override="true"/>
-     <property name="_module.output" override="true"
-           value="${project.root}/${_module.name}/output"/>
-
-   <!-- Copy across client jars -->
-    <mkdir dir="${install.client}"/>
-    <copy todir="${install.client}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-        <include name="jboss-ejb3x.jar"/>
-      </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}/output"/>
-
-      <copy todir="${install.server}/all/deploy" filtering="no">
-        <fileset dir="${_module.output}/lib">
-           <include name="ejb3.deployer/**"/>
-           <include name="ejb3-interceptors-aop.xml"/>
-           <include name="ejb3-entity-cache-service.xml"/>
-           <include name="ejb3-clustered-sfsbcache-service.xml"/>
-        </fileset>
-      </copy>
-
-   <!-- Copy across client jars -->
-    <mkdir dir="${install.client}"/>
-    <copy todir="${install.client}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-        <include name="jboss-ejb3-client.jar"/>
-        <include name="jboss-ejb3x.jar"/>
-        <include name="hibernate-client.jar"/>
-        <include name="jboss-annotations-ejb3.jar"/>
-      </fileset>
-      <fileset dir="${hibernate.entitymanager.lib}">
-        <include name="ejb3-persistence.jar"/>
-      </fileset>
-      <fileset dir="${hibernate.annotations.lib}">
-        <include name="hibernate-annotations.jar"/>
-      </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>
-
-  <!-- ======== -->
-  <!-- AOP           -->
-  <!-- ======== -->
-
-  <target name="_module-aop-most">
-    <property name="_module.name" value="aop" override="true"/>
-    <property name="_module.output" override="true"
-          value="${project.root}/${_module.name}/output"/>
-
-   <!-- Copy across client jars -->
-    <mkdir dir="${install.client}"/>
-    <copy todir="${install.client}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-        <include name="jboss-aop-jdk50-client.jar"/>
-      </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}/output"/>
-
-     <condition property="aop.deployer" value="jboss-aop-jdk50.deployer">
-        <isset property="HAVE_JDK_1.5"/>
-     </condition>
-
-      <condition property="aop.deployer" value="jboss-aop.deployer">
-         <not>
-            <isset property="HAVE_JDK_1.5"/>
-         </not>
-      </condition>
-
-    <!-- Copy the generated libraries -->
-    <mkdir dir="${install.server}/all/deploy/${aop.deployer}"/>
-    <unjar src="${_module.output}/lib/${aop.deployer}"
-       dest="${install.server}/all/deploy/${aop.deployer}" />
-
-   <!-- Copy across client jars -->
-    <mkdir dir="${install.client}"/>
-    <copy todir="${install.client}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-        <include name="jboss-aspect-jdk50-client.jar"/>
-      </fileset>
-    </copy>
-  </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>
-
-  <!-- ==== -->
-  <!-- J2EE -->
-  <!-- ==== -->
-
-  <target name="_module-j2ee-most">
-    <property name="_module.name" value="j2ee" override="true"/>
-    <property name="_module.output" override="true"
-      value="${project.root}/${_module.name}/output"/>
-
-    <!-- Copy the generated libraries -->
-    <mkdir dir="${install.all.lib}"/>
-    <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-        <include name="jboss-j2ee.jar"/>
-        <include name="jboss-jaxrpc.jar"/>
-        <include name="jboss-saaj.jar"/>
-      </fileset>
-    </copy>
-
-    <!-- Copy the generated client libraries -->
-    <mkdir dir="${install.client}"/>
-    <copy todir="${install.client}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-        <include name="jboss-j2ee.jar"/>
-        <include name="jboss-jaxrpc.jar"/>
-        <include name="jboss-saaj.jar"/>
-      </fileset>
-      <fileset dir="${sun.jaf.lib}">
-        <include name="activation.jar"/>
-      </fileset>
-      <fileset dir="${sun.javamail.lib}">
-        <include name="mail.jar"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <target name="_module-j2ee-all" depends="_module-j2ee-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>
-
-  <!-- ====== -->
-  <!-- Common -->
-  <!-- ====== -->
-
   <target name="_module-common-most">
-    <property name="_module.name" value="common" override="true"/>
-    <property name="_module.output" override="true"
-      value="${project.root}/${_module.name}/output"/>
-
-    <!-- Copy the generated libraries -->
-    <mkdir dir="${install.lib}"/>
-    <copy todir="${install.lib}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-        <include name="jboss-common.jar"/>
-        <include name="jboss-xml-binding.jar"/>
-        <include name="namespace.jar"/>
-      </fileset>
-    </copy>
-
-    <!-- Copy the generated client libraries -->
-    <mkdir dir="${install.client}"/>
-    <copy todir="${install.client}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-        <include name="jboss-common-client.jar"/>
-        <include name="jboss-xml-binding.jar"/>
-        <include name="namespace.jar"/>
-      </fileset>
-    </copy>
-
-    <!-- Copy thirdparty code -->
-    <copy todir="${install.lib}" filtering="no">
-      <fileset dir="${apache.slide.lib}">
-        <include name="webdavlib.jar"/>
-      </fileset>
-      <fileset dir="${apache.httpclient.lib}">
-        <include name="commons-httpclient.jar"/>
-      </fileset>
-      <fileset dir="${apache.logging.lib}">
-        <include name="commons-logging.jar"/>
-      </fileset>
-    </copy>
-
-    <!-- Copy thirdparty code to lib/endorsed -->
-    <mkdir dir="${install.lib}/endorsed"/>
-    <copy todir="${install.lib}/endorsed" filtering="no">
-      <fileset dir="${apache.xerces.lib}">
-        <include name="xml-apis.jar"/>
-        <include name="xercesImpl.jar"/>
-        <include name="resolver.jar"/>
-      </fileset>
-      <!-- xalan needs to be here for jdk1.4 -->
-      <fileset dir="${apache.xalan.lib}">
-        <include name="xalan.jar"/>
-        <include name="serializer.jar"/>
-      </fileset>
-    </copy>
-
-    <!-- Copy thirdparty code to server/all/lib -->
-    <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${apache.logging.lib}">
-        <include name="commons-logging.jar"/>
-      </fileset>
-    </copy>
   </target>
 
   <target name="_module-common-all" depends="_module-common-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>
 
-  <!-- ====== -->
-  <!-- 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}/output"/>
-
-    <!-- Copy the generated libraries -->
-    <mkdir dir="${install.lib}"/>
-    <copy todir="${install.lib}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-        <include name="log4j-boot.jar"/>
-        <include name="jboss-system.jar"/>
-      </fileset>
-    </copy>
-
-    <!-- Copy the generated client -->
-    <mkdir dir="${install.client}"/>
-    <copy todir="${install.client}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-        <include name="*-client.jar"/>
-      </fileset>
-    </copy>
-
-    <!-- Copy the generated scripts & runnable jars -->
-    <mkdir dir="${install.bin}"/>
-    <copy todir="${install.bin}" filtering="no">
-      <fileset dir="${_module.output}/bin">
-         <include name="**/*"/>
-      </fileset>
-      <fileset dir="${_module.output}/lib">
-         <include name="run.jar"/>
-      </fileset>
-    </copy>
-    <chmod perm="+x">
-      <fileset dir="${install.bin}">
-         <include name="**/*.sh"/>
-      </fileset>
-    </chmod>
-
-    <!-- Copy thirdparty code -->
-    <copy todir="${install.lib}" filtering="no">
-      <fileset dir="${gnu.getopt.lib}">
-        <include name="getopt.jar"/>
-      </fileset>
-    </copy>
-    <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${apache.log4j.lib}">
-        <include name="log4j.jar"/>
-      </fileset>
-    </copy>
-
-    <!-- Copy thirdparty client code -->
-    <copy todir="${install.client}" filtering="no">
-      <fileset dir="${apache.log4j.lib}">
-        <include name="log4j.jar"/>
-      </fileset>
-      <fileset dir="${gnu.getopt.lib}">
-        <include name="getopt.jar"/>
-      </fileset>
-    </copy>
-
-    <!-- Copy the DTDs -->
-    <mkdir dir="${install.dtd}"/>
-    <copy todir="${install.dtd}" filtering="no">
-      <fileset dir="${project.root}/${_module.name}/src/resources/dtd" />
-    </copy>
-
+  <target name="_module-aop-most">
   </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 name="_module-aop-all" depends="_module-common-most">
   </target>
 
-  <!-- ====== -->
-  <!-- Naming -->
-  <!-- ====== -->
 
-  <target name="_module-naming-most">
-    <property name="_module.name" value="naming" override="true"/>
-    <property name="_module.output" override="true"
-	      value="${project.root}/${_module.name}/output"/>
-
-    <!-- Copy the generated libraries -->
-    <mkdir dir="${install.all.lib}"/>
-    <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-         <include name="jnpserver.jar"/>
-      </fileset>
-    </copy>
-
-    <!-- Copy the generated client libraries -->
-    <mkdir dir="${install.client}"/>
-    <copy todir="${install.client}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-         <include name="jnp-client.jar"/>
-      </fileset>
-    </copy>
-
-  </target>
-
-  <target name="_module-naming-all" depends="_module-naming-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>
-
-  <!-- ====== -->
-  <!-- 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}/output"/>
-
-    <!-- Copy the generated libraries -->
-    <mkdir dir="${install.all.lib}"/>
-    <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-        <include name="jboss.jar"/>
-        <include name="jmx-adaptor-plugin.jar"/>
-      </fileset>
-    </copy>
-
-    <!-- Copy the generated client libraries -->
-    <mkdir dir="${install.client}"/>
-    <copy todir="${install.client}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-         <include name="*-client.jar"/>
-      </fileset>
-    </copy>
-
-    <!-- Copy the generated scripts & runnable jars -->
-    <mkdir dir="${install.bin}"/>
-    <copy todir="${install.bin}" filtering="no">
-      <fileset dir="${_module.output}/bin">
-         <include name="**/*"/>
-      </fileset>
-      <fileset dir="${_module.output}/lib">
-         <include name="deployer.jar"/>
-         <include name="shutdown.jar"/>
-      </fileset>
-    </copy>
-    <chmod perm="+x">
-      <fileset dir="${install.bin}">
-         <include name="**/*.sh"/>
-      </fileset>
-    </chmod>
-
-    <!-- Copy thirdparty code -->
-    <copy todir="${install.lib}" filtering="no">
-      <fileset dir="${oswego.concurrent.lib}">
-        <include name="concurrent.jar"/>
-      </fileset>
-    </copy>
-    <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${gjt.jpl-util.lib}">
-        <include name="*.jar"/>
-      </fileset>
-      <fileset dir="${apache.bcel.lib}">
-        <include name="bcel.jar"/>
-      </fileset>
-    </copy>
-
-    <!-- Copy thirdparty client code -->
-    <copy todir="${install.client}" filtering="no">
-      <fileset dir="${oswego.concurrent.lib}">
-        <include name="concurrent.jar"/>
-      </fileset>
-    </copy>
-
-    <!-- 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}/lib">
-         <include name="uuid-key-generator.sar"/>
-         <include name="sqlexception-service.xml"/>
-         <include name="client-deployer-service.xml"/>
-      </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 default configuration files -->
-    <mkdir dir="${install.server}/all/conf"/>
-    <copy todir="${install.server}/all/conf" filtering="no">
-      <fileset dir="${_module.output}/etc/conf/default">
-         <include name="**"/>
-      </fileset>
-    </copy>
-
-    <!-- Copy the DTDs -->
-    <mkdir dir="${install.dtd}"/>
-    <copy todir="${install.dtd}" filtering="no">
-      <fileset dir="${project.root}/${_module.name}/src/resources/dtd" />
-    </copy>
-
-    <!-- Copy the XML Schemas -->
-    <mkdir dir="${install.schema}"/>
-    <copy todir="${install.schema}" filtering="no">
-      <fileset dir="${project.root}/${_module.name}/src/resources/schema" />
-    </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}/output"/>
-
-
-    <!-- Copy the generated deployment libraries -->
-    <mkdir dir="${install.server}/all/deploy"/>
-    <copy todir="${install.server}/all/deploy" filtering="no">
-      <fileset dir="${_module.output}/lib">
-         <include name="*.rar"/>
-         <exclude name="jms-ra.rar"/>
-      </fileset>
-      <fileset dir="${_module.output}/resources/jca-sar">
-         <include name="jbossjca-service.xml"/>
-      </fileset>
-    </copy>
-    <mkdir dir="${install.all.deploy}/jms"/>
-    <copy todir="${install.all.deploy}/jms" filtering="no">
-      <fileset dir="${_module.output}/lib">
-         <include name="jms-ra.rar"/>
-      </fileset>
-    </copy>
-
-    <mkdir dir="${install.server}/all/lib"/>
-    <copy todir="${install.server}/all/lib" filtering="no">
-      <fileset dir="${_module.output}/lib">
-         <include name="jboss-common-jdbc-wrapper.jar"/>
-         <include name="jboss-jca.jar"/>
-      </fileset>
-    </copy>
-
-    <!-- Copy the dtds -->
-     <mkdir dir="${install.dtd}"/>
-     <copy todir="${install.dtd}" filtering="no">
-       <fileset dir="${project.root}/${_module.name}/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>
-      <fileset dir="${_module.output}/lib">
-        <include name="jboss-ha-local-jdbc.rar"/>
-        <include name="jboss-ha-xa-jdbc.rar"/>
-      </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 todir="${install.client}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-         <include name="jbosscx-client.jar"/>
-      </fileset>
-    </copy>
-
-    <!-- QUARTZ jar -->
-    <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${quartz.quartz.lib}" includes="*.jar"/>
-    </copy>
-
-  </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}/output"/>
-
-    <!-- Copy the generated libraries -->
-    <mkdir dir="${install.all.lib}"/>
-    <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-         <include name="jbossmq.jar"/>
-      </fileset>
-    </copy>
-
-    <!-- Copy the generated client libraries -->
-    <mkdir dir="${install.client}"/>
-    <copy todir="${install.client}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-         <include name="*-client.jar"/>
-      </fileset>
-    </copy>
-
-    <!-- Default server config -->
-
-    <!-- Copy the default jbossmq deployment configuration -->
-    <mkdir dir="${install.all.deploy.hasingleton}/jms"/>
-    <copy todir="${install.all.deploy.hasingleton}/jms" filtering="no">
-      <fileset dir="${_module.output}/etc/server/default/deploy">
-        <include name="**"/>
-      </fileset>
-    </copy>
-
-    <!-- Copy example jms configs -->
-    <mkdir dir="${install.examples.jms}"/>
-    <copy todir="${install.examples.jms}" filtering="no">
-      <fileset dir="${_module.output}/etc/server/examples/deploy">
-         <include name="*.xml"/>
-         <include name="conf/*.xml"/>
-         <include name="standalone/*.xml"/>
-      </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>
-
-   <!-- =========== -->
-   <!-- Messaging 5 -->
-   <!-- =========== -->
-
-   <target name="_module-jms-most">
-     <property name="_module.name" value="jms" override="true"/>
-     <property name="_module.output" override="true"
-          value="${project.root}/${_module.name}/output"/>
-
-     <!-- Copy the generated libraries -->
-     <mkdir dir="${install.all.lib}"/>
-     <copy todir="${install.all.lib}" filtering="no">
-       <fileset dir="${_module.output}/lib">
-          <include name="jboss-messaging.jar"/>
-       </fileset>
-     </copy>
-
-     <!-- Copy the generated client libraries -->
-     <mkdir dir="${install.client}"/>
-     <copy todir="${install.client}" filtering="no">
-       <fileset dir="${_module.output}/lib">
-          <include name="*-client.jar"/>
-       </fileset>
-     </copy>
-
-   </target>
-
-   <target name="_module-jms-all" depends="_module-jms-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>
-
-  <!-- ==== -->
-  <!-- J2SE -->
-  <!-- ==== -->
-
-  <target name="_module-j2se-most">
-    <property name="_module.name" value="j2se" override="true"/>
-    <property name="_module.output" override="true"
-	      value="${project.root}/${_module.name}/output"/>
-
-    <!-- Copy the generated libraries -->
-    <mkdir dir="${install.lib}"/>
-    <copy todir="${install.lib}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-         <include name="jboss-j2se.jar"/>
-      </fileset>
-    </copy>
-
-    <!-- Copy the generated client libraries -->
-    <mkdir dir="${install.client}"/>
-    <copy tofile="${install.client}/jboss-j2se.jar"
-          file="${_module.output}/lib/jboss-j2se.jar"/>
-
-  </target>
-
-  <target name="_module-j2se-all" depends="_module-j2se-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>
-
-  <!-- ====== -->
-  <!-- MBeans -->
-  <!-- ====== -->
-
-  <target name="_module-mbeans-most">
-    <property name="_module.name" value="mbeans" override="true"/>
-    <property name="_module.output" override="true"
-	      value="${project.root}/${_module.name}/output"/>
-
-    <!-- Copy the generated libraries -->
-    <mkdir dir="${install.lib}"/>
-    <copy todir="${install.lib}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-         <include name="jboss-mbeans.jar"/>
-      </fileset>
-    </copy>
-
-    <!-- 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-mbeans-all" depends="_module-mbeans-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 -->
-  <!-- === -->
-
-  <target name="_module-jmx-most">
-    <property name="_module.name" value="jmx" override="true"/>
-    <property name="_module.output" override="true"
-	      value="${project.root}/${_module.name}/output"/>
-
-    <!-- Copy the generated libraries -->
-    <mkdir dir="${install.lib}"/>
-    <copy todir="${install.lib}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-         <include name="jboss-jmx.jar"/>
-      </fileset>
-    </copy>
-
-    <!-- Copy thirdparty code -->
-    <copy todir="${install.lib}" filtering="no">
-      <fileset dir="${oswego.concurrent.lib}">
-        <include name="concurrent.jar"/>
-      </fileset>
-      <fileset dir="${dom4j.dom4j.lib}">
-          <include name="dom4j.jar"/>
-      </fileset>
-    </copy>
-   <copy tofile="${install.lib}/jaxen.jar" filtering="no"
-      file="${jaxen.jaxen.lib}/jaxen-1.1-beta-4.jar" />
-
-    <!-- Copy the generated client libraries -->
-    <mkdir dir="${install.client}"/>
-    <copy tofile="${install.client}/jmx-client.jar"
-      file="${_module.output}/lib/jboss-jmx-core.jar" />
-
-  </target>
-
-  <target name="_module-jmx-all" depends="_module-jmx-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}/output"/>
-
-    <!-- Copy the generated libraries -->
-    <mkdir dir="${install.all.lib}"/>
-    <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-         <include name="jbosssx.jar"/>
-      </fileset>
-    </copy>
-
-    <!-- Copy the generated client libraries -->
-    <mkdir dir="${install.client}"/>
-    <copy todir="${install.client}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-         <include name="*-client.jar"/>
-      </fileset>
-      <fileset dir="${_module.output}/etc/client">
-         <include name="*"/>
-      </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}/output"/>
-
-    <!-- Copy the generated libraries -->
-    <mkdir dir="${install.all.lib}"/>
-    <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-         <include name="jbossha.jar"/>
-         <include name="jbossmqha.jar"/>
-      </fileset>
-    </copy>
-
-    <!-- Copy the generated client libraries -->
-    <mkdir dir="${install.client}"/>
-    <copy todir="${install.client}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-         <include name="jbossha-client.jar"/>
-         <include name="jbossmqha.jar"/>
-      </fileset>
-    </copy>
-
-    <!-- Copy thirdparty code -->
-    <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${jgroups.jgroups.lib}">
-        <include name="jgroups.jar"/>
-      </fileset>
-    </copy>
-
-    <!-- Default server config -->
-
-    <!-- Copy the deployables -->
-    <mkdir dir="${install.server}/all/deploy"/>
-    <copy todir="${install.server}/all/deploy" filtering="no">
-      <fileset dir="${_module.output}/etc">
-         <include name="cluster-service.xml"/>
-         <include name="deploy-hasingleton-service.xml"/>
-      </fileset>
-    </copy>
-    <mkdir dir="${install.server}/all/deploy/deploy.last"/>
-    <copy todir="${install.server}/all/deploy/deploy.last" filtering="no">
-      <fileset dir="${_module.output}/etc">
-         <include name="farm-service.xml"/>
-      </fileset>
-    </copy>
-
-    <!-- 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}/output"/>
-
-    <!-- Copy the generated libraries -->
-    <mkdir dir="${install.all.lib}"/>
-    <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-         <include name="mail-plugin.jar"/>
-         <include name="scheduler-plugin.jar"/>
-         <include name="scheduler-plugin-example.jar"/>
-         <include name="hsqldb.jar"/>
-         <include name="hsqldb-plugin.jar"/>
-         <include name="autonumber-plugin.jar"/>
-         <include name="properties-plugin.jar"/>
-         <include name="bindingservice-plugin.jar"/>
-         <include name="jboss-monitoring.jar"/>
-         <include name="jboss-srp.jar" />
-      </fileset>
-    </copy>
-
-    <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>
-    </copy>
-   <mkdir dir="${install.examples}/jmx/persistent-service.sar"/>
-   <unjar src="${_module.output}/lib/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}/lib">
-       <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}/lib/mbean-configurator.sar"
-         dest="${install.examples}/jmx/mbean-configurator.sar"/>
-
-     <!-- Client jars -->
-     <mkdir dir="${install.client}"/>
-     <copy todir="${install.client}" filtering="no">
-       <fileset dir="${apache.scout.lib}">
-          <include name="scout.jar"/>
-       </fileset>
-       <fileset dir="${_module.output}/lib">
-          <include name="jbossjmx-ant.jar"/>
-          <include name="jboss-srp-client.jar"/>
-       </fileset>
-     </copy>
-
-    <!-- Copy thirdparty code -->
-    <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${sun.jaf.lib}">
-        <include name="activation.jar"/>
-      </fileset>
-      <fileset dir="${sun.javamail.lib}">
-        <include name="mail.jar"/>
-      </fileset>
-    </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 -->
-    <!-- snmp-adaptor.sar depends on lib/snmp-support.jar -->
-    <mkdir dir="${install.server}/all/deploy/snmp-adaptor.sar"/>
-    <unjar src="${_module.output}/lib/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}/lib/jmx-console.war"
-       dest="${install.server}/all/deploy/jmx-console.war"/>
-
-    <!-- Include the juddi sar unpacked -->
-   <!--
-    <mkdir dir="${install.server}/all/deploy/juddi-service.sar"/>
-    <delete dir="${install.server}/all/deploy/juddi-service.sar/juddi.war" quiet="true" />
-    <unjar src="${_module.output}/lib/juddi-service.sar"
-       dest="${install.server}/all/deploy/juddi-service.sar" />
-    <move file="${install.server}/all/deploy/juddi-service.sar/juddi.war"
-          tofile="${install.server}/all/deploy/juddi-service.sar/juddi.war.orig"/>
-    <mkdir dir="${install.server}/all/deploy/juddi-service.sar/juddi.war"/>
-    <unjar src="${install.server}/all/deploy/juddi-service.sar/juddi.war.orig"
-       dest="${install.server}/all/deploy/juddi-service.sar/juddi.war" />
-    <delete file="${install.server}/all/deploy/juddi-service.sar/juddi.war.orig" quiet="true"/>
-
-    <echo>Copy jboss-juddiaxis.jar to client</echo>
-    <copy todir="${install.client}" filtering="no">
-      <fileset dir="${install.server}/all/deploy/juddi-service.sar/">
-        <include name="jboss-juddiaxis.jar"/>
-      </fileset>
-    </copy>
-   -->
-
-    <copy todir="${install.server}/all/lib" filtering="no">
-      <fileset dir="${apache.scout.lib}">
-         <include name="scout.jar"/>
-      </fileset>
-    </copy>
-
-    <!-- Include StAX (JSR-173) -->
-    <copy todir="${install.server}/all/lib" filtering="no">
-      <fileset dir="${codehaus.stax.lib}">
-         <include name="stax-1.1.1.jar"/>
-      </fileset>
-    </copy>
-    <copy todir="${install.server}/all/lib" filtering="no">
-      <fileset dir="${wutka.dtdparser.lib}">
-         <include name="dtdparser121.jar"/>
-      </fileset>
-    </copy>
-
-    <!-- Include the HTTP invoker service unpacked -->
-    <mkdir dir="${install.server}/all/deploy/httpha-invoker.sar"/>
-    <unjar src="${_module.output}/lib/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}/lib">
-         <include name="jbossjmx-ant.jar"/>
-      </fileset>
-    </copy>
-
-    <!-- copy the netboot war tool -->
-    <mkdir dir="${install.examples.netboot}"/>
-    <copy todir="${install.examples.netboot}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-         <include name="netboot.war"/>
-      </fileset>
-    </copy>
-
-    <!-- copy the bsh-deployer lib and its associated beanshell lib from thirdparty -->
-    <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-         <include name="bsh-deployer.jar"/>
-      </fileset>
-      <fileset dir="${beanshell.beanshell.lib}">
-        <include name="*.jar"/>
-      </fileset>
-    </copy>
-
-    <!-- Include the HTTP invoker service unpacked -->
-    <delete dir="${install.all.deploy.hasingleton}/jms/jbossmq-httpil.sar"/>
-    <mkdir dir="${install.all.deploy.hasingleton}/jms/jbossmq-httpil.sar"/>
-    <unjar src="${_module.output}/lib/jbossmq-httpil.sar"
-       dest="${install.all.deploy.hasingleton}/jms/jbossmq-httpil.sar" />
-    <move file="${install.all.deploy.hasingleton}/jms/jbossmq-httpil.sar/jbossmq-httpil.war"
-       tofile="${install.all.deploy.hasingleton}/jms/jbossmq-httpil.sar/tmp.war" />
-    <mkdir dir="${install.all.deploy.hasingleton}/jms/jbossmq-httpil.sar/jbossmq-httpil.war"/>
-    <unjar src="${install.all.deploy.hasingleton}/jms/jbossmq-httpil.sar/tmp.war"
-       dest="${install.all.deploy.hasingleton}/jms/jbossmq-httpil.sar/jbossmq-httpil.war" />
-    <delete file="${install.all.deploy.hasingleton}/jms/jbossmq-httpil.sar/tmp.war" />
-
-    <!-- copy the jboss-monitoring JAR -->
-    <copy file="${project.root}/varia/output/lib/jboss-monitoring.jar"
-          todir="${install.server}/all/lib"/>
-
-    <!-- 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 -->
-    <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}/lib">
-        <include name="logging-monitor.jar"/>
-      </fileset>
-    </copy>
-    <copy todir="${install.examples}/jmx/logging-monitor" filtering="no">
-      <fileset dir="${_module.output}/resources/services/loggingmonitor"/>
-    </copy>
-
-    <!-- copy bsf.jar used by scripting-listener -->
-    <copy todir="${install.server}/all/lib" filtering="no">
-      <fileset dir="${apache.bsf.lib}">
-         <include name="bsf.jar"/>
-      </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>
-
-  <!-- ===== -->
-  <!-- Tomcat5.5.x -->
-  <!-- ===== -->
-
-  <target name="_module-tomcat-most">
-    <property name="_module.name" value="tomcat" override="true"/>
-    <property name="_module.output" override="true"
-	      value="${project.root}/${_module.name}/output"/>
-    <property name="_module.ext" override="true"
-	      value="${project.root}/${_module.name}/ext"/>
-
-    <!-- Copy the thirdparty libraries -->
-    <mkdir dir="${install.all.lib}"/>
-    <copy tofile="${install.all.lib}/javax.servlet.jar"
-       file="${sun.servlet.lib}/servlet-api.jar" />
-    <copy tofile="${install.all.lib}/javax.servlet.jsp.jar"
-       file="${sun.servlet.lib}/jsp-api.jar" />
-
-    <!-- Copy the deployables -->
-    <mkdir dir="${install.server}/all/deploy/jbossweb-tomcat55.sar"/>
-    <copy todir="${install.server}/all/deploy/jbossweb-tomcat55.sar">
-      <fileset dir="${_module.output}/deploy/jbossweb-tomcat55.sar"
-               excludes="**/jboss-service.xml"/>
-    </copy>
-    <copy tofile="${install.server}/all/deploy/jbossweb-tomcat55.sar/META-INF/jboss-service.xml"
-          file="${project.root}/${_module.name}/src/resources/jboss-service-all.xml"/>
-    <copy todir="${install.server}/all/deploy/jbossweb-tomcat55.sar/META-INF"
-      file="${project.root}/${_module.name}/src/resources/webserver-xmbean.xml"/>
-
-    <!-- Copy the tc5 clustering service sar -->
-    <copy todir="${install.server}/all/deploy">
-       <fileset dir="${_module.output}/deploy">
-           <include name="tc5-cluster.sar/**"/>
-       </fileset>
-    </copy>
-
-  </target>
-
-  <target name="_module-tomcat-all" depends="_module-tomcat-most">
-  </target>
-
-  <!-- ========== -->
-  <!-- Webservice -->
-  <!-- ========== -->
-
-  <target name="_module-webservice-most" depends="module-webservice14, module-webservice15">
-    <property name="_module.name" value="webservice" override="true"/>
-    <property name="_module.output" value="${project.root}/${_module.name}/output" override="true"/>
-
-    <!-- copy common client stuff -->
-    <mkdir dir="${install.client}"/>
-    <copy todir="${install.client}" filtering="no">
-      <fileset dir="${sun.jaf.lib}">
-        <include name="activation.jar"/>
-      </fileset>
-      <fileset dir="${apache.logging.lib}">
-        <include name="commons-logging.jar"/>
-      </fileset>
-      <fileset dir="${apache.xmlsec.lib}">
-        <include name="xmlsec.jar"/>
-      </fileset>
-      <fileset dir="${ibm.wsdl4j.lib}">
-        <include name="wsdl4j.jar"/>
-      </fileset>
-      <fileset dir="${javassist.javassist.lib}">
-        <include name="javassist.jar"/>
-      </fileset>
-      <fileset dir="${jboss.remoting.lib}">
-        <include name="jboss-remoting.jar"/>
-      </fileset>
-      <fileset dir="${jboss.serialization.lib}">
-        <include name="jboss-serialization.jar"/>
-      </fileset>
-      <fileset dir="${sun.javamail.lib}">
-        <include name="mail.jar"/>
-      </fileset>
-    </copy>
-
-    <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${javassist.javassist.lib}">
-        <include name="javassist.jar"/>
-      </fileset>
-      <fileset dir="${jboss.jbossretro.lib}">
-        <include name="jbossretro-rt.jar"/>
-      </fileset>
-      <fileset dir="${jboss/backport.concurrent.lib}">
-        <include name="jboss-backport-concurrent.jar"/>
-      </fileset>
-    </copy>
-
-    <!-- Copy the DTDs 
-    <mkdir dir="${install.dtd}"/>
-    <copy todir="${install.dtd}" filtering="no">
-      <fileset dir="${project.root}/${_module.name}/src/resources/dtd" />
-    </copy>
-    -->
-
-    <!-- Copy the XML Schemas 
-    <mkdir dir="${install.schema}"/>
-    <copy todir="${install.schema}" filtering="no">
-      <fileset dir="${project.root}/${_module.name}/src/resources/schema" />
-    </copy>
-    -->
-    
-   </target>
-
-  <target name="module-webservice14" unless="HAVE_JDK_1.5">
-
-    <!-- copy the client stuff -->
-    <mkdir dir="${install.client}"/>
-    <copy todir="${install.client}" filtering="no">
-      <fileset dir="${jboss.jbossws14.lib}">
-        <include name="jbossws14-client.jar"/>
-      </fileset>
-      <fileset dir="${jboss.jbossretro.lib}">
-        <include name="jbossretro-rt.jar"/>
-      </fileset>
-      <fileset dir="${jboss/backport.concurrent.lib}">
-        <include name="jboss-backport-concurrent.jar"/>
-      </fileset>
-    </copy>
-
-    <!-- copy the jbossws14.sar -->
-    <mkdir dir="${install.all.deploy}/jbossws14.sar"/>
-    <unjar dest="${install.all.deploy}/jbossws14.sar" src="${jboss.jbossws14.lib}/jbossws14.sar"/>
-
-    <!-- install wstools shell scripts -->
-    <unjar dest="${install.bin}" src="${jboss.jbossws14.lib}/jbossws14-client.jar">
-      <patternset>
-        <include name="wstools.*"/>
-      </patternset>
-    </unjar>
-  </target>
-
-  <target name="module-webservice15" if="HAVE_JDK_1.5">
-
-    <!-- copy the client stuff -->
-    <mkdir dir="${install.client}"/>
-    <copy todir="${install.client}" filtering="no">
-      <fileset dir="${jboss.jbossws.lib}">
-        <include name="jbossws-client.jar"/>
-      </fileset>
-    </copy>
-
-    <!-- unjar the jbossws.sar -->
-    <mkdir dir="${install.all.deploy}/jbossws.sar"/>
-    <unjar dest="${install.all.deploy}/jbossws.sar" src="${jboss.jbossws.lib}/jbossws.sar"/>
-
-    <!-- install wstools shell scripts -->
-    <unjar dest="${install.bin}" src="${jboss.jbossws.lib}/jbossws-client.jar">
-      <patternset>
-        <include name="wstools.*"/>
-      </patternset>
-    </unjar>
-  </target>
-
-  <target name="_module-webservice-all" depends="_module-webservice-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}/output"/>
-
-    <!-- Copy the jboss-iiop.jar -->
-    <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-         <include name="jboss-iiop.jar"/>
-      </fileset>
-    </copy>
-
-    <!-- Copy the jboss-iiop-client.jar -->
-    <copy todir="${install.client}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-         <include name="jboss-iiop-client.jar"/>
-      </fileset>
-    </copy>
-
-    <!-- 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}/output"/>
-
-    <!-- Copy the generated libraries -->
-    <mkdir dir="${install.all.lib}"/>
-    <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-         <include name="jboss-jsr77.jar"/>
-         <include name="jboss-management.jar"/>
-      </fileset>
-    </copy>
-
-    <mkdir dir="${install.examples}/jmx"/>
-    <copy todir="${install.examples}/jmx" filtering="no">
-      <!-- Deployable archives -->
-      <fileset dir="${_module.output}/lib">
-         <include name="ejb-management.jar"/>
-      </fileset>
-    </copy>
-
-    <!-- Copy the generated client libraries -->
-    <mkdir dir="${install.client}"/>
-    <copy todir="${install.client}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-         <include name="jboss-jsr77-client.jar"/>
-      </fileset>
-    </copy>
-  </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>
-
-  <!-- =========== -->
-  <!-- Transaction -->
-  <!-- =========== -->
-
-  <target name="_module-transaction-most">
-    <property name="_module.name" value="transaction" override="true"/>
-    <property name="_module.output" override="true"
-	      value="${project.root}/${_module.name}/output"/>
-
-    <!-- Copy the generated libraries -->
-    <mkdir dir="${install.server}/all/lib"/>
-    <copy todir="${install.server}/all/lib" filtering="no">
-      <fileset dir="${_module.output}/lib">
-         <include name="jboss-transaction.jar"/>
-      </fileset>
-    </copy>
-
-    <!-- Copy the generated client libraries -->
-    <mkdir dir="${install.client}"/>
-    <copy todir="${install.client}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-         <include name="jboss-transaction-client.jar"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <target name="_module-transaction-all" depends="_module-transaction-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>
-
-  <!-- ======= -->
-  <!-- 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}/output"/>
-
-    <!-- Copy the generated scripts & runnable jars -->
-    <mkdir dir="${install.bin}"/>
-    <copy todir="${install.bin}" filtering="no">
-      <fileset dir="${_module.output}/bin">
-         <include name="**/*"/>
-      </fileset>
-      <fileset dir="${_module.output}/lib">
-         <include name="twiddle.jar"/>
-      </fileset>
-    </copy>
-    <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="**"/>
-      </fileset>
-    </copy>
-
-    <!-- Unpack the plugin manager SAR (embedded) and application WAR -->
-    <unjar src="${_module.output}/lib/console-mgr.sar"
-       dest="${install.all.deploy}/management/console-mgr.sar" />
-     <unjar src="${_module.output}/lib/web-console.war"
-        dest="${install.all.deploy}/management/console-mgr.sar/web-console.war" />
-
-    <!-- Copy the SNMP support JAR -->
-    <copy todir="${install.server}/all/lib" filtering="no">
-      <fileset dir="${_module.output}/lib">
-         <include name="snmp-support.jar"/>
-      </fileset>
-    </copy>
-
-  </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}/output"/>
-
-     <!-- Copy the generated libraries -->
-     <mkdir dir="${install.all.lib}"/>
-     <copy todir="${install.all.lib}" filtering="no">
-       <fileset dir="${_module.output}/lib">
-         <include name="jboss-jsr88.jar"/>
-       </fileset>
-     </copy>
-     <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 todir="${install.client}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-        <include name="jboss-deployment.jar"/>
-      </fileset>
-    </copy>
-
-  </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>
-
-
-  <!-- ============ -->
-  <!-- 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}/output"/>
-
-    <mkdir dir="${install.all.lib}"/>
-
-    <!-- The hibernate-int module output -->
-    <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${_module.output}/lib" includes="*.jar" />
-    </copy>
-
-    <!-- The hibernate jar -->
-    <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${hibernate.lib}" includes="*.jar" />
-    </copy>
-
-    <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${asm.asm.lib}" includes="*.jar" />
-    </copy>
-
-    <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${hibernate.entitymanager.lib}" includes="*.jar" />
-    </copy>
-
-    <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${hibernate.annotations.lib}" includes="*.jar" />
-    </copy>
-
-    <!-- ANTLR jar -->
-    <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${antlr.antlr.lib}" includes="*.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="commons-collections*"/>
-    </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>
-
-
-    <!-- ============ -->
-    <!--   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"/>
-
-    <mkdir dir="${install.server}/all/deploy/jboss-spring-jdk5.deployer"/>
-    <unjar src="${_module.output}/lib/jboss-spring-jdk5.deployer"
-           dest="${install.server}/all/deploy/jboss-spring-jdk5.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>
--->
-
-
-
   <target name="thirdparty">
-     <!-- Copy thirdparty libraries -->
-     <mkdir dir="${install.all.lib}"/>
-     <copy todir="${install.all.lib}" filtering="no">
-        <fileset dir="${jboss.cache.lib}">
-           <include name="jboss-cache.jar"/>
-        </fileset>
-     </copy>
   </target>
-
 </project>

Modified: branches/Branch_AOP_1_5/build/build-thirdparty.xml
===================================================================
--- branches/Branch_AOP_1_5/build/build-thirdparty.xml	2007-03-13 20:06:54 UTC (rev 61310)
+++ branches/Branch_AOP_1_5/build/build-thirdparty.xml	2007-03-13 20:14:52 UTC (rev 61311)
@@ -44,92 +44,23 @@
         are pushed to the http://repository.jboss.com site.
       -->
 
-      <componentref name="antlr" version="2.7.6rc1"/>
-      <componentref name="apache-avalon" version="4.1.5"/>
-      <componentref name="apache-avalon-logkit" version="1.2"/>
-      <componentref name="apache-bcel" version="5.1"/>
-      <componentref name="apache-beanutils" version="1.7.0"/>
-      <componentref name="apache-bsf" version="2.3.0"/>
-      <componentref name="apache-codec" version="1.2.0"/>
-      <componentref name="apache-collections" version="2.1"/>
-      <componentref name="apache-digester" version="1.6"/>
-      <componentref name="apache-discovery" version="0.2"/>
-      <componentref name="apache-fileupload" version="1.0"/>
       <componentref name="apache-httpclient" version="2.0.2"/>
       <componentref name="apache-jaxme" version="0.2-cvs"/>
-      <componentref name="apache-lang" version="2.0"/>
       <componentref name="apache-log4j" version="1.2.8"/>
       <componentref name="apache-logging" version="1.0.5.GA-jboss"/>
-      <componentref name="apache-logging-api" version="1.0.3"/>
-      <componentref name="apache-myfaces" version="1.1.1"/>
-      <componentref name="apache-oro" version="2.0.8"/>
-      <componentref name="apache-pool" version="1.0.1"/>
-      <componentref name="apache-scout" version="1.0.HEAD"/>
       <componentref name="apache-slide" version="2.0"/>
-      <componentref name="apache-struts" version="1.2.6"/>
-      <componentref name="apache-taglibs" version="1.1.2"/>
-      <componentref name="apache-tomcat" version="5.5.17"/>
-      <componentref name="apache-validator" version="1.1.3"/>
-      <componentref name="apache-velocity" version="1.4"/>
-      <componentref name="apache-vfs" version="1.0-dev"/>
       <componentref name="apache-xalan" version="j_2.7.0"/>
       <componentref name="apache-xerces" version="2.7.1"/>
-      <componentref name="apache-xmlsec" version="1.3.0"/>
-      <componentref name="asm" version="1.5.3"/>
-      <componentref name="beanshell" version="1.3.0"/>
-      <componentref name="cglib" version="2.1.1"/>
-      <componentref name="codehaus-stax" version="1.1.1"/>
       <componentref name="dom4j" version="1.5"/>
-      <componentref name="easymock" version="1.1"/>
-      <componentref name="ehcache" version="1.1"/>
-      <componentref name="gjt-jpl-util" version="1.0"/>
-      <componentref name="gnu-getopt" version="1.0.10"/>
-      <componentref name="hibernate" version="3.2.0.CR2"/>
-      <componentref name="hibernate-annotations" version="3.2.0.CR1"/>
-      <componentref name="hibernate-entitymanager" version="3.2.0.CR1"/>
-      <componentref name="hsqldb" version="1.8.0.2"/>
-      <componentref name="ibm-wsdl4j" version="1.5.2jboss"/>
-      <componentref name="jacorb" version="2.2.3"/>
       <componentref name="javassist" version="3.5.0.CR1"/>
-      <componentref name="jaxen" version="1.1beta4"/>
-      <componentref name="jboss/backport-concurrent" version="2.1.0.GA"/>
-      <componentref name="jboss/cache" version="1.3.0.SP1"/>
-      <componentref name="jboss/jbossretro" version="1.0.4.GA"/>
-      <componentref name="jboss/jbossws14" version="1.0.4.GA"/>
-      <componentref name="jboss/jbossws" version="1.0.4.GA"/>
-      <componentref name="jboss/microcontainer" version="snapshot"/>
-      <componentref name="jboss/remoting" version="1.4.3.GA"/>
-      <componentref name="jboss/serialization" version="1.0.0.GA"/>
       <componentref name="jboss/profiler/jvmti" version="1.0.0.CR4"/>
-      <componentref name="jbpm" version="3.0.2"/>
-      <componentref name="jbpm-bpel" version="1.0.0.alpha4"/>
-      <componentref name="jfreechart" version="0.9.20"/>
-      <componentref name="jgroups" version="2.3beta"/>
-      <componentref name="joesnmp" version="0.3.4"/>
-      <componentref name="juddi" version="0.8.0"/>
       <componentref name="junit" version="3.8.1"/>
-      <componentref name="junitejb" version="1.4"/>
-      <componentref name="objectweb-joramtests" version="1.1"/>
-      <componentref name="odmg" version="3.0"/>
-      <componentref name="opensaml" version="1.1b"/>
       <componentref name="oswego-concurrent" version="1.3.4"/>
       <componentref name="quartz" version="1.5.2"/>
       <componentref name="qdox" version="1.6.1"/>
-      <componentref name="retrotranslator" version="0.9.6jboss"/>
-      <componentref name="sleepycat" version="1.7.0"/>
-      <componentref name="spring" version="2.0m3"/>
-      <componentref name="struts-test-case" version="2.1.3"/>
-      <componentref name="sun-jaf" version="1.0.2"/>
-      <componentref name="sun-javacc" version="3.2"/>
-      <componentref name="sun-javamail" version="1.3.1"/>
-      <componentref name="sun-jaxp" version="1.2.3"/>
-      <componentref name="sun-jmf" version="2.1.1b"/>
-      <componentref name="sun-jmx" version="1.2.8"/>
-      <componentref name="sun-servlet" version="2.4"/>
       <componentref name="trove" version="1.0.2"/>
       <componentref name="wutka-dtdparser" version="1.2.1"/>
       <componentref name="xdoclet" version="1.2b3"/>
-      <componentref name="xmlunit-xmlunit" version="1.0"/>
 
 
    </build>

Modified: branches/Branch_AOP_1_5/build/build.xml
===================================================================
--- branches/Branch_AOP_1_5/build/build.xml	2007-03-13 20:06:54 UTC (rev 61310)
+++ branches/Branch_AOP_1_5/build/build.xml	2007-03-13 20:14:52 UTC (rev 61311)
@@ -94,37 +94,7 @@
 
       <!-- Modules -->
       <module name="aop"/>
-      <module name="aspects"/>
-      <module name="cluster"/>
       <module name="common"/>
-      <module name="connector"/>
-      <module name="console"/>
-      <module name="deployment"/>
-      <module name="ejb3"/>
-      <module name="ejb3x"/>
-      <module name="hibernate-int"/>
-      <module name="iiop"/>
-      <module name="j2ee"/>
-      <module name="j2se"/>
-      <module name="jms"/>
-      <module name="jmx"/>
-      <module name="management"/>
-      <module name="mbeans"/>
-      <module name="messaging"/>
-      <module name="naming"/>
-      <module name="jbossas/remoting"/>
-      <module name="jmx-remoting"/>
-      <module name="jbossas/jmx-remoting"/>
-      <module name="security"/>
-      <module name="server"/>
-      <module name="spring-int"/>
-      <module name="system"/>
-      <module name="testsuite"/>
-      <module name="varia"/>
-      <module name="webservice"/>
-      <module name="test"/>
-      <module name="tomcat"/>
-      <module name="transaction"/>
 
       <!-- Module groups -->
 
@@ -136,53 +106,21 @@
       </group>
 
       <group name="core">
-        <include modules="common, j2se, test, mbeans, jmx, system, naming, aop"/>
+        <include modules="common, aop"/>
       </group>
 
-      <group name="basic">
-        <include modules="j2ee,
-                          transaction,
-                          security,
-                          server,
-                          deployment" />
-
-      </group>
-
-      <group name="standard">
-        <include modules="jbossas/remoting,
-                          jmx-remoting,
-                          jbossas/jmx-remoting,
-                          messaging,
-                          connector,
-                          cluster,
-                          varia,
-                          iiop,
-                          management,
-                          aspects,
-                          tomcat,
-                          hibernate-int,
-                          jms,
-                          console,
-                          ${buildejb3}
-                          webservice
-                          "/>
-      </group>
-
-      <group name="optional">
-      </group>
-
       <!-- Module group sets -->
 
       <group name="default">
-        <include groups="core, basic, standard"/>
+        <include groups="core"/>
       </group>
 
       <group name="most">
-        <include groups="core, basic, standard"/>
+        <include groups="core"/>
       </group>
 
       <group name="all">
-        <include groups="core, basic, standard, optional"/>
+        <include groups="core"/>
       </group>
 
     </moduleconfig>
@@ -325,112 +263,11 @@
   <!-- Module Pass-through Hooks                                          -->
   <!-- ================================================================== -->
 
-  <!--
-     | These hooks are executed after the above pass-through targets have
-     | finished with a given module.
-   -->
-
-   <!-- ======== -->
-   <!-- Test     -->
-   <!-- ======== -->
-
-   <target name="_module-test-most">
-     <ant antfile="build-distr.xml" target="_module-test-most"/>
-   </target>
-
-   <target name="_module-test-all" depends="_module-test-most">
-     <ant antfile="build-distr.xml" target="_module-test-all"/>
-   </target>
-
-  <!-- ======== -->
-  <!-- Remoting -->
-  <!-- ======== -->
-
-  <target name="_module-jbossas/remoting-most">
-     <ant antfile="build-distr.xml" target="_module-jbossas/remoting-most"/>
-  </target>
-
-  <target name="_module-remoting-all" depends="_module-jbossas/remoting-most">
-     <ant antfile="build-distr.xml" target="_module-jbossas/remoting-all"/>
-  </target>
-
-  <!-- ============ -->
-  <!-- JMX Remoting -->
-  <!-- ============ -->
-
-   <target name="_module-jmx-remoting-most">
-     <ant antfile="build-distr.xml" target="_module-jmx-remoting-most"/>
-   </target>
-
-   <target name="_module-jmx-remoting-all" depends="_module-jmx-remoting-most">
-     <ant antfile="build-distr.xml" target="_module-jmx-remoting-all"/>
-   </target>
-
-   <target name="_module-jbossas/jmx-remoting-all" depends="_module-jbossas/jmx-remoting-most">
-     <ant antfile="build-distr.xml" target="_module-jbossas/jmx-remoting-all"/>
-   </target>
-
-   <target name="_module-jbossas/jmx-remoting-most">
-     <ant antfile="build-distr.xml" target="_module-jbossas/jmx-remoting-most"/>
-   </target>
-
-   <!-- ======== -->
-   <!-- EJB 3.0 -->
-   <!-- ======== -->
-
-   <target name="_module-ejb3-most">
-     <ant antfile="build-distr.xml" target="_module-ejb3-most"/>
-   </target>
-
-   <target name="_module-ejb3-all" depends="_module-ejb3-most">
-     <ant antfile="build-distr.xml" target="_module-ejb3-all"/>
-   </target>
-
-  <!-- ======== -->
-   <!-- EJB3X -->
-   <!-- ======== -->
-
-   <target name="_module-ejb3x-most">
-     <ant antfile="build-distr.xml" target="_module-ejb3x-most"/>
-   </target>
-
-   <!-- ======== -->
-   <!-- AOP          -->
-   <!-- ======== -->
-
    <target name="_module-aop-most">
       <ant antfile="build-distr.xml" target="_module-aop-most"/>
    </target>
 
 
-  <!-- ======== -->
-  <!-- ASPECTS -->
-  <!-- ======== -->
-
-  <target name="_module-aspects-most">
-     <ant antfile="build-distr.xml" target="_module-aspects-most"/>
-  </target>
-
-  <target name="_module-aspects-all" depends="_module-aspects-most">
-     <ant antfile="build-distr.xml" target="_module-aspects-all"/>
-  </target>
-
-  <!-- ==== -->
-  <!-- J2EE -->
-  <!-- ==== -->
-
-  <target name="_module-j2ee-most">
-     <ant antfile="build-distr.xml" target="_module-j2ee-most"/>
-  </target>
-
-  <target name="_module-j2ee-all" depends="_module-j2ee-most">
-     <ant antfile="build-distr.xml" target="_module-j2ee-all"/>
-  </target>
-
-  <!-- ====== -->
-  <!-- Common -->
-  <!-- ====== -->
-
   <target name="_module-common-most">
      <ant antfile="build-distr.xml" target="_module-common-most"/>
   </target>
@@ -439,268 +276,7 @@
      <ant antfile="build-distr.xml" target="_module-common-all"/>
   </target>
 
-  <!-- ====== -->
-  <!-- System -->
-  <!-- ====== -->
-
-  <target name="_module-system-most">
-     <ant antfile="build-distr.xml" target="_module-system-most"/>
-  </target>
-
-  <target name="_module-system-all" depends="_module-system-most">
-     <ant antfile="build-distr.xml" target="_module-system-all"/>
-  </target>
-
-  <!-- ====== -->
-  <!-- Naming -->
-  <!-- ====== -->
-
-  <target name="_module-naming-most">
-     <ant antfile="build-distr.xml" target="_module-naming-most"/>
-  </target>
-
-  <target name="_module-naming-all" depends="_module-naming-most">
-     <ant antfile="build-distr.xml" target="_module-naming-all"/>
-  </target>
-
-  <!-- ====== -->
-  <!-- Server -->
-  <!-- ====== -->
-
-  <target name="_module-server-most">
-     <ant antfile="build-distr.xml" target="_module-server-most"/>
-  </target>
-
-  <target name="_module-server-all" depends="_module-server-most">
-     <ant antfile="build-distr.xml" target="_module-server-all"/>
-  </target>
-
-  <!-- ========= -->
-  <!-- Connector -->
-  <!-- ========= -->
-
-  <target name="_module-connector-most">
-     <ant antfile="build-distr.xml" target="_module-connector-most"/>
-  </target>
-
-  <target name="_module-connector-all" depends="_module-connector-most">
-     <ant antfile="build-distr.xml" target="_module-connector-all"/>
-  </target>
-
-  <!-- ========= -->
-  <!-- Messaging -->
-  <!-- ========= -->
-
-  <target name="_module-messaging-most">
-     <ant antfile="build-distr.xml" target="_module-messaging-most"/>
-  </target>
-
-  <target name="_module-messaging-all" depends="_module-messaging-most">
-     <ant antfile="build-distr.xml" target="_module-messaging-all"/>
-  </target>
-
-   <!-- =========== -->
-   <!-- Messaging 5 -->
-   <!-- =========== -->
-
-   <target name="_module-jms-most">
-     <ant antfile="build-distr.xml" target="_module-jms-most"/>
-   </target>
-
-   <target name="_module-jms-all" depends="_module-jms-most">
-     <ant antfile="build-distr.xml" target="_module-jms-all"/>
-   </target>
-
-  <!-- ==== -->
-  <!-- J2SE -->
-  <!-- ==== -->
-
-  <target name="_module-j2se-most">
-     <ant antfile="build-distr.xml" target="_module-j2se-most"/>
-  </target>
-
-  <target name="_module-j2se-all" depends="_module-j2se-most">
-     <ant antfile="build-distr.xml" target="_module-j2se-all"/>
- </target>
-
-  <!-- ====== -->
-  <!-- MBeans -->
-  <!-- ====== -->
-
-  <target name="_module-mbeans-most">
-     <ant antfile="build-distr.xml" target="_module-mbeans-most"/>
-  </target>
-
-  <target name="_module-mbeans-all" depends="_module-mbeans-most">
-     <ant antfile="build-distr.xml" target="_module-mbeans-most"/>
- </target>
-
-  <!-- === -->
-  <!-- JMX -->
-  <!-- === -->
-
-  <target name="_module-jmx-most">
-     <ant antfile="build-distr.xml" target="_module-jmx-most"/>
-  </target>
-
-  <target name="_module-jmx-all" depends="_module-jmx-most">
-     <ant antfile="build-distr.xml" target="_module-jmx-all"/>
- </target>
-
-  <!-- ======== -->
-  <!-- Security -->
-  <!-- ======== -->
-
-  <target name="_module-security-most">
-     <ant antfile="build-distr.xml" target="_module-security-most"/>
-  </target>
-
-  <target name="_module-security-all" depends="_module-security-most">
-     <ant antfile="build-distr.xml" target="_module-security-all"/>
-  </target>
-
-  <!-- ======= -->
-  <!-- Cluster -->
-  <!-- ======= -->
-
-  <target name="_module-cluster-most">
-     <ant antfile="build-distr.xml" target="_module-cluster-most"/>
-  </target>
-
-  <target name="_module-cluster-all" depends="_module-cluster-most">
-     <ant antfile="build-distr.xml" target="_module-cluster-all"/>
-  </target>
-
-  <!-- ===== -->
-  <!-- Varia -->
-  <!-- ===== -->
-
-  <target name="_module-varia-most">
-     <ant antfile="build-distr.xml" target="_module-varia-most"/>
-  </target>
-
-  <target name="_module-varia-all" depends="_module-varia-most">
-     <ant antfile="build-distr.xml" target="_module-varia-all"/>
-  </target>
-
-  <!-- ===== -->
-  <!-- Tomcat5.5.x -->
-  <!-- ===== -->
-
-  <target name="_module-tomcat-most">
-     <ant antfile="build-distr.xml" target="_module-tomcat-most"/>
-  </target>
-
-  <target name="_module-tomcat-all" depends="_module-tomcat-most">
-     <ant antfile="build-distr.xml" target="_module-tomcat-all"/>
-  </target>
-
-  <!-- ========== -->
-  <!-- Webservice -->
-  <!-- ========== -->
-
-  <target name="_module-webservice-most">
-     <ant antfile="build-distr.xml" target="_module-webservice-most"/>
-  </target>
-
-  <target name="_module-webservice-all" depends="_module-webservice-most">
-     <ant antfile="build-distr.xml" target="_module-webservice-all"/>
-  </target>
-
-  <!-- ==== -->
-  <!-- IIOP -->
-  <!-- ==== -->
-
-  <target name="_module-iiop-most">
-     <ant antfile="build-distr.xml" target="_module-iiop-most"/>
-  </target>
-
-  <target name="_module-iiop-all" depends="_module-iiop-most">
-     <ant antfile="build-distr.xml" target="_module-iiop-all"/>
-  </target>
-
-  <!-- ========== -->
-  <!-- Management -->
-  <!-- ========== -->
-
-  <target name="_module-management-most">
-     <ant antfile="build-distr.xml" target="_module-management-most"/>
-  </target>
-
-  <target name="_module-management-all" depends="_module-management-most">
-     <ant antfile="build-distr.xml" target="_module-management-all"/>
-  </target>
-
-  <!-- =========== -->
-  <!-- Transaction -->
-  <!-- =========== -->
-
-  <target name="_module-transaction-most">
-     <ant antfile="build-distr.xml" target="_module-transaction-most"/>
-  </target>
-
-  <target name="_module-transaction-all" depends="_module-transaction-most">
-     <ant antfile="build-distr.xml" target="_module-transaction-all"/>
-  </target>
-
-  <!-- ======= -->
-  <!-- Console -->
-  <!-- ======= -->
-
-  <target name="_module-console-most">
-     <ant antfile="build-distr.xml" target="_module-console-most"/>
-  </target>
-
-  <target name="_module-console-all" depends="_module-console-most">
-     <ant antfile="build-distr.xml" target="_module-console-all"/>
-  </target>
-
-
-
-
-
-  <!-- ========== -->
-  <!-- Deployment -->
-  <!-- ========== -->
-
-  <target name="_module-deployment-most">
-     <ant antfile="build-distr.xml" target="_module-deployment-most"/>
-  </target>
-
-  <target name="_module-deployment-all" depends="_module-deployment-most">
-     <ant antfile="build-distr.xml" target="_module-deployment-all"/>
-  </target>
-
-
-  <!-- ============ -->
-  <!-- Hibernate    -->
-  <!-- ============ -->
-
-  <target name="_module-hibernate-int-most">
-     <ant antfile="build-distr.xml" target="_module-hibernate-int-most"/>
-  </target>
-
-  <target name="_module-hibernate-int-all" depends="_module-hibernate-int-most">
-     <ant antfile="build-distr.xml" target="_module-hibernate-int-all"/>
-  </target>
-
-
-    <!-- ============ -->
-    <!--   Spring     -->
-    <!-- ============ -->
-
-<!--
-  <target name="_module-spring-int-most">
-         <ant antfile="build-distr.xml" target="_module-spring-int-most"/>
-  </target>
-
-  <target name="_module-spring-int-all" depends="_module-spring-int-most">
-     <ant antfile="build-distr.xml" target="_module-spring-int-all"/>
-  </target>
--->
-
   <target name="thirdparty">
-     <ant antfile="build-distr.xml" target="thirdparty"/>
   </target>
 
 
@@ -742,158 +318,18 @@
   -->
   <target name="partition-build" depends="init">
 
-    <!-- Copy server/all to server/default and then remove the services and
-    jars outside of the scope of the default config -->
-    <copy todir="${install.default}">
-      <fileset dir="${install.all}">
-        <exclude name="data/**"/>
-        <exclude name="log/**"/>
-        <exclude name="tmp/**"/>
-        <exclude name="work/**"/>
-        <exclude name="deploy-hasingleton/**"/>
-        <exclude name="conf/jacorb.properties"/>
-        <exclude name="lib/avalon-framework.jar"/>
-        <exclude name="lib/jgroups.jar"/>
-        <exclude name="lib/jacorb.jar"/>
-        <exclude name="lib/jboss-iiop.jar"/>
-        <exclude name="lib/jboss-cache.jar"/>
-        <exclude name="lib/jbossha.jar"/>
-        <exclude name="lib/jbossmqha.jar"/>
-        <exclude name="lib/wsdl4j.jar"/>
-        <exclude name="deploy/cluster-service.xml"/>
-        <exclude name="deploy/hajndi-service.xml"/>
-        <exclude name="deploy/deploy-hasingleton-service.xml"/>
-        <exclude name="deploy/iiop-service.xml"/>
-        <exclude name="deploy/jbossweb-ejb.jar"/>
-        <exclude name="deploy/jms/hajndi-jms-ds.xml"/>
-        <exclude name="deploy/deploy.last/**"/>
-        <exclude name="deploy/httpha-invoker.sar/**"/>
-        <exclude name="deploy/snmp-adaptor.sar/**"/>
-        <exclude name="deploy/ejb3*service.xml"/>
-        <exclude name="farm/**"/>
-        <exclude name="deploy/juddi-service.sar/**"/>
-        <exclude name="deploy/tc5-cluster.sar/**"/>
-      </fileset>
-    </copy>
-    <copy todir="${install.default.conf}"
-          file="${project.root}/server/output/etc/conf/default/jndi.properties" overwrite="true"/>
-    <copy tofile="${install.default.deploy}/jbossweb-tomcat55.sar/META-INF/jboss-service.xml"
-          file="${project.root}/tomcat/src/resources/jboss-service.xml" overwrite="true"/>
-    <copy todir="${install.default.deploy}">
-      <fileset dir="${install.all.deploy.hasingleton}">
-        <include name="jms/**"/>
-        <!-- Trim the default config jms layer to only the JVM/UIL2 invoker -->
-        <exclude name="jms/jbossmq-hail.sar/**"/>
-      </fileset>
-    </copy>
-    <copy todir="${install.default.deploy}/jms">
-      <fileset dir="${install.examples.jca}">
-         <include name="jms-ds.xml"/>
-      </fileset>
-    </copy>
-    <unjar src="${project.root}/varia/output/lib/http-invoker.sar"
-      dest="${install.default}/deploy/http-invoker.sar"/>
 
-    <!-- Build server/minimal manually -->
-    <mkdir dir="${install.minimal.deploy}"/>
-    <copy todir="${install.minimal.conf}">
-      <fileset dir="${install.default.conf}">
-        <include name="jndi.properties" />
-        <include name="log4j.xml" />
-      </fileset>
-    </copy>
-    <copy file="${install.default.conf}/jboss-minimal.xml"
-          tofile="${install.minimal.conf}/jboss-service.xml"/>
-    <copy todir="${install.minimal.lib}">
-      <fileset dir="${install.default.lib}">
-        <include name="jboss-management.jar" />
-        <include name="jnpserver.jar" />
-        <include name="log4j.jar" />
-      </fileset>
-    </copy>
-    <copy todir="${install.minimal.lib}"
-      file="${project.root}/server/output/lib/jboss-minimal.jar" />
-
-    <call target="jboss-all-client"/>
-
   </target>
 
   <target name="bypass-jboss-all-client" depends="init">
 
-   <uptodate property="bypass-jboss-all-client.on" targetfile="${install.client}/jbossall-client.jar">
-      <srcfiles dir="${install.client}">
-        <include name="*-client.jar"/>
-        <include name="asm.jar"/>
-        <include name="cglib-2.1.1.jar"/>
-        <include name="commons-logging.jar"/>
-        <include name="commons-httpclient.jar"/>
-        <include name="concurrent.jar"/>
-        <include name="ejb3-persistence.jar"/>
-        <include name="hibernate-annotations.jar"/>
-        <include name="jboss-annotations-ejb3.jar"/>
-        <include name="jboss-deployment.jar"/>
-        <include name="jboss-ejb3x.jar"/>
-        <include name="jboss-j2ee.jar"/>
-        <include name="jboss-j2se.jar"/>
-        <include name="jboss-jaxrpc.jar"/>
-        <include name="jboss-remoting.jar"/>
-        <include name="jboss-saaj.jar"/>
-        <include name="jboss-serialization.jar"/>
-        <include name="jboss-xml-binding.jar"/>
-        <include name="jbossmqha.jar"/>
-        <include name="jmx-connector-client-factory.jar"/>
-        <include name="namespace.jar"/>
-        <include name="wsdl4j.jar"/>
-        <include name="xmlsec.jar"/>
-        <!-- client excludes -->
-        <exclude name="jbossws14-client.jar"/>
-        <exclude name="jbossws-client.jar"/>
-      </srcfiles>
-   </uptodate>
-
   </target>
 
   <target name="jboss-all-client"
           depends="bypass-jboss-all-client"
           unless="bypass-jboss-all-client.on">
 
-    <!--Create a jbossall-client.jar containing everything a client app needs-->
-    <mkdir dir="build"/>
-    <delete file="${install.client}/jbossall-client.jar"/>
-    <unjar dest="build">
-      <fileset dir="${install.client}">
-        <include name="*-client.jar"/>
-        <include name="asm.jar"/>
-        <include name="cglib-2.1.1.jar"/>
-        <include name="commons-logging.jar"/>
-        <include name="commons-httpclient.jar"/>
-        <include name="concurrent.jar"/>
-        <include name="ejb3-persistence.jar"/>
-        <include name="hibernate-annotations.jar"/>
-        <include name="jboss-annotations-ejb3.jar"/>
-        <include name="jboss-deployment.jar"/>
-        <include name="jboss-ejb3x.jar"/>
-        <include name="jboss-j2ee.jar"/>
-        <include name="jboss-j2se.jar"/>
-        <include name="jboss-jaxrpc.jar"/>
-        <include name="jboss-remoting.jar"/>
-        <include name="jboss-saaj.jar"/>
-        <include name="jboss-serialization.jar"/>
-        <include name="jboss-xml-binding.jar"/>
-        <include name="jbossmqha.jar"/>
-        <include name="jmx-connector-client-factory.jar"/>
-        <include name="namespace.jar"/>
-        <include name="wsdl4j.jar"/>
-        <include name="xmlsec.jar"/>
-        <!-- client excludes -->
-        <exclude name="jbossws14-client.jar"/>
-        <exclude name="jbossws-client.jar"/>
-      </fileset>
-    </unjar>
-    <jar destfile="${install.client}/jbossall-client.jar" basedir="build" />
 
-    <delete dir="build" />
-
   </target>
 
   <!-- ================================================================== -->

Modified: branches/Branch_AOP_1_5/tools/etc/buildmagic/buildmagic.ent
===================================================================
--- branches/Branch_AOP_1_5/tools/etc/buildmagic/buildmagic.ent	2007-03-13 20:06:54 UTC (rev 61310)
+++ branches/Branch_AOP_1_5/tools/etc/buildmagic/buildmagic.ent	2007-03-13 20:14:52 UTC (rev 61311)
@@ -72,15 +72,6 @@
   <taskdef name="property" classname="org.jboss.tools.buildmagic.task.Property"
     classpathref="buildmagic.task.classpath"/>
 
-  <path id="retrotranslator.task.classpath">
-    <fileset dir="${project.thirdparty}/retrotranslator/lib">
-      <include name="*.jar"/>
-    </fileset>
-  </path>
-  <taskdef name="retrotranslator"
-    classname="net.sf.retrotranslator.transformer.RetrotranslatorTask"
-     classpathref="retrotranslator.task.classpath"/>
-
   <!-- Include user and project property overrides. -->
   <property file="${project.build}/local.properties"/>
   <property file="${user.home}/.buildmagic.properties"/>

Modified: branches/Branch_AOP_1_5/tools/etc/buildmagic/modules.ent
===================================================================
--- branches/Branch_AOP_1_5/tools/etc/buildmagic/modules.ent	2007-03-13 20:06:54 UTC (rev 61310)
+++ branches/Branch_AOP_1_5/tools/etc/buildmagic/modules.ent	2007-03-13 20:14:52 UTC (rev 61311)
@@ -16,23 +16,7 @@
   <pathelement path="${jboss.aspects.lib}/jboss-aspect-library.jar"/>
 </path>
 
-<!-- tomcat -->
-<property name="jboss.tomcat.root" value="${project.root}/tomcat/output"/>
-  <property name="jboss.tomcat.lib" value="${jboss.tomcat.root}/lib"/>
-<path id="jboss.tomcat.classpath">
-  <pathelement path="${jboss.tomcat.lib}/tc5-cluster.aop"/>
-  <pathelement path="${jboss.tomcat.root}/resource"/>
-</path>
 
-<!-- Cluster -->
-<property name="jboss.cluster.root" value="${project.root}/cluster/output"/>
-<property name="jboss.cluster.lib" value="${jboss.cluster.root}/lib"/>
-<path id="jboss.cluster.classpath">
-  <pathelement path="${jboss.cluster.lib}/jbossha.jar"/>
-  <pathelement path="${jboss.cluster.lib}/jbossha-httpsession.sar"/>
-  <pathelement path="${jboss.cluster.lib}/jbossha-singleton.jar"/>
-</path>
-
 <!-- Common -->
 <property name="jboss.common.root" value="${project.root}/common/output"/>
 <property name="jboss.common.lib" value="${jboss.common.root}/lib"/>
@@ -42,29 +26,8 @@
   <pathelement path="${jboss.common.lib}/namespace.jar"/>
 </path>
 
-<!-- Compatibility -->
-<property name="jboss.compatibility.root" value="${project.root}/compatibility/output"/>
-<property name="jboss.compatibility.lib" value="${jboss.compatibility.root}/lib"/>
-<path id="jboss.compatibility.classpath">
-</path>
-
-<!-- Iiop -->
-<property name="jboss.iiop.root" value="${project.root}/iiop/output"/>
-<property name="jboss.iiop.lib" value="${jboss.iiop.root}/lib"/>
-<path id="jboss.iiop.classpath">
-  <pathelement path="${jboss.iiop.lib}/jboss-iiop.jar"/>
-</path>
-
-<!-- J2EE -->
-<property name="jboss.j2ee.root" value="${project.root}/j2ee/output"/>
-<property name="jboss.j2ee.lib" value="${jboss.j2ee.root}/lib"/>
-<path id="jboss.j2ee.classpath">
-  <pathelement path="${jboss.j2ee.lib}/jboss-j2ee.jar"/>
-  <pathelement path="${jboss.j2ee.lib}/jboss-jaxrpc.jar"/>
-  <pathelement path="${jboss.j2ee.lib}/jboss-saaj.jar"/>
-</path>
-
 <!-- J2SE -->
+<!--
 <property name="jboss.j2se.root" value="${project.root}/j2se/output"/>
 <property name="jboss.j2se.lib" value="${jboss.j2se.root}/lib"/>
 <path id="jboss.j2se.classpath">
@@ -73,228 +36,7 @@
 <path id="jboss.jmxcompliance.classpath">
   <pathelement path="${jboss.j2se.lib}/jboss-jmx-compliance.jar"/>
 </path>
+-->
 
-<!-- Deployment -->
-<property name="jboss.deployment.root" value="${project.root}/deployment/output"/>
-<property name="jboss.deployment.lib" value="${jboss.deployment.root}/lib"/>
-<path id="jboss.deployment.classpath">
-  <pathelement path="${jboss.deployment.lib}/jboss-deployment.jar"/>
-</path>
 
-<!-- EJB3 -->
-<property name="jboss.ejb3.root" value="${project.root}/ejb3/output"/>
-<property name="jboss.ejb3.lib" value="${jboss.ejb3.root}/lib"/>
-<path id="jboss.ejb3.classpath">
-  <pathelement path="${jboss.ejb3.lib}/jboss-ejb3.jar"/>
-  <pathelement path="${jboss.ejb3.lib}/jboss-annotations-ejb3.jar"/>
-</path>
 
-<!-- EJB3X -->
-<property name="jboss.ejb3x.root" value="${project.root}/ejb3x/output"/>
-<property name="jboss.ejb3x.lib" value="${jboss.ejb3x.root}/lib"/>
-<path id="jboss.ejb3x.classpath">
-  <pathelement path="${jboss.ejb3x.lib}/jboss-ejb3x.jar"/>
-</path>
-<path id="jboss.ejb3x.jdk14.classpath">
-  <pathelement path="${jboss.ejb3x.lib}/jboss-ejb3x-jdk14.jar"/>
-</path>
-
-<!-- JCA -->
-<property name="jboss.jca.root" value="${project.root}/connector/output"/>
-<property name="jboss.jca.lib" value="${jboss.jca.root}/lib"/>
-<path id="jboss.jca.classpath">
-  <pathelement path="${jboss.jca.lib}/jboss-jca.jar"/>
-  <pathelement path="${jboss.jca.lib}/jboss-local-jdbc.jar"/>
-    <pathelement path="${jboss.jca.lib}/jboss-ha-local-jdbc.jar"/>
-  <pathelement path="${jboss.jca.lib}/jboss-common-jdbc-wrapper.jar"/>
-</path>
-
-<!-- JMX -->
-<property name="jboss.jmx.root" value="${project.root}/jmx/output"/>
-<property name="jboss.jmx.lib" value="${jboss.jmx.root}/lib"/>
-<path id="jboss.jmx.classpath">
-  <pathelement path="${jboss.jmx.lib}/jboss-jmx.jar"/>
-</path>
-
-<!-- JMX Remoting -->
-<property name="jboss.jmx-remoting.root" value="${project.root}/jmx-remoting/output"/>
-<property name="jboss.jmx-remoting.lib" value="${jboss.jmx-remoting.root}/lib"/>
-<path id="jboss.jmx-remoting.classpath">
-  <pathelement path="${jboss.jmx-remoting.lib}/jboss-jmx-remoting.jar"/>
-</path>
-
-<!-- Management -->
-<property name="jboss.management.root" value="${project.root}/management/output"/>
-<property name="jboss.management.lib" value="${jboss.management.root}/lib"/>
-<path id="jboss.management.classpath">
-  <pathelement path="${jboss.management.lib}/jboss-jsr77-client.jar"/>
-  <pathelement path="${jboss.management.lib}/jboss-jsr77.jar"/>
-  <pathelement path="${jboss.management.lib}/jboss-management.jar"/>
-</path>
-
-<!-- MBeans -->
-<property name="jboss.mbeans.root" value="${project.root}/mbeans/output"/>
-<property name="jboss.mbeans.lib" value="${jboss.mbeans.root}/lib"/>
-<path id="jboss.mbeans.classpath">
-  <pathelement path="${jboss.mbeans.lib}/jboss-mbeans.jar"/>
-</path>
-
-<!-- Messaging -->
-<property name="jboss.messaging.root" value="${project.root}/messaging/output"/>
-<property name="jboss.messaging.lib" value="${jboss.messaging.root}/lib"/>
-<path id="jboss.messaging.classpath">
-  <pathelement path="${jboss.messaging.lib}/jbossmq.jar"/>
-</path>
-
-<!-- Messaging 5 -->
-<property name="jboss.jms.root" value="${project.root}/jms/output"/>
-<property name="jboss.jms.lib" value="${jboss.jms.root}/lib"/>
-<path id="jboss.jms.classpath">
-  <pathelement path="${jboss.jms.lib}/jboss-messaging.jar"/>
-</path>
-
-<!-- Naming -->
-<property name="jboss.naming.root" value="${project.root}/naming/output"/>
-<property name="jboss.naming.lib" value="${jboss.naming.root}/lib"/>
-<path id="jboss.naming.classpath">
-  <pathelement path="${jboss.naming.lib}/jnpserver.jar"/>
-</path>
-
-<!-- Security -->
-<property name="jboss.security.root" value="${project.root}/security/output"/>
-<property name="jboss.security.lib" value="${jboss.security.root}/lib"/>
-<path id="jboss.security.classpath">
-  <pathelement path="${jboss.security.lib}/jbosssx.jar"/>
-</path>
-
-<!-- Server -->
-<property name="jboss.server.root" value="${project.root}/server/output"/>
-<property name="jboss.server.lib" value="${jboss.server.root}/lib"/>
-<path id="jboss.server.classpath">
-  <pathelement path="${jboss.server.lib}/jboss.jar"/>
-  <pathelement path="${jboss.server.lib}/jmx-adaptor-plugin.jar"/>
-</path>
-
-<!-- Spring -->
-<property name="jboss.spring.root" value="${project.root}/spring-int/output"/>
-<property name="jboss.spring.lib" value="${jboss.spring.root}/lib"/>
-
-<!-- System -->
-<property name="jboss.system.root" value="${project.root}/system/output"/>
-<property name="jboss.system.lib" value="${jboss.system.root}/lib"/>
-<path id="jboss.system.classpath">
-  <pathelement path="${jboss.system.lib}/jboss-system.jar"/>
-</path>
-<property name="jboss.system.xdocletpath"
-  value="${project.root}/system/src/main"/>
-
-<!-- Test -->
-<property name="jboss.test.root" value="${project.root}/test/output"/>
-<property name="jboss.test.lib" value="${jboss.test.root}/lib"/>
-<path id="jboss.test.classpath">
-  <pathelement path="${jboss.test.lib}/jboss-test.jar"/>
-</path>
-
-<!-- Transaction -->
-<property name="jboss.transaction.root" value="${project.root}/transaction/output"/>
-<property name="jboss.transaction.lib" value="${jboss.transaction.root}/lib"/>
-<path id="jboss.transaction.classpath">
-  <pathelement path="${jboss.transaction.lib}/jboss-transaction.jar"/>
-</path>
-
-<!-- Varia -->
-<property name="jboss.varia.root" value="${project.root}/varia/output"/>
-<property name="jboss.varia.lib" value="${jboss.varia.root}/lib"/>
-<path id="jboss.varia.classpath">
-  <pathelement path="${jboss.varia.root}/classes"/>
-</path>
-
-<!-- Hibernate2 integration module -->
-<property name="jboss.hibernate.root" value="${project.root}/hibernate-int/output"/>
-<property name="jboss.hibernate.lib" value="${jboss.hibernate.root}/lib"/>
-<path id="jboss.hibernate.classpath">
-  <pathelement path="${jboss.hibernate.lib}/jboss-hibernate.jar"/>
-</path>
-
-
-<!-- below this line starts the kingdom of nukes ***************************************************************** -->
-
-<!-- Nukes on JBoss -->
-<property name="jboss.nukes.root" value="${project.root}/nukes/output"/>
-<property name="jboss.nukes.lib" value="${jboss.nukes.root}/lib"/>
-<path id="jboss.nukes.classpath">
-  <pathelement path="${jboss.nukes.lib}/nukes-lib.jar"/>
-</path>
-
-<!-- Nukes on JBoss adminmessages -->
-<property name="jboss.nukes-adminmessages.root" value="${project.root}/adminmessages/output"/>
-<property name="jboss.nukes-adminmessages.lib" value="${jboss.nukes-adminmessages.root}/lib"/>
-<path id="jboss.nukes-adminmessages.classpath">
-  <pathelement path="${jboss.nukes-adminmessages.lib}/nukes-adminmessages-lib.jar"/>
-</path>
-
-<!-- Nukes on JBoss faq -->
-<property name="jboss.nukes-faq.root" value="${project.root}/faq/output"/>
-<property name="jboss.nukes-faq.lib" value="${jboss.nukes-faq.root}/lib"/>
-<path id="jboss.nukes-faq.classpath">
-  <pathelement path="${jboss.nukes-faq.lib}/nukes-faq-lib.jar"/>
-</path>
-
-<!-- Nukes on JBoss jmx -->
-<property name="jboss.nukes-jmx.root" value="${project.root}/jmx/output"/>
-<property name="jboss.nukes-jmx.lib" value="${jboss.nukes-jmx.root}/lib"/>
-<path id="jboss.nukes-jmx.classpath">
-  <pathelement path="${jboss.nukes-jmx.lib}/nukes-jmx-lib.jar"/>
-</path>
-
-<!-- Nukes on JBoss journal -->
-<property name="jboss.nukes-journal.root" value="${project.root}/journal/output"/>
-<property name="jboss.nukes-journal.lib" value="${jboss.nukes-journal.root}/lib"/>
-<path id="jboss.nukes-journal.classpath">
-  <pathelement path="${jboss.nukes-journal.lib}/nukes-journal-lib.jar"/>
-</path>
-
-<!-- Nukes on JBoss mp3player -->
-<property name="jboss.nukes-mp3player.root" value="${project.root}/mp3player/output"/>
-<property name="jboss.nukes-mp3player.lib" value="${jboss.nukes-mp3player.root}/lib"/>
-<path id="jboss.nukes-mp3player.classpath">
-  <pathelement path="${jboss.nukes-mp3player.lib}/nukes-mp3player-lib.jar"/>
-</path>
-
-<!-- Nukes on JBoss news -->
-<property name="jboss.nukes-news.root" value="${project.root}/news/output"/>
-<property name="jboss.nukes-news.lib" value="${jboss.nukes-news.root}/lib"/>
-<path id="jboss.nukes-news.classpath">
-  <pathelement path="${jboss.nukes-news.lib}/nukes-news-lib.jar"/>
-</path>
-
-<!-- Nukes on JBoss quotes -->
-<property name="jboss.nukes-quotes.root" value="${project.root}/quotes/output"/>
-<property name="jboss.nukes-quotes.lib" value="${jboss.nukes-quotes.root}/lib"/>
-<path id="jboss.nukes-quotes.classpath">
-  <pathelement path="${jboss.nukes-quotes.lib}/nukes-quotes-lib.jar"/>
-</path>
-
-<!-- Nukes on JBoss list -->
-<property name="jboss.nukes-list.root" value="${project.root}/list/output"/>
-<property name="jboss.nukes-list.lib" value="${jboss.nukes-list.root}/lib"/>
-<path id="jboss.nukes-list.classpath">
-  <pathelement path="${jboss.nukes-list.lib}/nukes-list-lib.jar"/>
-</path>
-
-<!-- Nukes on JBoss script -->
-<property name="jboss.nukes-script.root" value="${project.root}/script/output"/>
-<property name="jboss.nukes-script.lib" value="${jboss.nukes-script.root}/lib"/>
-<path id="jboss.nukes-script.classpath">
-  <pathelement path="${jboss.nukes-script.lib}/nukes-script-lib.jar"/>
-</path>
-
-<!-- Nukes on JBoss sections -->
-<property name="jboss.nukes-sections.root" value="${project.root}/sections/output"/>
-<property name="jboss.nukes-sections.lib" value="${jboss.nukes-sections.root}/lib"/>
-<path id="jboss.nukes-sections.classpath">
-  <pathelement path="${jboss.nukes-sections.lib}/nukes-sections-lib.jar"/>
-</path>
-
-
-




More information about the jboss-cvs-commits mailing list