[jboss-cvs] JBossAS SVN: r58994 - trunk/build

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Dec 12 07:54:20 EST 2006


Author: thomas.diesler at jboss.com
Date: 2006-12-12 07:54:18 -0500 (Tue, 12 Dec 2006)
New Revision: 58994

Modified:
   trunk/build/build-distr.xml
Log:
Install jbossws.deployer

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2006-12-12 12:02:20 UTC (rev 58993)
+++ trunk/build/build-distr.xml	2006-12-12 12:54:18 UTC (rev 58994)
@@ -4,196 +4,187 @@
 ]>
 
 <project name="JBoss/Build">
-
+  
   &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>
-
+  | 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"/>
-
+    <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"/>
+        <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>
+    
+    <!-- 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="**/*"/>
+        <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"/>
-      <unjar src="${project.root}/${_module.name}/output/lib/jmx-remoting.sar"
-         dest="${install.all}/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 -->
+  
+  <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"/>
+    <unjar src="${project.root}/${_module.name}/output/lib/jmx-remoting.sar" dest="${install.all}/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>
-
+    
     <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${hibernate.entitymanager.lib}" includes="*.jar" />
-      <fileset dir="${hibernate.annotations.lib}" includes="*.jar" />
+      <fileset dir="${hibernate.entitymanager.lib}" includes="*.jar"/>
+      <fileset dir="${hibernate.annotations.lib}" includes="*.jar"/>
     </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-interceptors-aop.xml"/>
-           <include name="ejb3-entity-cache-beans.xml"/>
-           <include name="ejb3-clustered-sfsbcache-beans.xml"/>
-           <include name="ejb3-timer-service.xml"/>
-           <include name="ejb3-connectors-service.xml"/>
-        </fileset>
-      </copy>
-
-      <copy todir="${install.server}/all/deployers" filtering="no">
-        <fileset dir="${_module.output}/lib">
-           <include name="ejb3.deployer/**"/>
-        </fileset>
-      </copy>
-   <!-- Copy the third party libraries -->
-   <copy todir="${install.all.lib}" filtering="no">
-     <fileset dir="${hibernate.entitymanager.lib}">
-       <include name="ejb3-persistence.jar"/>
-     </fileset>
-   </copy>
-
-   <!-- Copy across client jars -->
+    
+  </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-interceptors-aop.xml"/>
+        <include name="ejb3-entity-cache-beans.xml"/>
+        <include name="ejb3-clustered-sfsbcache-beans.xml"/>
+        <include name="ejb3-timer-service.xml"/>
+        <include name="ejb3-connectors-service.xml"/>
+      </fileset>
+    </copy>
+    
+    <copy todir="${install.server}/all/deployers" filtering="no">
+      <fileset dir="${_module.output}/lib">
+        <include name="ejb3.deployer/**"/>
+      </fileset>
+    </copy>
+    
+    <!-- Copy the third party libraries -->
+    <copy todir="${install.all.lib}" filtering="no">
+      <fileset dir="${hibernate.entitymanager.lib}">
+        <include name="ejb3-persistence.jar"/>
+      </fileset>
+    </copy>
+    
+    <!-- Copy across client jars -->
     <mkdir dir="${install.client}"/>
     <copy todir="${install.client}" filtering="no">
       <fileset dir="${_module.output}/lib">
@@ -212,57 +203,55 @@
         <include name="jboss-aop-jdk50-client.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>
-
+  </target>
+  
+  <target name="_module-ejb3-all" depends="_module-ejb3-most">
+    <!-- Copy the generated javadocs -->
+    <mkdir dir="${install.api}/${_module.name}"/>
+    <copy todir="${install.api}/${_module.name}" filtering="no">
+      <fileset dir="${_module.output}/api">
+        <include name="**/*"/>
+      </fileset>
+    </copy>
+    
+  </target>
+  
   <!-- ======== -->
   <!-- ASPECTS -->
   <!-- ======== -->
-
+  
   <target name="_module-aspects-most">
     <property name="_module.name" value="aspects" override="true"/>
-    <property name="_module.output" override="true"
-          value="${project.root}/${_module.name}/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>
+    <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>
     -->
