[jboss-cvs] JBossAS SVN: r89726 - in branches/JBPAPP_5_0_JBPAPP-2043: build and 5 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Jun 3 08:21:29 EDT 2009


Author: ataylor
Date: 2009-06-03 08:21:29 -0400 (Wed, 03 Jun 2009)
New Revision: 89726

Added:
   branches/JBPAPP_5_0_JBPAPP-2043/messaging2/
   branches/JBPAPP_5_0_JBPAPP-2043/messaging2/build.xml
   branches/JBPAPP_5_0_JBPAPP-2043/messaging2/pom.xml
   branches/JBPAPP_5_0_JBPAPP-2043/messaging2/src/
   branches/JBPAPP_5_0_JBPAPP-2043/messaging2/src/etc/
   branches/JBPAPP_5_0_JBPAPP-2043/messaging2/src/etc/javaee-example-ant.properties
   branches/JBPAPP_5_0_JBPAPP-2043/messaging2/src/etc/jms-example-ant.properties
Modified:
   branches/JBPAPP_5_0_JBPAPP-2043/build/build-distr.xml
   branches/JBPAPP_5_0_JBPAPP-2043/build/build.xml
   branches/JBPAPP_5_0_JBPAPP-2043/component-matrix/pom.xml
   branches/JBPAPP_5_0_JBPAPP-2043/pom.xml
   branches/JBPAPP_5_0_JBPAPP-2043/thirdparty/pom.xml
Log:
added JBM2 module and dependencies

Modified: branches/JBPAPP_5_0_JBPAPP-2043/build/build-distr.xml
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-2043/build/build-distr.xml	2009-06-03 12:14:39 UTC (rev 89725)
+++ branches/JBPAPP_5_0_JBPAPP-2043/build/build-distr.xml	2009-06-03 12:21:29 UTC (rev 89726)
@@ -131,7 +131,7 @@
       <fileset dir="${jboss.jboss.ejb3.metrics.deployer.lib}" includes="*.jar"
                excludes="*-sources.jar, *-javadoc.jar"/>
     </copy>
-    
+
     <!-- Copy the third party libraries -->
     <copy todir="${install.all.lib}" filtering="no">
       <fileset dir="${jboss.jboss.ejb3.cache.lib}" includes="*.jar"
@@ -171,7 +171,7 @@
       <fileset dir="${hibernate.annotations.lib}" includes="*.jar"
                 excludes="*-sources.jar, *-javadoc.jar"/>
       <fileset dir="${hibernate.validator.lib}" includes="*.jar"
-                excludes="*-sources.jar, *-javadoc.jar"/> 
+                excludes="*-sources.jar, *-javadoc.jar"/>
       <fileset dir="${jboss.jboss.jpa.deployers.lib}" includes="*.jar"
                excludes="*-sources.jar, *-javadoc.jar"/>
       <fileset dir="${jboss.jboss.ejb3.endpoint.lib}" includes="*.jar"
@@ -663,9 +663,9 @@
            <include name="jboss-messaging-int.jar"/>
         </fileset>
      </copy>
-  	
+
   	<!--
-  		JBAS-6850: Replace Queue and Topic xmbean defintion.  
+  		JBAS-6850: Replace Queue and Topic xmbean defintion.
   	-->
   	 <jar destfile="${install.all.lib}/jboss-messaging.jar" update="true">
   	 	<fileset dir="${_module.output}/etc/">
@@ -726,8 +726,8 @@
             <include name="remoting-bisocket-service.xml"/>
         </fileset>
      </copy>
-  	
-  	<!-- 
+
+  	<!--
   		The messaging profileservice definitions, to default and all
   	-->
   	<copy todir="${install.default.deployers}">
@@ -740,7 +740,7 @@
 			<include name="*-jboss-beans.xml"/>
   		</fileset>
   	</copy>
-  	
+
      <!-- copy example jms configs -->
      <mkdir dir="${install.examples.jms}"/>
      <copy todir="${install.examples.jms}" filtering="no">
@@ -781,6 +781,22 @@
       </copy>
    </target>
 
+   <target name="_module-messaging2-most">
+     <property name="_module.name" value="messaging2" override="true"/>
+     <property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
+     <copy todir="${install.root}">
+       <fileset dir="${_module.output}">
+         <include name="JBossMessaging2/*"/>
+         <exclude name="JBossMessaging2/jbm-resources.jar"/>
+       </fileset>
+     </copy>
+      <mkdir dir="${install.examples}/JBossMessaging2"/>
+     <copy todir="${install.examples}/JBossMessaging2">
+       <fileset dir="${_module.output}/etc/examples"/>
+     </copy>
+   </target>
+
+   <target name="_module-messaging2-all" depends="_module-messaging2-most"/>
   <!-- ==== -->
   <!-- J2SE -->
   <!-- ==== -->
@@ -917,7 +933,7 @@
         <include name="jbosssx-as-client.jar"/>
       </fileset>
     </copy>
-   
+
     <!-- Copy the security configuration files -->
     <mkdir dir="${install.all.deploy}/security"/>
     <copy todir="${install.all.deploy}/security">
@@ -1054,13 +1070,13 @@
       </fileset>
     </copy>
 
-  	<!-- copy the service binding manager to it's deployment --> 
+  	<!-- copy the service binding manager to it's deployment -->
     <copy todir="${install.server}/all/conf/bindingservice.beans">
      <fileset dir="${_module.output}/lib">
      	<include name="jboss-bindingservice.jar"/>
      </fileset>
 	</copy>
-  	
+
     <!-- Copy to docs/examples -->
     <mkdir dir="${install.examples.varia}"/>
     <copy todir="${install.examples.varia}" filtering="no">
@@ -1215,7 +1231,7 @@
     <mkdir dir="${install.examples.binding-manager}"/>
     <copy file="${project.root}/varia/src/resources/services/binding/sample-bindings.xml" todir="${install.examples.binding-manager}"/>
     -->
-  	
+
     <!-- the bean deployer : obsolete in jboss5
     <mkdir dir="${install.all.deploy}/jboss-bean.deployer"/>
     <copy todir="${install.all.deploy}/jboss-bean.deployer" filtering="no">
@@ -1330,13 +1346,13 @@
     <copy tofile="${install.server}/all/deployers/war-clustering-deployers-jboss-beans.xml"
       file="${project.root}/${_module.name}/src/resources/war-clustering-deployers-jboss-beans.xml" overwrite="true"/>
     -->
-  	
+
   	 <!-- Copy the webserver runtime sar -->
   	 <mkdir dir="${install.server}/all/deploy/jbossweb.sar"/>
     <copy todir="${install.server}/all/deploy/jbossweb.sar">
       <fileset dir="${_module.output}/deploy/jbossweb.sar"/>
     </copy>
-  	
+
     <!-- Copy the ROOT.war -->
     <copy todir="${install.server}/all/deploy" filtering="no">
       <fileset dir="${_module.output}/deploy">
@@ -1828,7 +1844,7 @@
     <copy todir="${install.all.lib}" filtering="no">
       <fileset dir="${antlr.antlr.lib}" includes="antlr.jar"/>
     </copy>
-    
+
     <!-- Copy client libraries -->
     <mkdir dir="${install.client}"/>
     <copy todir="${install.client}" filtering="no">
@@ -1922,13 +1938,13 @@
       </fileset>
       <fileset dir="${jboss.jboss.negotiation.lib}">
         <include name="jboss-negotiation.jar"/>
-      </fileset>      
+      </fileset>
       <fileset dir="${jboss.jboss.security.spi.lib}">
         <include name="jboss-security-spi.jar"/>
       </fileset>
       <fileset dir="${jboss.jbosssx.lib}">
         <include name="jbosssx.jar"/>
-      </fileset>      
+      </fileset>
       <fileset dir="${jboss.security.lib}">
         <include name="jbossxacml.jar"/>
       </fileset>
@@ -2026,7 +2042,7 @@
         <include name="wstx.jar"/>
       </fileset>
     </copy>
-    
+
     <!-- Copy the generated client libraries -->
     <mkdir dir="${install.client}"/>
     <copy todir="${install.client}" filtering="no">
@@ -2160,7 +2176,7 @@
     <!-- avoid the duplicate copying of jaxb/stax apis from jbossws macros -->
     <delete file="${install.lib}/jaxb-api.jar"/>
     <delete file="${install.lib}/stax-api.jar"/>
-    
+
     <!-- Copy thirdparty code to server/all/lib -->
     <copy todir="${install.all.lib}" filtering="no">
       <fileset dir="${apache.logging.lib}">
@@ -2250,7 +2266,7 @@
         <include name="*.sh"/>
       </fileset>
     </chmod>
-   	
+
     <unzip dest="${install.server}/all/deployers">
        <fileset dir="${webbeans.deployer.lib}">
          <include name="webbeans-jboss-int-deployer.zip"/>

Modified: branches/JBPAPP_5_0_JBPAPP-2043/build/build.xml
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-2043/build/build.xml	2009-06-03 12:14:39 UTC (rev 89725)
+++ branches/JBPAPP_5_0_JBPAPP-2043/build/build.xml	2009-06-03 12:21:29 UTC (rev 89726)
@@ -35,7 +35,7 @@
       <pathelement location="${basedir}/../tools/lib/ant-contrib-1.0b3.jar"/>
     </classpath>
   </taskdef>
-  
+
   <!-- ================================================================== -->
   <!-- Initialization                                                     -->
   <!-- ================================================================== -->
@@ -102,6 +102,7 @@
       <module name="management"/>
       <module name="mbeans"/>
       <module name="messaging"/>
+      <module name="messaging2"/>
       <module name="jbossas/remoting"/>
       <module name="jmx-remoting"/>
       <module name="jbossas/jmx-remoting"/>
@@ -141,6 +142,7 @@
                           jmx-remoting,
                           jbossas/jmx-remoting,
                           messaging,
+                          messaging2,
                           cluster,
                           varia,
                           iiop,
@@ -280,11 +282,11 @@
     <property name="install.standard.deploy" value="${install.standard}/deploy"/>
     <property name="install.standard.deployers" value="${install.standard}/deployers"/>
     <property name="install.standard.conf" value="${install.standard}/conf"/>
-    
+
     <!-- libs shared by the server configurations -->
     <property name="install.common" value="${install.root}/common"/>
     <property name="install.common.lib" value="${install.common}/lib"/>
-    
+
     <!-- Configuration for the nightly build and test job -->
     <property name="run.nightly.sleep" value="1"/> <!-- 1 minute -->
     <property name="run.nightly.email.tolist" value="jboss-development at lists.sourceforge.net"/>
@@ -499,7 +501,18 @@
      <ant antfile="build-distr.xml" target="_module-messaging-all"/>
   </target>
 
+  <!-- ========= -->
+  <!-- Messaging 2 -->
+  <!-- ========= -->
 
+  <target name="_module-messaging2-most">
+     <ant antfile="build-distr.xml" target="_module-messaging2-most"/>
+  </target>
+
+  <target name="_module-messaging2-all" depends="_module-messaging2-most">
+     <ant antfile="build-distr.xml" target="_module-messaging2-all"/>
+  </target>
+
   <!-- ==== -->
   <!-- J2SE -->
   <!-- ==== -->
@@ -668,7 +681,7 @@
    <target name="_module-profileservice-most">
       <ant antfile="build-distr.xml" target="_module-profileservice-most"/>
    </target>
-   
+
    <target name="_module-profileservice-all">
       <ant antfile="build-distr.xml" target="_module-profileservice-most"/>
    </target>
@@ -718,8 +731,8 @@
         <exclude name="jcip-annotations.jar"/>
       </fileset>
     </move>
-    
-    <!-- Copy server/all to server/default and then remove the services 
+
+    <!-- Copy server/all to server/default and then remove the services
          outside of the scope of the default config
     -->
     <copy todir="${install.default}">
@@ -739,19 +752,19 @@
         <exclude name="deploy/snmp-adaptor.sar/**"/>
         <exclude name="deploy/juddi-service.sar/**"/>
         <exclude name="deploy/messaging/**"/>
-        <exclude name="deployers/clustering-deployer-jboss-beans.xml"/>        
+        <exclude name="deployers/clustering-deployer-jboss-beans.xml"/>
       </fileset>
     </copy>
-    <!-- leave the empty default/lib directory there --> 
+    <!-- leave the empty default/lib directory there -->
     <mkdir dir="${install.default.lib}"/>
-  	
+
     <copy todir="${install.default.conf}" overwrite="true">
     	<fileset dir="${project.root}/server/output/etc/conf/default"/>
 	 </copy>
-          
+
     <copy tofile="${install.default}/deployers/clustering-deployer-jboss-beans.xml"
           file="${project.root}/cluster/output/etc/clustering-deployer-jboss-beans-non-clustered.xml"/>
- 
+
     <unjar src="${project.root}/varia/output/lib/http-invoker.sar"
       dest="${install.default}/deploy/http-invoker.sar"/>
 
@@ -770,13 +783,13 @@
         <include name="xmdesc/NamingBean-xmbean.xml"/>
         <include name="xmdesc/NamingService-xmbean.xml"/>
         <include name="xmdesc/NamingProviderURLWriter-xmbean.xml"/>
-        <include name="xmdesc/Log4jService-xmbean.xml"/>          
+        <include name="xmdesc/Log4jService-xmbean.xml"/>
       </fileset>
     </copy>
     <copy todir="${install.minimal.conf}" overwrite="true">
       <fileset dir="${project.root}/server/output/etc/conf/minimal"/>
     </copy>
-    <copy file="${project.root}/profileservice/output/resources/hdscanner-jboss-beans.xml" 
+    <copy file="${project.root}/profileservice/output/resources/hdscanner-jboss-beans.xml"
           todir="${install.minimal.deploy}" overwrite="true"/>
     <copy todir="${install.minimal.lib}">
       <fileset dir="${install.common.lib}">
@@ -801,13 +814,13 @@
     </copy>
     <copy todir="${install.web.deployers}">
       <fileset dir="${install.default.deployers}">
-         <include name="alias-deployers-jboss-beans.xml"/>            
-         <include name="ejb3.deployer/**"/>            
-         <include name="jboss-jca.deployer/**"/>            
-         <include name="jboss-aop-jboss5.deployer/**"/>            
-         <include name="jbossweb.deployer/**"/>            
-         <include name="metadata-deployer-jboss-beans.xml"/>            
-         <include name="security-deployer-jboss-beans.xml"/>            
+         <include name="alias-deployers-jboss-beans.xml"/>
+         <include name="ejb3.deployer/**"/>
+         <include name="jboss-jca.deployer/**"/>
+         <include name="jboss-aop-jboss5.deployer/**"/>
+         <include name="jbossweb.deployer/**"/>
+         <include name="metadata-deployer-jboss-beans.xml"/>
+         <include name="security-deployer-jboss-beans.xml"/>
       </fileset>
     </copy>
     <copy todir="${install.web.deploy}">
@@ -878,18 +891,18 @@
         <include name="ear-deployer-jboss-beans.xml"/>
       </fileset>
     </copy>
-    
+
     <call target="jboss-all-client"/>
   </target>
-  
+
   <target name="jboss-all-client" depends="init"
       description="Create jar containing client classpath">
 
-    <!--Create a jbossall-client.jar containing the classpath for everything a client app needs-->  
-      
+    <!--Create a jbossall-client.jar containing the classpath for everything a client app needs-->
+
     <property name="client.jar.dir" location="${install.client}" />
     <property name="jbossall.client.filename" value="jbossall-client.jar"/>
-    
+
     <fileset id="client.jar.fileset" dir="${client.jar.dir}">
       <include name="*-client.jar"/>
       <include name="asm.jar"/>
@@ -927,22 +940,22 @@
       <!-- client excludes -->
       <exclude name="jbossws-native-client.jar"/>
       <exclude name="${jbossall.client.filename}"/>
-    </fileset>    
-    
-    <path id="client.jar.classpath"> 
-      <fileset refid="client.jar.fileset" /> 
+    </fileset>
+
+    <path id="client.jar.classpath">
+      <fileset refid="client.jar.fileset" />
     </path>
-     
+
     <pathconvert property="client.jar.manifest.classpath" refid="client.jar.classpath"
                  pathsep=" " dirsep="${file.separator}">
       <map from="${client.jar.dir}${file.separator}" to="" />
     </pathconvert>
-    
-    <pathconvert property="client.jar.files" refid="client.jar.classpath" 
+
+    <pathconvert property="client.jar.files" refid="client.jar.classpath"
                  pathsep="${line.separator}"  dirsep="${file.separator}">
       <map from="${client.jar.dir}${file.separator}" to="" />
     </pathconvert>
-    
+
     <mkdir dir="${module.output}/temp"/>
     <echo file="${module.output}/temp/readme.txt">
 This jar file contains a classpath reference to various client jar files used by jboss client applications.
@@ -952,7 +965,7 @@
 
 ${client.jar.files}
     </echo>
-    
+
     <jar destfile="${install.client}/${jbossall.client.filename}" basedir="${module.output}/temp">
       <manifest>
           <attribute name="Specification-Title" value="${specification.title}"/>
@@ -976,7 +989,7 @@
 
   <!-- Clean up all build output -->
   <target name="clean" description="Cleans up most generated files."
-          depends="maven-clean, checkthirdparty, _buildmagic:clean, 
+          depends="maven-clean, checkthirdparty, _buildmagic:clean,
                    modules-clean">
   </target>
 
@@ -1013,7 +1026,7 @@
     <attribute name="resultproperty" default="maven.result" />
     <element name="args" implicit="true" optional="true" />
     <sequential>
-      <java classname="org.codehaus.classworlds.Launcher" fork="true" 
+      <java classname="org.codehaus.classworlds.Launcher" fork="true"
             dir="@{basedir}" resultproperty="@{resultproperty}">
         <jvmarg value="-Xmx512m"/>
         <classpath>
@@ -1030,12 +1043,12 @@
       </java>
     </sequential>
   </macrodef>
-  
+
   <target name="maven-init">
     <property name="maven.home" location="${basedir}/../tools/maven"/>
     <echo message="Maven Home set to ${maven.home}"/>
   </target>
-  
+
   <target name="checkthirdparty">
     <if>
       <not>
@@ -1046,19 +1059,19 @@
       </then>
     </if>
   </target>
-  
+
    <!-- Call maven to create the thirdparty folder from artifacts in the maven repository -->
    <target name="createthirdparty" unless="inhibit.downloads"
       depends="maven-init, init, check.inhibit.downloads, set.proxy">
-     
+
       <property name="maven.opts" value=""/>
       <property name="thirdparty.maven.opts" value="${maven.opts}"/>
 
-      <maven basedir="${basedir}/../thirdparty" 
-             options="${thirdparty.maven.opts}" 
+      <maven basedir="${basedir}/../thirdparty"
+             options="${thirdparty.maven.opts}"
              goal="generate-resources"
              resultproperty="maven.thirdparty.result"/>
-      
+
       <fail message="Unable to build thirdparty directory.  See maven output for details.">
         <condition>
           <not>
@@ -1066,21 +1079,21 @@
           </not>
         </condition>
       </fail>
-      
+
    </target>
 
   <!-- Call maven to build the mavenized modules -->
   <target name="maven-install" description="Run the install goal against the maven build"
           depends="maven-init">
-    
+
      <property name="maven.opts" value=""/>
      <property name="maven.install.opts" value="-Dintegrated-build ${maven.opts}"/>
 