-	<property name="aop.deployer" value="jboss-aop-jboss5.deployer"/>    
+    <property name="aop.deployer" value="jboss-aop-jboss5.deployer"/>
     <!-- Copy the generated libraries -->
-    <unjar src="${_module.output}/lib/${aop.deployer}"
-       dest="${install.server}/all/deployers/${aop.deployer}" />
-
+    <unjar src="${_module.output}/lib/${aop.deployer}" dest="${install.server}/all/deployers/${aop.deployer}"/>
+    
     <copy todir="${install.server}/all/deployers" filtering="no">
       <fileset dir="${project.root}/${_module.name}/src/resources/META-INF">
         <include name="aop-mc-int-aspect-beans.xml"/>
       </fileset>
     </copy>
-
+    
     <copy todir="${install.server}/all/deployers/${aop.deployer}" filtering="no">
       <fileset dir="${jboss.microcontainer.lib}">
         <include name="jboss-aop-mc-int-deployer.jar"/>
       </fileset>
-   </copy>
-   
-   <!-- Copy across client jars -->
+    </copy>
+    
+    <!-- Copy across client jars -->
     <mkdir dir="${install.client}"/>
     <copy todir="${install.client}" filtering="no">
       <fileset dir="${_module.output}/lib">
@@ -270,27 +259,26 @@
       </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="**/*"/>
+        <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"/>
-
+    <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">
@@ -298,7 +286,7 @@
         <include name="jboss-j2ee.jar"/>
       </fileset>
     </copy>
-
+    
     <!-- Copy the generated client libraries -->
     <mkdir dir="${install.client}"/>
     <copy todir="${install.client}" filtering="no">
@@ -313,26 +301,25 @@
       </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="**/*"/>
+        <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"/>
-
+    <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">
@@ -341,7 +328,7 @@
         <include name="jboss-system.jar"/>
       </fileset>
     </copy>
-
+    
     <!-- Copy the generated client -->
     <mkdir dir="${install.client}"/>
     <copy todir="${install.client}" filtering="no">
@@ -349,23 +336,23 @@
         <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="**/*"/>
+        <include name="**/*"/>
       </fileset>
       <fileset dir="${_module.output}/lib">
-         <include name="run.jar"/>
+        <include name="run.jar"/>
       </fileset>
     </copy>
     <chmod perm="+x">
       <fileset dir="${install.bin}">
-         <include name="**/*.sh"/>
+        <include name="**/*.sh"/>
       </fileset>
     </chmod>
-
+    
     <!-- Copy thirdparty code -->
     <copy todir="${install.lib}" filtering="no">
       <fileset dir="${gnu.getopt.lib}">
@@ -377,10 +364,9 @@
         <include name="log4j.jar"/>
       </fileset>
     </copy>
-    <copy file="${apache.log4j.lib}/snmpTrapAppender.jar"
-        tofile="${install.all.lib}/log4j-snmp-appender.jar">
+    <copy file="${apache.log4j.lib}/snmpTrapAppender.jar" tofile="${install.all.lib}/log4j-snmp-appender.jar">
     </copy>
-
+    
     <!-- Copy thirdparty client code -->
     <copy todir="${install.client}" filtering="no">
       <fileset dir="${apache.log4j.lib}">
@@ -390,29 +376,28 @@
         <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" />
+      <fileset dir="${project.root}/${_module.name}/src/resources/dtd"/>
     </copy>
-
+    
   </target>
-
+  
   <target name="_module-system-all" depends="_module-system-most">
     <!-- Copy the generated javadocs -->
     <mkdir dir="${install.api}/${_module.name}"/>
     <copy todir="${install.api}/${_module.name}" filtering="no">
       <fileset dir="${_module.output}/api">
-         <include name="**/*"/>
+        <include name="**/*"/>
       </fileset>
     </copy>
   </target>
   <target name="_module-system-jmx-most">
     <property name="_module.name" value="system-jmx" override="true"/>
-    <property name="_module.output" override="true"
-      value="${project.root}/${_module.name}/output"/>
-
+    <property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
+    
     <copy todir="${install.lib}" filtering="no">
       <fileset dir="${_module.output}/lib">
         <include name="jboss-system-jmx.jar"/>