-     <maven basedir="${basedir}/.." 
-            options="${maven.install.opts}" 
+     <maven basedir="${basedir}/.."
+            options="${maven.install.opts}"
             goal="install"
             resultproperty="maven.install.result"/>
-     
+
      <fail message="Unable to build maven modules.  See maven output for details.">
        <condition>
          <not>
@@ -1088,20 +1101,20 @@
          </not>
        </condition>
      </fail>
-     
+
   </target>
 
   <!-- Call maven to clean the mavenized modules -->
   <target name="maven-clean" description="Run the clean goal against the maven build."
           depends="maven-init">
-    
+
      <property name="maven.clean.opts" value="-Pintegrated-build "/>
 
-     <maven basedir="${basedir}/.." 
-            options="${maven.clean.opts}" 
+     <maven basedir="${basedir}/.."
+            options="${maven.clean.opts}"
             goal="clean"
             resultproperty="maven.clean.result"/>
-     
+
      <fail message="Unable to clean maven modules.  See maven output for details.">
        <condition>
          <not>
@@ -1109,7 +1122,7 @@
          </not>
        </condition>
      </fail>
-     
+
   </target>
 
    <!-- check if thirdparty libraries are to be downloaded -->
@@ -1149,7 +1162,7 @@
          </and>
       </condition>
    </target>
-   
+
    <target name="set.proxy" depends="set.proxy.withoutauth, set.proxy.auth"/>
 
    <!-- set proxy settings without auth -->

Modified: branches/JBPAPP_5_0_JBPAPP-2043/component-matrix/pom.xml
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-2043/component-matrix/pom.xml	2009-06-03 12:14:39 UTC (rev 89725)
+++ branches/JBPAPP_5_0_JBPAPP-2043/component-matrix/pom.xml	2009-06-03 12:21:29 UTC (rev 89726)
@@ -41,6 +41,8 @@
     <version.jboss.jbossws>3.1.2.GA</version.jboss.jbossws>
     <version.jboss.jms-integration-tests>1.0.1.GA</version.jboss.jms-integration-tests>
     <version.jboss.messaging>1.4.3.GA</version.jboss.messaging>
+    <version.org.jboss.messaging>2.0.0.BETA1-SNAPSHOT</version.org.jboss.messaging>
+    <version.org.jboss.netty>3.1.0.BETA3</version.org.jboss.netty>
     <version.jboss.web>2.1.3.GA</version.jboss.web>
     <version.jgroups>2.6.10.GA</version.jgroups>
     <version.junit>3.8.2</version.junit>
@@ -76,7 +78,7 @@
     <version.org.jboss.ejb3.endpoint.deployer>0.1.3</version.org.jboss.ejb3.endpoint.deployer>
     <version.org.jboss.integration>5.1.0.GA</version.org.jboss.integration>
     <version.org.jboss.jbossxb>2.0.1.GA</version.org.jboss.jbossxb>
-    <version.org.jboss.jopr>1.2.0.GA</version.org.jboss.jopr>    
+    <version.org.jboss.jopr>1.2.0.GA</version.org.jboss.jopr>
     <version.org.jboss.jpa>1.0.0</version.org.jboss.jpa>
     <version.org.jboss.logbridge>1.0.0.GA</version.org.jboss.logbridge>
     <version.org.jboss.logmanager>1.0.0.GA</version.org.jboss.logmanager>
@@ -109,7 +111,7 @@
   <!-- Dependency Management -->
   <dependencyManagement>
     <dependencies>
-    
+
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-ant-tasks</artifactId>
@@ -126,7 +128,7 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.seam.integration</groupId>
         <artifactId>jboss-seam-int-microcontainer</artifactId>
@@ -148,7 +150,7 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.webbeans.integration</groupId>
         <artifactId>webbeans-jboss-int-deployer</artifactId>
@@ -177,104 +179,104 @@
         <artifactId>antlr</artifactId>
         <version>2.7.6-brew</version>
       </dependency>
-      
+
       <dependency>
         <groupId>apache-avalon</groupId>
         <artifactId>avalon-framework</artifactId>
         <version>4.1.5</version>
       </dependency>
-      
+
       <dependency>
         <groupId>apache-avalon-logkit</groupId>
         <artifactId>logkit</artifactId>
         <version>1.2</version>
       </dependency>
-      
+
       <dependency>
         <groupId>apache-bsf</groupId>
         <artifactId>bsf</artifactId>
         <version>2.4.0</version>
       </dependency>
-      
+
       <dependency>
         <groupId>apache-discovery</groupId>
         <artifactId>commons-discovery</artifactId>
         <version>0.4-brew</version>
       </dependency>
-      
+
       <dependency>
         <groupId>apache-httpclient</groupId>
         <artifactId>commons-httpclient</artifactId>
         <version>3.0.1</version>
         <scope>test</scope>
       </dependency>
-      
+
       <dependency>
         <groupId>apache-jaxme</groupId>
         <artifactId>jaxmexs</artifactId>
         <version>0.2-cvs</version>
       </dependency>
-      
+
       <dependency>
         <groupId>log4j</groupId>
         <artifactId>log4j</artifactId>
         <version>1.2.14</version>
       </dependency>
-      
+
       <dependency>
         <groupId>commons-logging</groupId>
         <artifactId>commons-logging</artifactId>
         <version>1.1.0.jboss</version>
       </dependency>
-      
+
       <dependency>
         <groupId>apache-myfaces</groupId>
         <artifactId>myfaces-impl</artifactId>
         <version>1.1.3</version>
       </dependency>
-      
+
       <dependency>
         <groupId>apache-myfaces</groupId>
         <artifactId>myfaces-api</artifactId>
         <version>1.1.3</version>
       </dependency>
-      
+
       <dependency>
         <groupId>apache-scout</groupId>
         <artifactId>scout</artifactId>
         <version>0.7rc2</version>
       </dependency>
-      
+
       <dependency>
         <groupId>apache-slide</groupId>
         <artifactId>jakarta-slide-webdavlib</artifactId>
         <version>2.1-brew</version>
       </dependency>
-      
+
       <dependency>
         <groupId>apache-velocity</groupId>
         <artifactId>velocity</artifactId>
         <version>1.4jboss</version>
       </dependency>
-      
+
       <dependency>
         <groupId>apache-xalan</groupId>
         <artifactId>serializer</artifactId>
         <version>${version.apache.xalan}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>apache-xalan</groupId>
         <artifactId>xalan</artifactId>
         <version>${version.apache.xalan}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>apache-xerces</groupId>
         <artifactId>resolver</artifactId>
         <version>2.9.1</version>
       </dependency>
-      
+
       <dependency>
         <groupId>xerces</groupId>
         <artifactId>xercesImpl</artifactId>
@@ -286,55 +288,55 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>apache-xerces</groupId>
         <artifactId>xml-apis</artifactId>
         <version>2.9.1</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.apache</groupId>
         <artifactId>xmlsec</artifactId>
         <version>1.4.2</version>
       </dependency>
-      
+
       <dependency>
         <groupId>bcel</groupId>
         <artifactId>bcel</artifactId>
         <version>5.1</version>
       </dependency>
-      
+
       <dependency>
         <groupId>bsf</groupId>
         <artifactId>bsf</artifactId>
         <version>2.4.0</version>
       </dependency>
-      
+
       <dependency>
         <groupId>cglib</groupId>
         <artifactId>cglib</artifactId>
         <version>2.1.3</version>
       </dependency>
-      
+
       <dependency>
         <groupId>commons-beanutils</groupId>
         <artifactId>commons-beanutils</artifactId>
         <version>1.7.0</version>
       </dependency>
-      
+
       <dependency>
         <groupId>commons-codec</groupId>
         <artifactId>commons-codec</artifactId>
         <version>1.3</version>
       </dependency>
-      
+
       <dependency>
         <groupId>commons-collections</groupId>
         <artifactId>commons-collections</artifactId>
         <version>3.1</version>
       </dependency>
-      
+
       <dependency>
         <groupId>commons-digester</groupId>
         <artifactId>commons-digester</artifactId>
@@ -346,31 +348,31 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>commons-el</groupId>
         <artifactId>commons-el</artifactId>
         <version>1.0</version>
       </dependency>
-      
+
       <dependency>
         <groupId>commons-fileupload</groupId>
         <artifactId>commons-fileupload</artifactId>
         <version>1.1.1</version>
       </dependency>
-      
+
       <dependency>
         <groupId>commons-lang</groupId>
         <artifactId>commons-lang</artifactId>
         <version>2.1</version>
       </dependency>
-      
+
       <dependency>
         <groupId>javax.faces</groupId>
         <artifactId>jsf-impl</artifactId>
         <version>${version.javax.faces}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>dom4j</groupId>
         <artifactId>dom4j</artifactId>
@@ -382,25 +384,25 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>org.easymock</groupId>
         <artifactId>easymock</artifactId>
         <version>2.4</version>
       </dependency>
-      
+
       <dependency>
         <groupId>gnu-getopt</groupId>
         <artifactId>getopt</artifactId>
         <version>1.0.12-brew</version>
       </dependency>
-      
+
       <dependency>
         <groupId>hsqldb</groupId>
         <artifactId>hsqldb</artifactId>
         <version>1.8.0.8-brew</version>
       </dependency>
-      
+
       <dependency>
         <groupId>httpunit</groupId>
         <artifactId>httpunit</artifactId>
@@ -412,97 +414,97 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>jacorb</groupId>
         <artifactId>idl</artifactId>
         <version>${version.jacorb}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>jacorb</groupId>
         <artifactId>idl_g</artifactId>
         <version>${version.jacorb}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>jacorb</groupId>
         <artifactId>jacorb</artifactId>
         <version>${version.jacorb}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>jacorb</groupId>
         <artifactId>jacorb_g</artifactId>
         <version>${version.jacorb}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>jacorb</groupId>
         <artifactId>resources</artifactId>
         <version>${version.jacorb}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>javax.faces</groupId>
         <artifactId>jsf-api</artifactId>
         <version>${version.javax.faces}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>jstl</artifactId>
         <version>1.2</version>
       </dependency>