@@ -420,59 +405,57 @@
     </copy>
     <copy todir="${install.client}" filtering="no">
       <fileset dir="${_module.output}/lib">
-         <include name="jboss-system-jmx-client.jar"/>
+        <include name="jboss-system-jmx-client.jar"/>
       </fileset>
     </copy>
   </target>
   <target name="_module-system-jmx-all" depends="_module-system-jmx-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"/>
-
+    <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"/>
+        <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"/>
+        <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="**/*"/>
+        <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"/>
-
+    <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">
@@ -482,32 +465,32 @@
         <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"/>
+        <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="**/*"/>
+        <include name="**/*"/>
       </fileset>
       <fileset dir="${_module.output}/lib">
-         <include name="deployer.jar"/>
-         <include name="shutdown.jar"/>
+        <include name="deployer.jar"/>
+        <include name="shutdown.jar"/>
       </fileset>
     </copy>
     <chmod perm="+x">
       <fileset dir="${install.bin}">
-         <include name="**/*.sh"/>
+        <include name="**/*.sh"/>
       </fileset>
     </chmod>
-
+    
     <!-- Copy thirdparty code -->
     <copy todir="${install.lib}" filtering="no">
       <fileset dir="${oswego.concurrent.lib}">
@@ -522,126 +505,124 @@
         <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="**"/>
+        <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"/>
+        <include name="uuid-key-generator.sar/**"/>
+        <include name="sqlexception-service.xml"/>
+        <include name="client-deployer-service.xml"/>
       </fileset>
     </copy>
-	  
-	<!-- Copy the deployers -->  
+    
+    <!-- Copy the deployers -->
     <copy todir="${install.server}/all/deployers" filtering="no">
-       <fileset dir="${_module.output}/etc/deployers">
-         <include name="**"/>
+      <fileset dir="${_module.output}/etc/deployers">
+        <include name="**"/>
       </fileset>
     </copy>
-	  
-    <copy file="${_module.output}/resources/jmx-invoker-adaptor/META-INF/jboss-service.xml"
-          tofile="${install.all.deploy}/jmx-invoker-service.xml"/>
-
+    
+    <copy 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="**"/>
+        <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" />
+      <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" />
+      <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="**/*"/>
+        <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"/>
-
+    <property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
+    
     <mkdir dir="${install.server}/all/deployers"/>
     <copy todir="${install.server}/all/deployers" filtering="no">
       <fileset dir="${_module.output}/resources/deployers">
-         <include name="jca-deployers-beans.xml"/>
+        <include name="jca-deployers-beans.xml"/>
       </fileset>
     </copy>
-
+    
     <!-- Copy the generated deployment libraries -->
     <mkdir dir="${install.server}/all/deploy"/>
     <copy todir="${install.server}/all/deploy" filtering="no">
       <fileset dir="${_module.output}/lib">
-         <include name="*.rar"/>
-         <exclude name="jms-ra.rar"/>
+        <include name="*.rar"/>
+        <exclude name="jms-ra.rar"/>
       </fileset>
       <fileset dir="${_module.output}/resources/jca-sar">
-         <include name="jbossjca-service.xml"/>
+        <include name="jbossjca-service.xml"/>
       </fileset>
     </copy>
     <copy todir="${install.all.deploy}" filtering="no">
       <fileset dir="${_module.output}/lib">
-         <include name="jms-ra.rar"/>
+        <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"/>
+        <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>
-
+    <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"/>
+        <include name="*.xml"/>
       </fileset>
       <fileset dir="${_module.output}/lib">
         <include name="jboss-ha-local-jdbc.rar"/>
@@ -650,428 +631,416 @@
     </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"/-->
+        <!--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>
+    <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"/>
+        <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="**/*"/>
+        <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="**/*"/>
+        <include name="**/*"/>
       </fileset>
     </copy>
   </target>
-
+  
   <!-- ========= -->
   <!-- Legacy JBossMQ -->
   <!-- ========= -->
-
+  
   <target name="_module-jbossmq-most">
     <property name="_module.name" value="jbossmq" override="true"/>
-    <property name="_module.output" override="true"
-	      value="${project.root}/${_module.name}/output"/>
-
+    <property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
+    
     <!-- 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"/>
+        <include name="*.xml"/>
+        <include name="conf/*.xml"/>
+        <include name="standalone/*.xml"/>
       </fileset>
     </copy>
     <!-- TODO: include legacy deploy contents as an example -->
   </target>
   <target name="_module-jbossmq-all" depends="_module-jbossmq-most">
   </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 jboss-messaging libraries -->
-      <mkdir dir="${install.all.lib}"/>
-      <copy todir="${install.all.lib}" filtering="no">
-         <fileset dir="${jboss.messaging.lib}">
-            <include name="jboss-messaging.jar"/>
-         </fileset>
-         <fileset dir="${_module.output}/lib">
-            <include name="jboss-messaging-int.jar"/>
-         </fileset>
-      </copy>
-
-      <!-- messaging descriptors, unscoped deployment -->
-      <mkdir dir="${install.all.deploy}/messaging"/>
-      <copy todir="${install.all.deploy}/messaging">
-         <fileset dir="${_module.output}/etc/deploy/">
-            <include name="*-service.xml"/>
-         </fileset>
-      </copy>
-
-      <!-- security metadata -->
-      <mkdir dir="${install.all.conf}/props"/>
-      <copy todir="${install.all.conf}/props">
-         <fileset dir="${_module.output}/etc/deploy/">
-            <include name="messaging-*.properties"/>
-         </fileset>
-      </copy>
-
-      <!-- the JCA connection factory -->
-      <copy todir="${install.all.deploy}" file="${_module.output}/etc/deploy/jms-ds.xml"/>
-
-      <!-- Copy the generated client libraries -->
-      <mkdir dir="${install.client}"/>
-      <copy todir="${install.client}" file="${jboss.messaging.lib}/jboss-messaging.jar" filtering="no"/>
-   </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>
-
+  
+  <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 jboss-messaging libraries -->
+    <mkdir dir="${install.all.lib}"/>
+    <copy todir="${install.all.lib}" filtering="no">
+      <fileset dir="${jboss.messaging.lib}">
+        <include name="jboss-messaging.jar"/>
+      </fileset>
+      <fileset dir="${_module.output}/lib">
+        <include name="jboss-messaging-int.jar"/>
+      </fileset>
+    </copy>
+    
+    <!-- messaging descriptors, unscoped deployment -->
+    <mkdir dir="${install.all.deploy}/messaging"/>
+    <copy todir="${install.all.deploy}/messaging">
+      <fileset dir="${_module.output}/etc/deploy/">
+        <include name="*-service.xml"/>
+      </fileset>
+    </copy>
+    
+    <!-- security metadata -->
+    <mkdir dir="${install.all.conf}/props"/>
+    <copy todir="${install.all.conf}/props">
+      <fileset dir="${_module.output}/etc/deploy/">
+        <include name="messaging-*.properties"/>
+      </fileset>
+    </copy>
+    
+    <!-- the JCA connection factory -->
+    <copy todir="${install.all.deploy}" file="${_module.output}/etc/deploy/jms-ds.xml"/>
+    
+    <!-- Copy the generated client libraries -->
+    <mkdir dir="${install.client}"/>
+    <copy todir="${install.client}" file="${jboss.messaging.lib}/jboss-messaging.jar" filtering="no"/>
+  </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>
+  
   <!-- ==== -->
   <!-- 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"/>
-
+    <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"/>
+        <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"/>
-
+    <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="**/*"/>
+        <include name="**/*"/>
       </fileset>
     </copy>
-
- </target>
-
+    
+  </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"/>
-
+    <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"/>
+        <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" />
+      <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="**/*"/>
+        <include name="**/*"/>
       </fileset>
     </copy>
-
- </target>
-
+    
+  </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"/>
-
+    <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"/>
+        <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"/>
+        <include name="dom4j.jar"/>
       </fileset>
     </copy>
-
+    
     <!-- Copy the generated client libraries -->
     <mkdir dir="${install.client}"/>