-      
+
       <dependency>
         <groupId>sun-jaxb</groupId>
         <artifactId>jaxb-api</artifactId>
         <version>${version.sun.jaxb}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>sun-jaxb</groupId>
         <artifactId>jaxb-impl</artifactId>
         <version>${version.sun.jaxb}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>sun-jaxb</groupId>
         <artifactId>jaxb-xjc</artifactId>
         <version>${version.sun.jaxb}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>javax.security</groupId>
         <artifactId>jaas</artifactId>
         <version>1.0.01</version>
       </dependency>
-      
+
       <dependency>
         <groupId>javax.security</groupId>
         <artifactId>jacc</artifactId>
         <version>1.0</version>
       </dependency>
-      
+
       <dependency>
         <groupId>javax.transaction</groupId>
         <artifactId>jta</artifactId>
         <version>1.1</version>
       </dependency>
-      
+
       <dependency>
         <groupId>jaxen</groupId>
         <artifactId>jaxen</artifactId>
         <version>1.1-brew</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.aspects</groupId>
         <artifactId>jboss-current-invocation-aspects</artifactId>
         <version>${version.org.jboss.aspects.currentinvocation}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.aspects</groupId>
         <artifactId>jboss-remoting-aspects</artifactId>
@@ -514,7 +516,7 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.aspects</groupId>
         <artifactId>jboss-transaction-aspects</artifactId>
@@ -530,7 +532,7 @@
           </exclusion>
         </exclusions>
       </dependency>
-			
+
       <dependency>
         <groupId>org.jboss.aspects</groupId>
         <artifactId>jboss-security-aspects</artifactId>
@@ -548,19 +550,19 @@
         <artifactId>jboss-bootstrap</artifactId>
         <version>${version.org.jboss.bootstrap}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.logging</groupId>
         <artifactId>jboss-logging-spi</artifactId>
         <version>2.1.0.GA</version>
-      </dependency>  
-      
+      </dependency>
+
       <dependency>
         <groupId>org.jboss.logging</groupId>
         <artifactId>jboss-logging-jdk</artifactId>
         <version>2.1.0.GA</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.logging</groupId>
         <artifactId>jboss-logging-log4j</artifactId>
@@ -596,7 +598,7 @@
         <artifactId>jboss-j2ee</artifactId>
         <version>4.0.2</version>
       </dependency>
-      
+
       <dependency>
         <groupId>jboss</groupId>
         <artifactId>jboss-serialization</artifactId>
@@ -622,9 +624,9 @@
             <groupId>jboss</groupId>
             <artifactId>jboss-test</artifactId>
           </exclusion>
-        </exclusions>        
+        </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.aop</groupId>
         <artifactId>jboss-aop-asintegration-jmx</artifactId>
@@ -633,7 +635,7 @@
           <exclusion>
             <groupId>org.jboss.jbossas</groupId>
             <artifactId>jboss-as-system-jmx</artifactId>
-          </exclusion>        
+          </exclusion>
           <exclusion>
             <groupId>org.jboss.jbossas</groupId>
             <artifactId>jboss-as-j2se</artifactId>
@@ -641,10 +643,10 @@
           <exclusion>
             <groupId>org.jboss.jbossas</groupId>
             <artifactId>jboss-as-jmx</artifactId>
-          </exclusion>          
-        </exclusions>        
+          </exclusion>
+        </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.aop</groupId>
         <artifactId>jboss-aop-asintegration-mc</artifactId>
@@ -665,7 +667,7 @@
           <exclusion>
             <groupId>org.jboss.microcontainer</groupId>
             <artifactId>jboss-kernel</artifactId>
-          </exclusion>        
+          </exclusion>
           <exclusion>
             <groupId>org.jboss.microcontainer</groupId>
             <artifactId>jboss-aop-mc-int</artifactId>
@@ -673,23 +675,23 @@
           <exclusion>
             <groupId>org.jboss</groupId>
             <artifactId>jboss-vfs</artifactId>
-          </exclusion>          
-        </exclusions>        
+          </exclusion>
+        </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.aop</groupId>
         <artifactId>jboss-aop</artifactId>
         <version>${version.org.jboss.aop}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.aop</groupId>
         <artifactId>jboss-aop</artifactId>
         <version>${version.org.jboss.aop}</version>
         <classifier>client</classifier>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.aop</groupId>
         <artifactId>jboss-aop-aspects</artifactId>
@@ -705,25 +707,25 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.aop</groupId>
         <artifactId>jrockit-pluggable-instrumentor</artifactId>
         <version>${version.org.jboss.aop}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.aop</groupId>
         <artifactId>pluggable-instrumentor</artifactId>
         <version>${version.org.jboss.aop}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>jboss.jaxbintros</groupId>
         <artifactId>jboss-jaxb-intros</artifactId>
         <version>1.0.0.GA</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.jaxr</groupId>
         <artifactId>juddi-saaj</artifactId>
@@ -739,7 +741,7 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.jaxr</groupId>
         <artifactId>juddi-service</artifactId>
@@ -756,19 +758,19 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>jboss.jbossts</groupId>
         <artifactId>jbossjts</artifactId>
         <version>${version.jboss.jbossts}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>jboss.jbossts</groupId>
         <artifactId>jbossjts-integration</artifactId>
         <version>${version.jboss.jbossts}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>jboss.jbossts</groupId>
         <artifactId>jbossts-common</artifactId>
@@ -793,7 +795,7 @@
         <artifactId>resources</artifactId>
         <version>${version.jboss.jbossts}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>jboss.jbossts</groupId>
         <artifactId>jbossxts</artifactId>
@@ -806,14 +808,14 @@
         <artifactId>jbossws-native-client</artifactId>
         <version>${version.jboss.jbossws}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.ws.native</groupId>
         <artifactId>jbossws-native-management</artifactId>
         <version>${version.jboss.jbossws}</version>
         <type>war</type>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.ws.native</groupId>
         <artifactId>jbossws-native-core</artifactId>
@@ -845,13 +847,13 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.ws.native</groupId>
         <artifactId>jbossws-native-jaxrpc</artifactId>
         <version>${version.jboss.jbossws}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.ws.native</groupId>
         <artifactId>jbossws-native-jaxws</artifactId>
@@ -863,175 +865,229 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.ws.native</groupId>
         <artifactId>jbossws-native-jaxws-ext</artifactId>
         <version>${version.jboss.jbossws}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.ws.native</groupId>
         <artifactId>jbossws-native-saaj</artifactId>
         <version>${version.jboss.jbossws}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.ws.native</groupId>
         <artifactId>jbossws-native-resources</artifactId>
         <version>${version.jboss.jbossws}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.ws</groupId>
         <artifactId>jbossws-common</artifactId>
         <version>${version.jboss.jbossws-common}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.ws</groupId>
         <artifactId>jbossws-framework</artifactId>
         <version>${version.jboss.jbossws-framework}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>jboss.jms-integration-tests</groupId>
         <artifactId>integration-mdb20</artifactId>
         <version>${version.jboss.jms-integration-tests}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>jboss.jms-integration-tests</groupId>
         <artifactId>integration-mdb20-durable</artifactId>
         <version>${version.jboss.jms-integration-tests}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>jboss.jms-integration-tests</groupId>
         <artifactId>integration-mdb20-selector</artifactId>
         <version>${version.jboss.jms-integration-tests}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>jboss.jms-integration-tests</groupId>
         <artifactId>integration-mdb20-userTransaction</artifactId>
         <version>${version.jboss.jms-integration-tests}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>jboss.jms-integration-tests</groupId>
         <artifactId>integration-mdb20-userTransactionDups</artifactId>
         <version>${version.jboss.jms-integration-tests}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>jboss.jms-integration-tests</groupId>
         <artifactId>jms-integration-tests</artifactId>
         <version>${version.jboss.jms-integration-tests}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>jboss.messaging</groupId>
         <artifactId>jboss-messaging</artifactId>
         <version>${version.jboss.messaging}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>jboss.messaging</groupId>
         <artifactId>jboss-messaging-client</artifactId>
         <version>${version.jboss.messaging}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>jboss.messaging</groupId>
         <artifactId>resources</artifactId>
         <version>${version.jboss.messaging}</version>
       </dependency>
-      
+
       <dependency>
+        <groupId>org.jboss.messaging</groupId>
+        <artifactId>jbm-core-client</artifactId>
+        <version>${version.org.jboss.messaging}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.jboss.messaging</groupId>
+        <artifactId>jbm-core</artifactId>
+        <version>${version.org.jboss.messaging}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.jboss.messaging</groupId>
+        <artifactId>jbm-transports</artifactId>
+        <version>${version.org.jboss.messaging}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.jboss.messaging</groupId>
+        <artifactId>jbm-jms</artifactId>
+        <version>${version.org.jboss.messaging}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.jboss.messaging</groupId>
+        <artifactId>jbm-jms-client</artifactId>
+        <version>${version.org.jboss.messaging}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.jboss.messaging</groupId>
+        <artifactId>jbm-resources</artifactId>
+        <version>${version.org.jboss.messaging}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.jboss.messaging</groupId>
+        <artifactId>jbm-jboss-as-security</artifactId>
+        <version>${version.org.jboss.messaging}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.jboss.messaging</groupId>
+        <artifactId>jbm-ra</artifactId>
+        <version>${version.org.jboss.messaging}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.jboss.netty</groupId>
+        <artifactId>netty</artifactId>
+        <version>${version.org.jboss.netty}</version>
+      </dependency>
+
+      <dependency>
         <groupId>jboss.profiler.jvmti</groupId>
         <artifactId>jboss-profiler-jvmti</artifactId>
         <version>1.0.0.CR5</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.remoting</groupId>
         <artifactId>jboss-remoting</artifactId>
         <version>${version.org.jboss.remoting}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>jboss.web</groupId>
         <artifactId>el-api</artifactId>
         <version>${version.jboss.web}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>jboss.web</groupId>
         <artifactId>jasper-jdt</artifactId>
         <version>${version.jboss.web}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>jboss.web</groupId>
         <artifactId>jbossweb</artifactId>
         <version>${version.jboss.web}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>jboss.web</groupId>
         <artifactId>jsp-api</artifactId>
         <version>${version.jboss.web}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>jboss.web</groupId>
         <artifactId>servlet-api</artifactId>
         <version>${version.jboss.web}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>jfree</groupId>
         <artifactId>jfreechart</artifactId>
         <version>1.0.2</version>
       </dependency>