-    <copy tofile="${install.client}/jmx-client.jar"
-      file="${_module.output}/lib/jboss-jmx.jar" />
-
+    <copy tofile="${install.client}/jmx-client.jar" file="${_module.output}/lib/jboss-jmx.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="**/*"/>
+        <include name="**/*"/>
       </fileset>
     </copy>
-
- </target>
-
+    
+  </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"/>
-
+    <property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
+    
     <!-- Copy the security-policies-service.xml -->
     <copy todir="${install.server}/all/deploy" filtering="no">
       <fileset dir="${_module.output}/resources">
-         <include name="security-policies-service.xml"/>
+        <include name="security-policies-service.xml"/>
       </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="**/*"/>
+        <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"/>
-
+    <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"/>
+        <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"/>
+        <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-beans.xml"/>
-         <include name="deploy-hasingleton-beans.xml"/>
+        <include name="cluster-beans.xml"/>
+        <include name="deploy-hasingleton-beans.xml"/>
       </fileset>
     </copy>
     <mkdir dir="${install.server}/all/deploy/jgroups-multiplexer.sar"/>
     <copy todir="${install.server}/all/deploy/jgroups-multiplexer.sar" filtering="no">
       <fileset dir="${_module.output}/resources/jgroups-multiplexer.sar">
-         <include name="**/*"/>
+        <include name="**/*"/>
       </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-beans.xml"/>
-      </fileset>
+    <fileset dir="${_module.output}/etc">
+    <include name="farm-beans.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>
+    <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/*"/>
+        <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="**/*"/>
+        <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"/>
-
+    <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" />
+        <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" />
+        <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"/>
-          <include name="juddisaaj.jar"/>
-       </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"/>
+        <include name="juddisaaj.jar"/>
+      </fileset>
+    </copy>
+    
     <!-- Copy thirdparty code -->
     <copy todir="${install.all.lib}" filtering="no">
       <fileset dir="${sun.jaf.lib}">
@@ -1081,145 +1050,133 @@
         <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"/>
+        <!-- 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 -->
     <!-- and the used joesnmp.jar library to lib -->
     <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"/>
+    <unjar src="${_module.output}/lib/snmp-adaptor.sar" dest="${install.server}/all/deploy/snmp-adaptor.sar"/>
     <copy todir="${install.server}/all/lib" filtering="no">
       <fileset dir="${opennms.joesnmp.lib}">
-         <include name="joesnmp.jar"/>
+        <include name="joesnmp.jar"/>
       </fileset>
     </copy>
-
+    
     <!-- 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"/>
-
+    <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" />
-
-
+    <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"/>
+    
     <mkdir dir="${install.server}/all/deploy/juddi-service.sar/juddiws.war"/>
-    <unjar src="${_module.output}/lib/juddiws.war"
-      dest="${install.server}/all/deploy/juddi-service.sar/juddiws.war"/>
-
+    <unjar src="${_module.output}/lib/juddiws.war" dest="${install.server}/all/deploy/juddi-service.sar/juddiws.war"/>
+    
     <copy todir="${install.server}/all/deploy/juddi-service.sar" filtering="no">
       <fileset dir="${apache.scout.lib}">
-         <include name="scout.jar"/>
+        <include name="scout.jar"/>
       </fileset>
       <fileset dir="${_module.output}/lib">
-         <include name="juddisaaj.jar"/>
+        <include name="juddisaaj.jar"/>
       </fileset>
       <fileset dir="${juddi.juddi.lib}">
-         <include name="juddi.jar"/>
+        <include name="juddi.jar"/>
       </fileset>
     </copy>
-
+    
     <copy todir="${install.server}/all/lib" filtering="no">
       <fileset dir="${apache.scout.lib}">
-         <include name="scout.jar"/>
+        <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"/>
+        <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"/>
+        <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"/>
-
+    <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"/>
+        <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"/>
+        <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>
+    <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" />
+    <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" />
-
+    <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 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"/>
-
+    <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}"/>
-
+    <copy file="${project.root}/varia/src/resources/services/binding/sample-bindings.xml" todir="${install.examples.binding-manager}"/>
+    
     <!-- the bean deployer : obsolete in jboss5
     <mkdir dir="${install.all.deploy}/jboss-bean.deployer"/>
     <copy todir="${install.all.deploy}/jboss-bean.deployer" filtering="no">