-      
+
       <dependency>
         <groupId>jfree</groupId>
         <artifactId>jcommon</artifactId>
         <version>1.0.2</version>
       </dependency>
-      
+
       <dependency>
         <groupId>jgroups</groupId>
         <artifactId>jgroups</artifactId>
         <version>${version.jgroups}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>joesnmp</groupId>
         <artifactId>joesnmp</artifactId>
         <version>0.3.4</version>
       </dependency>
-      
+
       <dependency>
         <groupId>jpl-pattern</groupId>
         <artifactId>jpl-pattern</artifactId>
         <version>1.0</version>
       </dependency>
-      
+
       <dependency>
         <groupId>jpl-util</groupId>
         <artifactId>jpl-util</artifactId>
         <version>1.0</version>
       </dependency>
-      
+
       <dependency>
         <groupId>juddi</groupId>
         <artifactId>juddi</artifactId>
         <version>0.9RC4</version>
       </dependency>
-      
+
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
@@ -1043,73 +1099,73 @@
         <version>${version.junit}</version>
         <scope>test</scope>
       </dependency>
-      
+
       <dependency>
         <groupId>log4j</groupId>
         <artifactId>log4j</artifactId>
         <version>1.2.14</version>
       </dependency>
-      
+
       <dependency>
         <groupId>nekohtml</groupId>
         <artifactId>nekohtml</artifactId>
         <version>0.9.1</version>
       </dependency>
-      
+
       <dependency>
         <groupId>net.java.dev.javacc</groupId>
         <artifactId>javacc</artifactId>
         <version>4.0</version>
       </dependency>
-      
+
       <dependency>
         <groupId>net.jcip</groupId>
         <artifactId>jcip-annotations</artifactId>
         <version>1.0</version>
       </dependency>
-      
+
       <dependency>
         <groupId>objectweb-joramtests</groupId>
         <artifactId>joramtests</artifactId>
         <version>1.5</version>
       </dependency>
-      
+
       <dependency>
         <groupId>odmg</groupId>
         <artifactId>odmg</artifactId>
         <version>3.0</version>
       </dependency>
-      
+
       <dependency>
         <groupId>opensaml</groupId>
         <artifactId>opensaml</artifactId>
         <version>1.1b</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.beanshell</groupId>
         <artifactId>bsh</artifactId>
         <version>1.3.0</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.codehaus.woodstox</groupId>
         <artifactId>wstx-lgpl</artifactId>
         <version>3.2.6</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
         <version>${version.org.slf4j}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.slf4j</groupId>
         <artifactId>slf4j-jboss-logging</artifactId>
         <version>1.0.2.GA</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-core</artifactId>
@@ -1153,7 +1209,7 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-annotations</artifactId>
@@ -1165,13 +1221,13 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-commons-annotations</artifactId>
         <version>${version.org.hibernate.commons.annotations}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-entitymanager</artifactId>
@@ -1183,13 +1239,13 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>ejb3-persistence</artifactId>
         <version>${version.org.hibernate.ejb3.persistence}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-validator</artifactId>
@@ -1201,45 +1257,45 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>javassist</groupId>
         <artifactId>javassist</artifactId>
         <version>3.9.0.GA</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss</groupId>
         <artifactId>jboss-common-core</artifactId>
         <version>${version.org.jboss.common.core}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.integration</groupId>
         <artifactId>jboss-classloading-spi</artifactId>
         <version>${version.org.jboss.integration}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.integration</groupId>
         <artifactId>jboss-corba-ots-spi</artifactId>
         <version>${version.org.jboss.integration}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.integration</groupId>
         <artifactId>jboss-deployment-spi</artifactId>
         <version>${version.org.jboss.integration}</version>
       </dependency>
-      
-      <!-- Combined integration jar.  Maybe this can be removed when we just use the 
+
+      <!-- Combined integration jar.  Maybe this can be removed when we just use the
         -  individual compoennts -->
       <dependency>
         <groupId>org.jboss.integration</groupId>
         <artifactId>jboss-integration</artifactId>
         <version>${version.org.jboss.integration}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.metadata</groupId>
         <artifactId>jboss-metadata</artifactId>
@@ -1251,19 +1307,19 @@
           </exclusion>
         </exclusions>
       </dependency>
- 
+
       <dependency>
         <groupId>org.jboss</groupId>
         <artifactId>jboss-reflect</artifactId>
         <version>${version.org.jboss.reflect}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss</groupId>
         <artifactId>jboss-mdr</artifactId>
         <version>${version.org.jboss.mdr}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.test</groupId>
         <artifactId>jboss-test</artifactId>
@@ -1275,7 +1331,7 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.jbossas</groupId>
         <artifactId>jboss-server-manager</artifactId>
@@ -1342,14 +1398,14 @@
             <artifactId>jboss-deployers-core-spi</artifactId>
           </exclusion>
         </exclusions>
-      </dependency>    
-      
+      </dependency>
+
       <dependency>
         <groupId>org.jboss.integration</groupId>
         <artifactId>jboss-transaction-spi</artifactId>
         <version>${version.org.jboss.integration}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss</groupId>
         <artifactId>jboss-vfs</artifactId>
@@ -1361,7 +1417,7 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss</groupId>
         <artifactId>jbossxb</artifactId>
@@ -1377,31 +1433,31 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.ws</groupId>
         <artifactId>jbossws-spi</artifactId>
         <version>${version.jboss.jbossws-spi}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.naming</groupId>
         <artifactId>jnp-client</artifactId>
-        <version>${version.org.jboss.naming}</version>       
+        <version>${version.org.jboss.naming}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.naming</groupId>
         <artifactId>jnpserver</artifactId>
-        <version>${version.org.jboss.naming}</version>         
+        <version>${version.org.jboss.naming}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.cache</groupId>
         <artifactId>jbosscache-core</artifactId>
         <version>${version.org.jboss.cache.core}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.cache</groupId>
         <artifactId>jbosscache-pojo</artifactId>
@@ -1417,7 +1473,7 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.cl</groupId>
         <artifactId>jboss-classloader</artifactId>
@@ -1429,19 +1485,19 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.cl</groupId>
         <artifactId>jboss-classloading</artifactId>
         <version>${version.org.jboss.cl}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.cl</groupId>
         <artifactId>jboss-classloading-vfs</artifactId>
         <version>${version.org.jboss.cl}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.cluster</groupId>
         <artifactId>jboss-ha-client</artifactId>
@@ -1449,19 +1505,19 @@
         <exclusions>
           <exclusion>
             <groupId>org.jboss.aspects</groupId>
-            <artifactId>jboss-remoting-aspects</artifactId>            
+            <artifactId>jboss-remoting-aspects</artifactId>
           </exclusion>
           <exclusion>
             <groupId>jboss.remoting</groupId>
-            <artifactId>jboss-remoting</artifactId>            
+            <artifactId>jboss-remoting</artifactId>
           </exclusion>
           <exclusion>
             <groupId>org.jboss.aop</groupId>
-            <artifactId>jboss-aop</artifactId>            
+            <artifactId>jboss-aop</artifactId>
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.cluster</groupId>
         <artifactId>jboss-ha-server-api</artifactId>
@@ -1469,27 +1525,27 @@
         <exclusions>
           <exclusion>
             <groupId>org.jboss</groupId>
-            <artifactId>jboss-common-core</artifactId>            
+            <artifactId>jboss-common-core</artifactId>
           </exclusion>
           <exclusion>
             <groupId>org.jboss.logging</groupId>
-            <artifactId>jboss-logging-spi</artifactId>            
+            <artifactId>jboss-logging-spi</artifactId>
           </exclusion>
           <exclusion>
             <groupId>org.jboss.cache</groupId>
-            <artifactId>jbosscache-core</artifactId>            
+            <artifactId>jbosscache-core</artifactId>
           </exclusion>
           <exclusion>
             <groupId>org.jboss.cache</groupId>
-            <artifactId>jbosscache-pojo</artifactId>            
+            <artifactId>jbosscache-pojo</artifactId>
           </exclusion>
           <exclusion>
             <groupId>jgroups</groupId>
-            <artifactId>jgroups</artifactId>            
+            <artifactId>jgroups</artifactId>
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.cluster</groupId>
         <artifactId>jboss-ha-server-cache-spi</artifactId>
@@ -1497,15 +1553,15 @@
         <exclusions>
           <exclusion>
             <groupId>org.jboss.naming</groupId>
-            <artifactId>jnp-client</artifactId>            
+            <artifactId>jnp-client</artifactId>
           </exclusion>
           <exclusion>
             <groupId>jboss</groupId>
-            <artifactId>jboss-serialization</artifactId>            
+            <artifactId>jboss-serialization</artifactId>
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.cluster</groupId>
         <artifactId>jboss-ha-server-cache-jbc</artifactId>
@@ -1513,59 +1569,59 @@
         <exclusions>
           <exclusion>
             <groupId>org.jboss</groupId>
-            <artifactId>jboss-common-core</artifactId>            
+            <artifactId>jboss-common-core</artifactId>
           </exclusion>
           <exclusion>
             <groupId>org.jboss.logging</groupId>