-      <fileset dir="${_module.output}/lib/kernel/jboss-bean.deployer">
-         <include name="**/*"/>
-      </fileset>
+    <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">
@@ -1230,124 +1187,118 @@
     <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"/>
+        <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="**/*"/>
+        <include name="**/*"/>
       </fileset>
     </copy>
   </target>
-
+  
   <!-- ===== -->
   <!-- JBoss Web -->
   <!-- ===== -->
-
+  
   <target name="_module-tomcat-most">
     <property name="_module.name" value="tomcat" override="true"/>
-    <property name="_module.output" override="true"
-	      value="${project.root}/${_module.name}/output"/>
-    <property name="_module.ext" override="true"
-	      value="${project.root}/${_module.name}/ext"/>
-
+    <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="${jboss.web.lib}/servlet-api.jar" />
-    <copy tofile="${install.all.lib}/javax.servlet.jsp.jar"
-       file="${jboss.web.lib}/jsp-api.jar" />
-    <copy tofile="${install.all.lib}/javax.el.jar"
-       file="${jboss.web.lib}/el-api.jar" />
-
+    <copy tofile="${install.all.lib}/javax.servlet.jar" file="${jboss.web.lib}/servlet-api.jar"/>
+    <copy tofile="${install.all.lib}/javax.servlet.jsp.jar" file="${jboss.web.lib}/jsp-api.jar"/>
+    <copy tofile="${install.all.lib}/javax.el.jar" file="${jboss.web.lib}/el-api.jar"/>
+    
     <!-- Copy the deployables -->
     <mkdir dir="${install.server}/all/deployers/jbossweb.deployer"/>
     <copy todir="${install.server}/all/deployers/jbossweb.deployer">
-      <fileset dir="${_module.output}/deploy/jbossweb.deployer" />
+      <fileset dir="${_module.output}/deploy/jbossweb.deployer"/>
     </copy>
     <!-- Use the all war deployers descriptor -->
     <copy tofile="${install.server}/all/deployers/jbossweb.deployer/META-INF/war-deployers-beans.xml"
       file="${project.root}/${_module.name}/src/resources/war-deployers-all-beans.xml" overwrite="true"/>
-
+    
     <!-- Copy the ROOT.war -->
     <copy todir="${install.server}/all/deploy">
-       <fileset dir="${_module.output}/deploy">
-           <include name="ROOT.war/**"/>
-       </fileset>
+      <fileset dir="${_module.output}/deploy">
+        <include name="ROOT.war/**"/>
+      </fileset>
     </copy>
     <!-- Copy the tc5 clustering service sar -->
     <copy todir="${install.server}/all/deploy">
-       <fileset dir="${_module.output}/deploy">
-           <include name="tc6-cluster.sar/**"/>
-       </fileset>
+      <fileset dir="${_module.output}/deploy">
+        <include name="tc6-cluster.sar/**"/>
+      </fileset>
     </copy>
-
+    
   </target>
-
+  
   <target name="_module-tomcat-all" depends="_module-tomcat-most">
   </target>
-
+  
   <!-- ========== -->
   <!-- Webservice -->
   <!-- ========== -->
-
+  
   <target name="_module-webservice-most" depends="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.all.lib}" filtering="no">
     </copy>
-
-   </target>
-
+    
+  </target>
+  
   <target name="module-webservice15" if="HAVE_JDK_1.5">
-
+    
     <!-- copy the client stuff -->
     <mkdir dir="${install.client}"/>
     <copy todir="${install.client}" filtering="no">
     </copy>
-
+    
   </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"/>
-
+    <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"/>
+        <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"/>
+        <include name="jboss-iiop-client.jar"/>
       </fileset>
     </copy>
-
+    
     <!-- Copy thirdparty code -->
     <copy todir="${install.all.lib}" filtering="no">
       <fileset dir="${jacorb.jacorb.lib}">
@@ -1357,7 +1308,7 @@
         <include name="avalon-framework.jar"/>
       </fileset>
     </copy>
-
+    
     <!-- Copy thirdparty client code -->
     <copy todir="${install.client}" filtering="no">
       <fileset dir="${jacorb.jacorb.lib}">