-            <artifactId>jboss-logging-spi</artifactId>            
+            <artifactId>jboss-logging-spi</artifactId>
           </exclusion>
           <exclusion>
             <groupId>org.jboss.cache</groupId>
-            <artifactId>jbosscache-core</artifactId>            
+            <artifactId>jbosscache-core</artifactId>
           </exclusion>
           <exclusion>
             <groupId>org.jboss.cache</groupId>
-            <artifactId>jbosscache-pojo</artifactId>            
+            <artifactId>jbosscache-pojo</artifactId>
           </exclusion>
           <exclusion>
             <groupId>jgroups</groupId>
-            <artifactId>jgroups</artifactId>            
+            <artifactId>jgroups</artifactId>
           </exclusion>
           <exclusion>
             <groupId>org.jboss.naming</groupId>
-            <artifactId>jnp-client</artifactId>            
+            <artifactId>jnp-client</artifactId>
           </exclusion>
           <exclusion>
             <groupId>javax.transaction</groupId>
-            <artifactId>jta</artifactId>            
+            <artifactId>jta</artifactId>
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.deployers</groupId>
         <artifactId>jboss-deployers-client</artifactId>
         <version>${version.org.jboss.deployers}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.deployers</groupId>
         <artifactId>jboss-deployers-client-spi</artifactId>
         <version>${version.org.jboss.deployers}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.deployers</groupId>
         <artifactId>jboss-deployers-core</artifactId>
         <version>${version.org.jboss.deployers}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.deployers</groupId>
         <artifactId>jboss-deployers-core-spi</artifactId>
         <version>${version.org.jboss.deployers}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.deployers</groupId>
         <artifactId>jboss-deployers-impl</artifactId>
@@ -1577,25 +1633,25 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.deployers</groupId>
         <artifactId>jboss-deployers-spi</artifactId>
         <version>${version.org.jboss.deployers}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.deployers</groupId>
         <artifactId>jboss-deployers-structure-spi</artifactId>
         <version>${version.org.jboss.deployers}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.deployers</groupId>
         <artifactId>jboss-deployers-vfs</artifactId>
         <version>${version.org.jboss.deployers}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.deployers</groupId>
         <artifactId>jboss-deployers-vfs-spi</artifactId>
@@ -1608,7 +1664,7 @@
         <version>${version.org.jboss.ejb3.common.client}</version>
         <classifier>client</classifier>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.ejb3</groupId>
         <artifactId>jboss-ejb3-as-int</artifactId>
@@ -1620,7 +1676,7 @@
           </exclusion>
           <exclusion>
             <groupId>org.jboss</groupId>
-            <artifactId>jboss-metadata</artifactId>            
+            <artifactId>jboss-metadata</artifactId>
           </exclusion>
           <exclusion>
             <groupId>org.jboss.aop</groupId>
@@ -1652,7 +1708,7 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.ejb3</groupId>
         <artifactId>jboss-ejb3-core</artifactId>
@@ -1670,7 +1726,7 @@
           <exclusion>
             <groupId>jboss</groupId>
             <artifactId>jboss-test</artifactId>
-          </exclusion>          
+          </exclusion>
           <exclusion>
             <groupId>org.jboss.aop</groupId>
             <artifactId>jboss-aop</artifactId>
@@ -1686,14 +1742,14 @@
           <exclusion>
             <groupId>org.jboss.microcontainer</groupId>
             <artifactId>jboss-deployers-core-spi</artifactId>
-          </exclusion>          
+          </exclusion>
           <exclusion>
             <groupId>org.jboss.javaee</groupId>
             <artifactId>jboss-servlet-api</artifactId>
           </exclusion>
         </exclusions>
       </dependency>
-    
+
       <dependency>
         <groupId>org.jboss.ejb3</groupId>
         <artifactId>jboss-ejb3-endpoint-deployer</artifactId>
@@ -1719,7 +1775,7 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.ejb3</groupId>
         <artifactId>jboss-ejb3-proxy-impl</artifactId>
@@ -1733,14 +1789,14 @@
         <version>${version.org.jboss.ejb3.proxy.spi.client}</version>
         <classifier>client</classifier>
       </dependency>
-    
+
       <dependency>
         <groupId>org.jboss.ejb3</groupId>
         <artifactId>jboss-ejb3-proxy-clustered</artifactId>
         <version>${version.org.jboss.ejb3.proxy.clustered.client}</version>
         <classifier>client</classifier>
       </dependency>
- 
+
       <dependency>
         <groupId>org.jboss.ejb3</groupId>
         <artifactId>jboss-ejb3-security</artifactId>
@@ -1757,43 +1813,43 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.javaee</groupId>
         <artifactId>jboss-javaee</artifactId>
         <version>5.0.1${version.suffix.org.jboss.javaee}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.javaee</groupId>
         <artifactId>jboss-ejb-api</artifactId>
         <version>3.0.0${version.suffix.org.jboss.javaee}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.javaee</groupId>
         <artifactId>jboss-jacc-api</artifactId>
         <version>1.1.0${version.suffix.org.jboss.javaee}_SP1</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.javaee</groupId>
         <artifactId>jboss-jad-api</artifactId>
         <version>1.2.0${version.suffix.org.jboss.javaee}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.javaee</groupId>
         <artifactId>jboss-jaspi-api</artifactId>
         <version>1.0.0${version.suffix.org.jboss.javaee}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.javaee</groupId>
         <artifactId>jboss-jca-api</artifactId>
         <version>1.5.0${version.suffix.org.jboss.javaee}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.javaee</groupId>
         <artifactId>jboss-jms-api</artifactId>
@@ -1805,7 +1861,7 @@
         <artifactId>jboss-transaction-api</artifactId>
         <version>1.0.1${version.suffix.org.jboss.javaee}</version>
       </dependency>
-      
+
       <!-- Normally comes in via EJB3, but we may need a patched one -->
       <dependency>
         <groupId>org.jboss.jpa</groupId>
@@ -1818,13 +1874,13 @@
         <artifactId>jboss-managed</artifactId>
         <version>${version.org.jboss.man}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.man</groupId>
         <artifactId>jboss-metatype</artifactId>
         <version>${version.org.jboss.man}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.microcontainer</groupId>
         <artifactId>jboss-aop-mc-int</artifactId>
@@ -1844,13 +1900,13 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.microcontainer</groupId>
         <artifactId>jboss-dependency</artifactId>
         <version>${version.org.jboss.microcontainer}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.microcontainer</groupId>
         <artifactId>jboss-kernel</artifactId>
@@ -1862,7 +1918,7 @@
         <artifactId>jboss-profileservice-spi</artifactId>
         <version>${version.org.jboss.integration}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.jopr</groupId>
         <artifactId>jopr-embedded-jbas5</artifactId>
@@ -1875,7 +1931,7 @@
         <artifactId>jbosssx</artifactId>
         <version>${version.org.jboss.security}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.security</groupId>
         <artifactId>jboss-negotiation</artifactId>
@@ -1917,121 +1973,121 @@
         <artifactId>jbosssx-client</artifactId>
         <version>${version.org.jboss.security}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.security</groupId>
         <artifactId>jboss-security-spi</artifactId>
         <version>${version.org.jboss.security}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.osgi</groupId>
         <artifactId>osgi_R4_compendium</artifactId>
         <version>1.0</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.osgi</groupId>
         <artifactId>osgi_R4_core</artifactId>
         <version>1.0</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-aop</artifactId>
         <version>${version.org.springframework}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-beans</artifactId>
         <version>${version.org.springframework}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-context</artifactId>
         <version>${version.org.springframework}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-core</artifactId>
         <version>${version.org.springframework}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-web</artifactId>
         <version>${version.org.springframework}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-webmvc</artifactId>
         <version>${version.org.springframework}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>oswego-concurrent</groupId>
         <artifactId>concurrent</artifactId>
         <version>${version.oswego-concurrent.concurrent}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>qdox</groupId>
         <artifactId>qdox</artifactId>
         <version>1.6.1</version>
       </dependency>
-      
+
       <dependency>
         <groupId>quartz</groupId>
         <artifactId>quartz</artifactId>
         <version>1.5.2</version>
       </dependency>
-      
+
       <dependency>
         <groupId>sleepycat</groupId>
         <artifactId>je</artifactId>
         <version>3.0.12</version>
       </dependency>
-      
+
       <dependency>
         <groupId>snmptrapappender</groupId>
         <artifactId>snmpTrapAppender</artifactId>
         <version>1.2.8</version>
       </dependency>
-      
+
       <dependency>
         <groupId>stax</groupId>
         <artifactId>stax-api</artifactId>
         <version>1.0</version>
       </dependency>
-      
+
       <dependency>
         <groupId>sun-fi</groupId>
         <artifactId>FastInfoset</artifactId>
         <version>1.2.2</version>
       </dependency>
-      
+
       <dependency>
         <groupId>sun-fi</groupId>
         <artifactId>FastInfosetUtilities</artifactId>
         <version>1.2.2</version>
       </dependency>
-      
+
       <dependency>
         <groupId>javax.activation</groupId>
         <artifactId>activation</artifactId>
         <version>1.1</version>
       </dependency>
-      
+
       <dependency>
         <groupId>javax.mail</groupId>
         <artifactId>mail</artifactId>
         <version>1.4</version>
       </dependency>
-      
+
       <dependency>
         <groupId>sun-jaxws</groupId>
         <artifactId>jaxws-rt</artifactId>
@@ -2054,8 +2110,8 @@
         <groupId>sun-jaxws</groupId>
         <artifactId>streambuffer</artifactId>
         <version>${version.streambuffer}</version>
-      </dependency>    
-      
+      </dependency>
+
       <dependency>
         <groupId>org.jboss.security</groupId>
         <artifactId>jbossxacml</artifactId>
@@ -2067,91 +2123,91 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>trove</groupId>
         <artifactId>trove</artifactId>
         <version>1.0.2</version>
       </dependency>
-      
+
       <dependency>
         <groupId>wsdl4j</groupId>
         <artifactId>wsdl4j</artifactId>
         <version>1.6.1</version>
       </dependency>
-      
+
       <dependency>
         <groupId>wscommons-policy</groupId>
         <artifactId>policy</artifactId>
         <version>1.0</version>
       </dependency>
-      
+
       <dependency>
         <groupId>wutka-dtdparser</groupId>
         <artifactId>dtdparser</artifactId>
         <version>1.21-brew</version>
       </dependency>
-      
+
       <dependency>
         <groupId>xdoclet</groupId>
         <artifactId>xdoclet</artifactId>
         <version>${version.xdoclet}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>xdoclet</groupId>
         <artifactId>xdoclet-ejb-module</artifactId>
         <version>${version.xdoclet}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>xdoclet</groupId>
         <artifactId>xdoclet-hibernate-module</artifactId>
         <version>${version.xdoclet}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>xdoclet</groupId>
         <artifactId>xdoclet-java-module</artifactId>
         <version>${version.xdoclet}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>xdoclet</groupId>
         <artifactId>xdoclet-jboss-module</artifactId>
         <version>${version.xdoclet}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>xdoclet</groupId>
         <artifactId>xdoclet-jmx-module</artifactId>
         <version>${version.xdoclet}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>xdoclet</groupId>
         <artifactId>xdoclet-portlet-module</artifactId>
         <version>${version.xdoclet}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>xdoclet</groupId>
         <artifactId>xdoclet-web-module</artifactId>
         <version>${version.xdoclet}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>xdoclet</groupId>
         <artifactId>xdoclet-xdoclet-module</artifactId>
         <version>${version.xdoclet}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>xdoclet</groupId>
         <artifactId>xjavadoc</artifactId>
         <version>${version.xdoclet}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>xmlunit</groupId>
         <artifactId>xmlunit</artifactId>
@@ -2163,7 +2219,7 @@
   </dependencyManagement>
 
   <profiles>
-    
+
     <profile>
       <id>enforce</id>
       <activation>
@@ -2220,7 +2276,7 @@
         </plugins>
       </build>
     </profile>
-    
+
   </profiles>
-  
+
 </project>

Added: branches/JBPAPP_5_0_JBPAPP-2043/messaging2/build.xml
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-2043/messaging2/build.xml	                        (rev 0)
+++ branches/JBPAPP_5_0_JBPAPP-2043/messaging2/build.xml	2009-06-03 12:21:29 UTC (rev 89726)
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project [
+   <!ENTITY buildmagic SYSTEM "../tools/etc/buildmagic/buildmagic.ent">
+   <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent">
+   <!ENTITY modules SYSTEM "../tools/etc/buildmagic/modules.ent">
+   <!ENTITY targets SYSTEM "../tools/etc/buildmagic/targets.ent">
+]>
+
+<!-- ====================================================================== -->
+<!--                                                                        -->
+<!--  JBoss, the OpenSource J2EE webOS                                      -->
+<!--                                                                        -->
+<!--  Distributable under LGPL license.                                     -->
+<!--  See terms of license at http://www.gnu.org.                           -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<!-- $Id: build.xml 81998 2008-12-03 06:46:29Z scott.stark at jboss.org $ -->
+
+<project default="main" name="JBoss/Messaging 2 Integration">
+
+  <!-- ================================================================== -->
+  <!-- Setup                                                              -->
+  <!-- ================================================================== -->
+
+  <!--
+     | Include the common Buildmagic elements.
+     |
+     | This defines several different targets, properties and paths.
+     | It also sets up the basic extention tasks amoung other things.
+   -->
+
+    <property name="javac.target" value="1.5"/>
+    <property name="javac.source" value="1.5"/>
+
+	&buildmagic;
+
+  <!--
+     | Include the normal targets.
+   -->
+  &targets;
+
+  <!-- ================================================================== -->
+  <!-- Configuration                                                      -->
+  <!-- ================================================================== -->
+
+  <!--
+     | Configure the build system.
+     |
+     | This target is invoked by the Buildmagic initialization logic and
+     | should contain module specific configuration elements.
+   -->
+
+  <target name="configure" unless="configure.disable">
+
+    <!-- =================== -->
+    <!-- Basic Configuration -->
+    <!-- =================== -->
+    <property name="module.name" value="messagin2g"/>
+    <property name="module.Name" value="JBoss Messaging 2 Integration"/>
+
+    <!-- ========= -->
+    <!-- Libraries -->
+    <!-- ========= -->
+    &libraries;
+
+    <!-- ======= -->
+    <!-- Modules -->
+    <!-- ======= -->
+    &modules;
+    <call target="_default:task-init"/>
+  </target>
+
+  <!-- ================================================================== -->
+  <!-- Compile                                                            -->
+  <!-- ================================================================== -->
+
+  <!--
+     |  Compile everything.
+     |
+     |  This target should depend on other compile-* targets for each
+     |  different type of compile that needs to be performed, short of
+     |  documentation compiles.
+    -->
+  <target name="compile" depends="_default:compile-etc"
+	  description="Compile all source files."/>
+
+  <!-- ================================================================== -->
+  <!-- Archives                                                           -->
+  <!-- ================================================================== -->
+
+  <!--
+     |  Build all jar files.
+    -->
+  <target name="module-jars">
+     <property name="JBossMessaging2.dir" value="output/JBossMessaging2"/>
+     <copy todir="${JBossMessaging2.dir}">
+        <fileset dir="${org.jboss.messaging.lib}"/>
+        <fileset dir="${org.jboss.netty.lib}"/>
+        <fileset dir="output/etc">
+         <include name="*example-ant.properties"/>
+        </fileset>
+     </copy>
+     <unzip dest="output/etc" src="${JBossMessaging2.dir}/jbm-resources.jar"/>
+
+      <copy file="output/etc/javaee-example-ant.properties" tofile="output/etc/examples/javaee/common/config/ant.properties" overwrite="true"/>
+      <copy file="output/etc/jms-example-ant.properties" tofile="output/etc/examples/common/config/ant.properties" overwrite="true"/>
+  </target>
+
+  <target name="sar">
+  </target>
+</project>

Added: branches/JBPAPP_5_0_JBPAPP-2043/messaging2/pom.xml
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-2043/messaging2/pom.xml	                        (rev 0)
+++ branches/JBPAPP_5_0_JBPAPP-2043/messaging2/pom.xml	2009-06-03 12:21:29 UTC (rev 89726)
@@ -0,0 +1,27 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>org.jboss.jbossas</groupId>
+    <artifactId>jboss-as-parent</artifactId>
+    <version>5.1.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.jboss.jbossas</groupId>
+  <artifactId>jboss-as-messaging2</artifactId>
+  <packaging>jar</packaging>
+  <name>JBoss Application Server Messaging</name>
+  <url>http://www.jboss.org/jbossas</url>
+  <description>JBoss Application Server (messaging2 module)</description>
+  <build>
+    <sourceDirectory>src/main</sourceDirectory>
+    <resources>
+      <resource>
+        <directory>src/resources</directory>
+      </resource>
+    </resources>
+  </build>
+  <dependencies>
+    <!-- Compile (global dependencies) -->
+  </dependencies>
+  
+</project>
\ No newline at end of file

Added: branches/JBPAPP_5_0_JBPAPP-2043/messaging2/src/etc/javaee-example-ant.properties
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-2043/messaging2/src/etc/javaee-example-ant.properties	                        (rev 0)
+++ branches/JBPAPP_5_0_JBPAPP-2043/messaging2/src/etc/javaee-example-ant.properties	2009-06-03 12:21:29 UTC (rev 89726)
@@ -0,0 +1,5 @@
+jbm.example.logserveroutput=true
+jbm.jars.dir=${imported.basedir}/../../../../../JBossMessaging2
+jars.dir=${imported.basedir}/../../../../../server/lib
+client.jars.dir=${imported.basedir}/../../../../../JBossMessaging2
+aio.library.path=${imported.basedir}/../../native/bin

Added: branches/JBPAPP_5_0_JBPAPP-2043/messaging2/src/etc/jms-example-ant.properties
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-2043/messaging2/src/etc/jms-example-ant.properties	                        (rev 0)
+++ branches/JBPAPP_5_0_JBPAPP-2043/messaging2/src/etc/jms-example-ant.properties	2009-06-03 12:21:29 UTC (rev 89726)
@@ -0,0 +1,5 @@
+jbm.example.logserveroutput=true
+jbm.jars.dir=${imported.basedir}/../../../../JBossMessaging2
+jars.dir=${imported.basedir}/../../../../server/lib
+client.jars.dir=${imported.basedir}/../../../../JBossMessaging2
+aio.library.path=${imported.basedir}/../../native/bin

Modified: branches/JBPAPP_5_0_JBPAPP-2043/pom.xml
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-2043/pom.xml	2009-06-03 12:14:39 UTC (rev 89725)
+++ branches/JBPAPP_5_0_JBPAPP-2043/pom.xml	2009-06-03 12:21:29 UTC (rev 89726)
@@ -20,7 +20,7 @@
     <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/branches/Branch_5_x</developerConnection>
     <url>http://fisheye.jboss.org/browse/JBossAS</url>
   </scm>
-  
+
   <build>
 
     <pluginManagement>
@@ -99,10 +99,10 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-antrun-plugin</artifactId>
           <version>1.3</version>
-        </plugin>       
+        </plugin>
       </plugins>
     </pluginManagement>
-    
+
     <plugins>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
@@ -112,7 +112,7 @@
       </plugin>
     </plugins>
   </build>
-  
+
   <!-- Dependency Management -->
   <dependencyManagement>
     <dependencies>