@@ -1370,7 +1321,7 @@
         <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">
@@ -1378,180 +1329,173 @@
         <include name="jacorb.properties"/>
       </fileset>
       <fileset dir="${_module.output}/etc/conf">
-         <include name="jndi.properties"/>
+        <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"/>
+        <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="**/*"/>
+        <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"/>
-
+    <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"/>
+        <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"/>
+        <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"/>
+        <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="**/*"/>
+        <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="**/*"/>
+        <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"/>
-
+    <property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
+    
     <!-- Copy the generated libraries -->
     <mkdir dir="${install.all.lib}"/>
     <copy todir="${install.server}/all/lib" filtering="no">
       <fileset dir="${_module.output}/lib">
-         <include name="jboss-transaction.jar"/>
+        <include name="jboss-transaction.jar"/>
       </fileset>
     </copy>
-	<!-- copy binary release of JBossTS from thirdparty repo -->
-	<copy todir="${install.all.lib}" filtering="no">
-		<fileset dir="${project.thirdparty}/jboss/jbossts/lib/">
-			<include name="jbossjta.jar"/>
-			<include name="jbossjta-integration.jar"/>
-			<include name="jbossts-common.jar"/>
-		</fileset>
-	</copy>
-	<copy todir="${install.all.conf}" filtering="no"
-		file="${project.thirdparty}/jboss/jbossts/resources/jbossjta-properties.xml"/>
-
+    <!-- copy binary release of JBossTS from thirdparty repo -->
+    <copy todir="${install.all.lib}" filtering="no">
+      <fileset dir="${project.thirdparty}/jboss/jbossts/lib/">
+        <include name="jbossjta.jar"/>
+        <include name="jbossjta-integration.jar"/>
+        <include name="jbossts-common.jar"/>
+      </fileset>
+    </copy>
+    <copy todir="${install.all.conf}" filtering="no" file="${project.thirdparty}/jboss/jbossts/resources/jbossjta-properties.xml"/>
+    
     <!-- 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"/>
+        <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="**/*"/>
+        <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"/>
-
+    <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="**/*"/>
+        <include name="**/*"/>
       </fileset>
       <fileset dir="${_module.output}/lib">
-         <include name="twiddle.jar"/>
+        <include name="twiddle.jar"/>
       </fileset>
     </copy>
     <chmod perm="+x">
       <fileset dir="${install.bin}">
-         <include name="**/*.sh"/>
+        <include name="**/*.sh"/>
       </fileset>
     </chmod>
-
+    
     <!-- Copy the BeanShell JAR -->
     <copy todir="${install.server}/all/lib" filtering="no">
       <fileset dir="${beanshell.beanshell.lib}">
-         <include name="**"/>
+        <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" />
-
+    <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"/>
+    
   </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="**/*"/>
+        <include name="**/*"/>
       </fileset>
     </copy>
   </target>
-
-
+  
   <!-- ============= -->
   <!-- Compatibility -->
   <!-- ============= -->
@@ -1559,7 +1503,7 @@
     <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}"/>
@@ -1571,11 +1515,10 @@
       </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}"
->
+    <java classname="${compatibility.bin}" fork="true" failonerror="true" dir="${compatibility.dir}">
       <arg value="check"/>
       <arg value="${contract.classes}"/>
       <classpath>
@@ -1583,30 +1526,28 @@
       </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>
-
+    <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">
@@ -1614,80 +1555,76 @@
         <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="**/*"/>
+        <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="**/*"/>
+        <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"/>
-
+    <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" />
+      <fileset dir="${_module.output}/lib" includes="*.jar"/>
     </copy>
-
+    
     <!-- The hibernate jar -->
     <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${hibernate.lib}" includes="*.jar" />
+      <fileset dir="${hibernate.lib}" includes="*.jar"/>
     </copy>
-
+    
     <!-- ASM jars (cglib dependency)
     <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${asm.asm.lib}" includes="*.jar" />
+    <fileset dir="${asm.asm.lib}" includes="*.jar" />
     </copy>
     -->
-
+    
     <!-- ANTLR jar -->
     <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${antlr.antlr.lib}" includes="*.jar" />