@@ -248,7 +248,7 @@
         <groupId>org.jboss.jbossas</groupId>
         <artifactId>jboss-as-system</artifactId>
         <version>${project.version}</version>
-        <classifier>profileservice-spi</classifier> 
+        <classifier>profileservice-spi</classifier>
       </dependency>
       <dependency>
         <groupId>org.jboss.jbossas</groupId>
@@ -279,7 +279,7 @@
       </dependency>
     </dependencies>
   </dependencyManagement>
-  
+
   <!-- Repositories -->
   <repositories>
     <repository>
@@ -331,9 +331,9 @@
       </snapshots>
     </pluginRepository>
   </pluginRepositories>
-  
+
   <profiles>
-    
+
     <!-- By default build all modules -->
     <profile>
       <id>default-build</id>
@@ -356,6 +356,7 @@
         <module>jbossas</module>
         <module>jmx-remoting</module>
         <module>messaging</module>
+        <module>messaging2</module>
         <module>cluster</module>
         <module>varia</module>
         <module>iiop</module>
@@ -375,7 +376,7 @@
         <module>adminclient</module>
       </modules>
     </profile>
-    
+
     <!-- This profile is used by the ant/buildmagic build -->
     <profile>
       <id>integrated-build</id>
@@ -389,7 +390,7 @@
         <module>thirdparty</module>
       </modules>
     </profile>
-    
+
     <profile>
       <id>enforce</id>
       <activation>
@@ -416,7 +417,7 @@
                     </requireMavenVersion>
                     <requireJavaVersion>
                       <version>1.5</version>
-                    </requireJavaVersion>           
+                    </requireJavaVersion>
                   </rules>
                 </configuration>
               </execution>
@@ -435,7 +436,7 @@
                        <phases>clean,deploy,site</phases>
                     </requirePluginVersions>
                   </rules>
-                  <fail>false</fail>  
+                  <fail>false</fail>
                 </configuration>
               </execution>
             </executions>
@@ -443,7 +444,7 @@
         </plugins>
       </build>
     </profile>
-    
+
   </profiles>
-  
+
 </project>

Modified: branches/JBPAPP_5_0_JBPAPP-2043/thirdparty/pom.xml
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-2043/thirdparty/pom.xml	2009-06-03 12:14:39 UTC (rev 89725)
+++ branches/JBPAPP_5_0_JBPAPP-2043/thirdparty/pom.xml	2009-06-03 12:21:29 UTC (rev 89726)
@@ -342,7 +342,7 @@
                 <componentId>jboss.integration</componentId>
               </mapping>
             </dependency>
-            <!-- Combined integration jar.  Maybe this can be removed when we just use the 
+            <!-- Combined integration jar.  Maybe this can be removed when we just use the
             -  individual compoennts -->
             <dependency>
               <groupId>org.jboss.integration</groupId>
@@ -674,8 +674,8 @@
               <artifactId>jboss-negotiation</artifactId>
               <mapping>
                 <componentId>jboss.jboss-negotiation</componentId>
-              </mapping>              
-            </dependency>            
+              </mapping>
+            </dependency>
             <dependency>
               <groupId>org.jboss</groupId>
               <artifactId>jboss-vfs</artifactId>
@@ -830,7 +830,7 @@
               <mapping>
                 <componentId>jboss.server.manager</componentId>
               </mapping>
-            </dependency>            
+            </dependency>
             <dependency>
               <groupId>org.osgi</groupId>
               <artifactId>osgi_R4_compendium</artifactId>
@@ -912,7 +912,7 @@
               <groupId>sun-jaxws</groupId>
               <artifactId>jaxws-tools</artifactId>
               <exportArtifact>false</exportArtifact>
-            </dependency>            
+            </dependency>
             <dependency>
               <groupId>sun-jaxws</groupId>
               <artifactId>stax-ex</artifactId>
@@ -981,16 +981,16 @@
               </mapping>
             </dependency>
             <!-- End mapped dependecies -->
-            
+
           </mappedDependencies>
         </configuration>
       </plugin>
     </plugins>
   </build>
-  
+
   <!-- Project dependencies resolved by maven -->
   <dependencies>
-    
+
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-ant-tasks</artifactId>
@@ -1138,7 +1138,7 @@
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
     </dependency>
-    
+
     <!--<dependency>
     <groupId>gjt-jpl-util</groupId>
     <artifactId>jpl-util</artifactId>
@@ -1149,7 +1149,7 @@
     <artifactId>jpl-pattern</artifactId>
     <version>1.0.12-brew</version>
     </dependency>-->
-    
+
     <dependency>
       <groupId>gnu-getopt</groupId>
       <artifactId>getopt</artifactId>
@@ -1366,7 +1366,7 @@
     <dependency>
       <groupId>org.jboss.aspects</groupId>
       <artifactId>jboss-transaction-aspects</artifactId>
-    </dependency>   
+    </dependency>
     <dependency>
       <groupId>org.jboss.aspects</groupId>
       <artifactId>jboss-security-aspects</artifactId>
@@ -1375,9 +1375,9 @@
       <groupId>org.jboss.bootstrap</groupId>
       <artifactId>jboss-bootstrap</artifactId>
     </dependency>
- 
-    <!-- Combined integration jar.  Maybe this can be removed when we just use the 
-    -  individual compoennts -->    
+
+    <!-- Combined integration jar.  Maybe this can be removed when we just use the
+    -  individual compoennts -->
     <dependency>
       <groupId>org.jboss.integration</groupId>
       <artifactId>jboss-integration</artifactId>
@@ -1491,7 +1491,7 @@
       <groupId>org.jboss.cluster</groupId>
       <artifactId>jboss-ha-server-api</artifactId>
     </dependency>
-    
+
     <dependency>
       <groupId>org.jboss.javaee</groupId>
       <artifactId>jboss-javaee</artifactId>
@@ -1541,7 +1541,7 @@
       <groupId>org.jboss.security</groupId>
       <artifactId>jbosssx-client</artifactId>
     </dependency>
-    
+
     <dependency>
       <groupId>org.jboss</groupId>
       <artifactId>jboss-vfs</artifactId>
@@ -1622,6 +1622,42 @@
       <artifactId>resources</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.jboss.messaging</groupId>
+      <artifactId>jbm-core-client</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.messaging</groupId>
+      <artifactId>jbm-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.messaging</groupId>
+      <artifactId>jbm-transports</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.messaging</groupId>
+      <artifactId>jbm-jms</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.messaging</groupId>
+      <artifactId>jbm-jms-client</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.messaging</groupId>
+      <artifactId>jbm-resources</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.messaging</groupId>
+      <artifactId>jbm-jboss-as-security</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.messaging</groupId>
+      <artifactId>jbm-ra</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.netty</groupId>
+      <artifactId>netty</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.jboss.metadata</groupId>
       <artifactId>jboss-metadata</artifactId>
     </dependency>
@@ -1744,7 +1780,7 @@
     <dependency>
       <groupId>org.jboss.cluster</groupId>
       <artifactId>jboss-ha-server-api</artifactId>
-    </dependency>  
+    </dependency>
     <dependency>
       <groupId>org.jboss.cluster</groupId>
       <artifactId>jboss-ha-server-cache-spi</artifactId>
@@ -1752,7 +1788,7 @@
     <dependency>
       <groupId>org.jboss.cluster</groupId>
       <artifactId>jboss-ha-server-cache-jbc</artifactId>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>org.jboss.cluster</groupId>
       <artifactId>jboss-ha-client</artifactId>
@@ -1760,13 +1796,13 @@
     <dependency>
       <groupId>org.jboss.cluster</groupId>
       <artifactId>jboss-ha-server-api</artifactId>
-    </dependency> 
+    </dependency>
     <dependency>
       <groupId>jboss.web</groupId>
       <artifactId>jbossweb</artifactId>
     </dependency>
     <!-- end jboss deps -->
-    
+
     <dependency>
       <groupId>jfree</groupId>
       <artifactId>jfreechart</artifactId>
@@ -1820,7 +1856,7 @@
       <groupId>org.osgi</groupId>
       <artifactId>osgi_R4_core</artifactId>
     </dependency>
-    
+
     <dependency>
       <groupId>oswego-concurrent</groupId>
       <artifactId>concurrent</artifactId>
@@ -1861,7 +1897,7 @@
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
     </dependency>
-    
+
     <dependency>
       <groupId>sun-fi</groupId>
       <artifactId>FastInfoset</artifactId>
@@ -1878,7 +1914,7 @@
       <groupId>net.java.dev.javacc</groupId>
       <artifactId>javacc</artifactId>
     </dependency>
-    
+
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>jstl</artifactId>
@@ -1903,7 +1939,7 @@
       <groupId>jboss.jaxbintros</groupId>
       <artifactId>jboss-jaxb-intros</artifactId>
     </dependency>
-    
+
     <dependency>
       <groupId>javax.faces</groupId>
       <artifactId>jsf-impl</artifactId>
@@ -1915,11 +1951,11 @@
     <dependency>
       <groupId>sun-jaxws</groupId>
       <artifactId>jaxws-rt</artifactId>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>sun-jaxws</groupId>
       <artifactId>jaxws-tools</artifactId>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>sun-jaxws</groupId>
       <artifactId>stax-ex</artifactId>
@@ -1927,10 +1963,10 @@
     <dependency>
       <groupId>sun-jaxws</groupId>
       <artifactId>streambuffer</artifactId>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>org.jboss.security</groupId>
-      <artifactId>jboss-negotiation</artifactId>              
+      <artifactId>jboss-negotiation</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jboss.security</groupId>
@@ -2005,7 +2041,7 @@
       <artifactId>xmlunit</artifactId>
     </dependency>
   </dependencies>
-  
+
   <profiles>
     <profile>
       <id>download-sources</id>




More information about the jboss-cvs-commits mailing list