+      <fileset dir="${antlr.antlr.lib}" includes="*.jar"/>
     </copy>
     <!-- Copy the generated client libraries -->
     <mkdir dir="${install.client}"/>
     <copy todir="${install.client}" filtering="no">
-      <fileset dir="${antlr.antlr.lib}" includes="*.jar" />
+      <fileset dir="${antlr.antlr.lib}" includes="*.jar"/>
     </copy>
-
+    
     <!-- CGLIB jar
     <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${cglib.lib}" includes="*.jar"/>
+    <fileset dir="${cglib.lib}" includes="*.jar"/>
     </copy>
     -->
-
+    
     <!-- Commons collections jar -->
     <copy todir="${install.all.lib}" filtering="no">
       <fileset dir="${apache.collections.lib}" includes="*.jar"/>
     </copy>
-
+    
   </target>
-
-
-
+  
   <target name="_module-hibernate-int-all" depends="_module-hibernate-int-most">
     <!-- Copy the generated javadocs -->
     <mkdir dir="${install.api}/${_module.name}"/>
@@ -1697,46 +1634,43 @@
       </fileset>
     </copy>
   </target>
-
-
-    <!-- ============ -->
-    <!--   Spring     -->
-    <!-- ============ -->
-
-<!--
+  
+  <!-- ============ -->
+  <!--   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" />
+  <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>
+  <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="jbosscache.jar"/>
-           <include name="pojocache.jar"/>
-        </fileset>
-       <fileset dir="${jboss.backport.concurrent.lib}">
-         <include name="jboss-backport-concurrent.jar"/>
-       </fileset>
+    <!-- Copy thirdparty libraries -->
+    <mkdir dir="${install.all.lib}"/>
+    <copy todir="${install.all.lib}" filtering="no">
+      <fileset dir="${jboss.cache.lib}">
+        <include name="jbosscache.jar"/>
+        <include name="pojocache.jar"/>
+      </fileset>
+      <fileset dir="${jboss.backport.concurrent.lib}">
+        <include name="jboss-backport-concurrent.jar"/>
+      </fileset>
       <fileset dir="${jboss.security.spi.lib}">
         <include name="jboss-security-spi.jar"/>
       </fileset>
@@ -1747,15 +1681,14 @@
         <include name="sunxacml.jar"/>
         <include name="sunxacml-support.jar"/>
       </fileset>
-     </copy>
-
-
+    </copy>
+    
     <!-- Copy the generated libraries -->
     <mkdir dir="${install.lib}"/>
     <copy todir="${install.lib}" filtering="no">
-       <fileset dir="${javassist.javassist.lib}">
-         <include name="javassist.jar"/>
-       </fileset>
+      <fileset dir="${javassist.javassist.lib}">
+        <include name="javassist.jar"/>
+      </fileset>
       <fileset dir="${jboss.common.core.lib}">
         <exclude name="*-sources.jar"/>
       </fileset>
@@ -1779,7 +1712,7 @@
         <include name="jboss-deployers.jar"/>
       </fileset>
     </copy>
-
+    
     <!-- Copy the generated client libraries -->
     <mkdir dir="${install.client}"/>
     <copy todir="${install.client}" filtering="no">
@@ -1835,7 +1768,7 @@
         <include name="jboss-saaj.jar"/>
       </fileset>
     </copy>
-
+    
     <!-- Copy thirdparty code to lib/endorsed -->
     <mkdir dir="${install.lib}/endorsed"/>
     <copy todir="${install.lib}/endorsed" filtering="no">
@@ -1849,7 +1782,7 @@
         <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}">
@@ -1860,19 +1793,21 @@
         <include name="jboss-saaj.jar"/>
       </fileset>
     </copy>
-
-
-     <!-- setup webservice sar -->
+    
+    <!-- Install jbossws.deployer -->
+    <mkdir dir="${install.server}/all/deployers/jbossws.deployer"/>
+    <unjar dest="${install.server}/all/deployers/jbossws.deployer" src="${jboss.jbossws.lib}/jbossws.deployer"/>
+    
+    <!-- Install 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>
-
-</project>
+  </project>




More information about the jboss-cvs-commits mailing list