[jboss-cvs] JBossAS SVN: r84254 - in branches/Branch_5_x_JBM2: component-matrix and 1 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon Feb 16 10:24:46 EST 2009


Author: ataylor
Date: 2009-02-16 10:24:46 -0500 (Mon, 16 Feb 2009)
New Revision: 84254

Modified:
   branches/Branch_5_x_JBM2/build/build-distr.xml
   branches/Branch_5_x_JBM2/build/build.xml
   branches/Branch_5_x_JBM2/component-matrix/pom.xml
   branches/Branch_5_x_JBM2/thirdparty/pom.xml
Log:
messaging-2 updated poms and build files

Modified: branches/Branch_5_x_JBM2/build/build-distr.xml
===================================================================
--- branches/Branch_5_x_JBM2/build/build-distr.xml	2009-02-16 15:22:52 UTC (rev 84253)
+++ branches/Branch_5_x_JBM2/build/build-distr.xml	2009-02-16 15:24:46 UTC (rev 84254)
@@ -804,6 +804,40 @@
       </copy>
    </target>
 
+  <target name="_module-messaging-2-most">
+    <property name="_module.name" value="messaging-2" override="true"/>
+    <property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
+    <property name="messaging.sar" value="${install.messaging-2.deploy}/messaging.sar"/>
+    <!--
+           jboss-messaging-2 libraries, unscoped deployment, same for "all" and "default" configurations.
+     -->
+    <copy todir="${install.messaging-2.lib}" filtering="no">
+      <fileset dir="${jboss.messaging.lib}">
+        <include name="jbm-*"/>
+      </fileset>
+      <fileset dir="${org.jboss.netty.lib}">
+        <include name="netty.jar"/>
+      </fileset>
+      <fileset dir="${org.apache.mina.lib}">
+        <include name="mina-core.jar"/>
+      </fileset>
+    </copy>
+
+    <copy todir="${install.messaging-2.conf}" filtering="no" overwrite="true">
+      <fileset dir="${_module.output}/resources">
+        <include name="**/login-config.xml"/>
+      </fileset>
+    </copy>
+
+    <mkdir dir="${messaging.sar}"/>
+    <copy todir="${messaging.sar}" filtering="no">
+      <fileset dir="${_module.output}/resources">
+        <include name="jbm-*"/>
+        <exclude name="*cluster*"/>
+      </fileset>
+    </copy>
+  </target>
+
   <!-- ==== -->
   <!-- J2SE -->
   <!-- ==== -->

Modified: branches/Branch_5_x_JBM2/build/build.xml
===================================================================
--- branches/Branch_5_x_JBM2/build/build.xml	2009-02-16 15:22:52 UTC (rev 84253)
+++ branches/Branch_5_x_JBM2/build/build.xml	2009-02-16 15:24:46 UTC (rev 84254)
@@ -97,6 +97,7 @@
       <module name="management"/>
       <module name="mbeans"/>
       <module name="messaging"/>
+      <module name="messaging-2"/>
       <module name="jbossas/remoting"/>
       <module name="jmx-remoting"/>
       <module name="jbossas/jmx-remoting"/>
@@ -136,6 +137,7 @@
                           jmx-remoting,
                           jbossas/jmx-remoting,
                           messaging,
+                          messaging-2,
                           cluster,
                           varia,
                           iiop,
@@ -275,6 +277,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"/>
+
+    <property name="install.messaging-2" value="${install.server}/messaging-2"/>
+    <property name="install.messaging-2.lib" value="${install.messaging-2}/lib"/>
+    <property name="install.messaging-2.deploy" value="${install.messaging-2}/deploy"/>
+    <property name="install.messaging-2.conf" value="${install.messaging-2}/conf"/>
     
     <!-- libs shared by the server configurations -->
     <property name="install.common" value="${install.root}/common"/>
@@ -506,7 +513,18 @@
      <ant antfile="build-distr.xml" target="_module-messaging-all"/>
   </target>
 
+  <!--  =========  -->
+  <!-- Messaging-2 -->
+  <!--  =========  -->
 
+  <target name="_module-messaging-2-most">
+     <ant antfile="build-distr.xml" target="_module-messaging-2-most"/>
+  </target>
+
+  <target name="_module-messaging-2-all" depends="_module-messaging-2-most">
+     <ant antfile="build-distr.xml" target="_module-messaging-all"/>
+  </target>
+
   <!-- ==== -->
   <!-- J2SE -->
   <!-- ==== -->
@@ -881,6 +899,13 @@
         <include name="ear-deployer-jboss-beans.xml"/>
       </fileset>
     </copy>
+    <!--Build messaging-2 config manually-->
+    <copy todir="${install.messaging-2}">
+      <fileset dir="${install.default}">
+        <exclude name="**/messaging/**"/>
+        <exclude name="conf/login-config.xml"/>
+      </fileset>
+    </copy>
     
     <call target="jboss-all-client"/>
   </target>

Modified: branches/Branch_5_x_JBM2/component-matrix/pom.xml
===================================================================
--- branches/Branch_5_x_JBM2/component-matrix/pom.xml	2009-02-16 15:22:52 UTC (rev 84253)
+++ branches/Branch_5_x_JBM2/component-matrix/pom.xml	2009-02-16 15:24:46 UTC (rev 84254)
@@ -38,6 +38,8 @@
     <version.jboss.jbossws-framework>3.1.0.CR2</version.jboss.jbossws-framework>
     <version.jboss.jbossws-spi>1.1.0.CR1</version.jboss.jbossws-spi>
     <version.jboss.messaging>1.4.1.GA</version.jboss.messaging>
+    <version.jboss.messaging2>2.0.0.BETA1-SNAPSHOT</version.jboss.messaging2>
+    <version.org.jboss.netty>3.1.0.ALPHA2</version.org.jboss.netty>
     <version.jboss.web>2.1.2.CR1</version.jboss.web>
     <version.jgroups>2.6.8.CR1</version.jgroups>
     <version.org.hibernate>3.3.1.GA</version.org.hibernate>
@@ -142,7 +144,7 @@
   <!-- Dependency Management -->
   <dependencyManagement>
     <dependencies>
-    
+
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-ant-tasks</artifactId>
@@ -159,7 +161,7 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.seam.integration</groupId>
         <artifactId>jboss-seam-int-microcontainer</artifactId>
@@ -181,7 +183,7 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.webbeans.integration</groupId>
         <artifactId>webbeans-ri-int-deployer</artifactId>
@@ -200,103 +202,103 @@
         <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>
       </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>2.7.0.patch01-brew</version>
       </dependency>
-      
+
       <dependency>
         <groupId>apache-xalan</groupId>
         <artifactId>xalan</artifactId>
         <version>2.7.0.patch01-brew</version>
       </dependency>
-      
+
       <dependency>
         <groupId>apache-xerces</groupId>
         <artifactId>resolver</artifactId>
         <version>2.9.1</version>
       </dependency>
-      
+
       <dependency>
         <groupId>xerces</groupId>
         <artifactId>xercesImpl</artifactId>
@@ -308,55 +310,55 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>apache-xerces</groupId>
         <artifactId>xml-apis</artifactId>
         <version>2.9.1</version>
       </dependency>
-      
+
       <dependency>
         <groupId>xml-security</groupId>
         <artifactId>xmlsec</artifactId>
         <version>1.3.0</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>
@@ -368,37 +370,37 @@
           </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>com.sun</groupId>
         <artifactId>jsf-impl</artifactId>
         <version>1.2_10</version>
       </dependency>
-      
+
       <dependency>
         <groupId>com.sun.facelets</groupId>
         <artifactId>jsf-facelets</artifactId>
         <version>1.1.15.B1</version>
       </dependency>
-      
+
       <dependency>
         <groupId>dom4j</groupId>
         <artifactId>dom4j</artifactId>
@@ -410,31 +412,31 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>easymock</groupId>
         <artifactId>easymock</artifactId>
         <version>1.1</version>
       </dependency>
-      
+
       <dependency>
         <groupId>easymock</groupId>
         <artifactId>easymockclassextension</artifactId>
         <version>1.1</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>
@@ -446,97 +448,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>1.2_10</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>
@@ -548,7 +550,7 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.aspects</groupId>
         <artifactId>jboss-transaction-aspects</artifactId>
@@ -564,7 +566,7 @@
           </exclusion>
         </exclusions>
       </dependency>
-			
+
       <dependency>
         <groupId>org.jboss.aspects</groupId>
         <artifactId>jboss-security-aspects</artifactId>
@@ -576,19 +578,19 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.logging</groupId>
         <artifactId>jboss-logging-spi</artifactId>
         <version>2.0.5.GA</version>
-      </dependency>  
-      
+      </dependency>
+
       <dependency>
         <groupId>org.jboss.logging</groupId>
         <artifactId>jboss-logging-jdk</artifactId>
         <version>2.0.5.GA</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.logging</groupId>
         <artifactId>jboss-logging-log4j</artifactId>
@@ -600,13 +602,13 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>jboss</groupId>
         <artifactId>jboss-j2ee</artifactId>
         <version>4.0.2</version>
       </dependency>
-      
+
       <dependency>
         <groupId>jboss</groupId>
         <artifactId>jboss-serialization</artifactId>
@@ -632,9 +634,9 @@
             <groupId>jboss</groupId>
             <artifactId>jboss-test</artifactId>
           </exclusion>
-        </exclusions>        
+        </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.aop</groupId>
         <artifactId>jboss-aop-asintegration-jmx</artifactId>
@@ -643,7 +645,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>
@@ -651,10 +653,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>
@@ -666,20 +668,20 @@
           </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>
@@ -695,25 +697,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>
@@ -729,7 +731,7 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.jaxr</groupId>
         <artifactId>juddi-service</artifactId>
@@ -746,19 +748,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>
@@ -783,7 +785,7 @@
         <artifactId>resources</artifactId>
         <version>${version.jboss.jbossts}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>jboss.jbossts</groupId>
         <artifactId>jbossxts</artifactId>
@@ -796,14 +798,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>
@@ -835,13 +837,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>
@@ -853,175 +855,217 @@
           </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>jboss.messaging</groupId>
+        <artifactId>jbm-core</artifactId>
+        <version>${version.jboss.messaging2}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>jboss.messaging</groupId>
+        <artifactId>jbm-transports</artifactId>
+        <version>${version.jboss.messaging2}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>jboss.messaging</groupId>
+        <artifactId>jbm-jbossas-security</artifactId>
+        <version>${version.jboss.messaging2}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>jboss.messaging</groupId>
+        <artifactId>jbm-jms</artifactId>
+        <version>${version.jboss.messaging2}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>jboss.messaging</groupId>
+        <artifactId>jbm-logging</artifactId>
+        <version>${version.jboss.messaging2}</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>org.apache.mina</groupId>
+        <artifactId>mina-core</artifactId>
+        <version>2.0.0-M4</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>
@@ -1033,73 +1077,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>1.5.0</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.slf4j</groupId>
         <artifactId>slf4j-jboss-logging</artifactId>
         <version>1.0.0.GA</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-core</artifactId>
@@ -1143,7 +1187,7 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-annotations</artifactId>
@@ -1155,13 +1199,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>
@@ -1173,13 +1217,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>
@@ -1191,37 +1235,37 @@
           </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 
         -  individual compoennts -->
       <dependency>
@@ -1229,7 +1273,7 @@
         <artifactId>jboss-integration</artifactId>
         <version>${version.org.jboss.integration}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.metadata</groupId>
         <artifactId>jboss-metadata</artifactId>
@@ -1241,19 +1285,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>
@@ -1265,7 +1309,7 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.jbossas</groupId>
         <artifactId>jboss-server-manager</artifactId>
@@ -1332,14 +1376,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>
@@ -1351,7 +1395,7 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss</groupId>
         <artifactId>jbossxb</artifactId>
@@ -1367,31 +1411,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>
@@ -1407,7 +1451,7 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.cl</groupId>
         <artifactId>jboss-classloader</artifactId>
@@ -1419,19 +1463,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>
@@ -1439,19 +1483,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>
@@ -1459,27 +1503,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>
@@ -1487,15 +1531,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>
@@ -1503,59 +1547,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>
@@ -1567,25 +1611,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>
@@ -1598,7 +1642,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>
@@ -1610,7 +1654,7 @@
           </exclusion>
           <exclusion>
             <groupId>org.jboss</groupId>
-            <artifactId>jboss-metadata</artifactId>            
+            <artifactId>jboss-metadata</artifactId>
           </exclusion>
           <exclusion>
             <groupId>org.jboss.aop</groupId>
@@ -1642,7 +1686,7 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.ejb3</groupId>
         <artifactId>jboss-ejb3-core</artifactId>
@@ -1660,7 +1704,7 @@
           <exclusion>
             <groupId>jboss</groupId>
             <artifactId>jboss-test</artifactId>
-          </exclusion>          
+          </exclusion>
           <exclusion>
             <groupId>org.jboss.aop</groupId>
             <artifactId>jboss-aop</artifactId>
@@ -1676,28 +1720,28 @@
           <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-proxy</artifactId>
         <version>${version.org.jboss.ejb3.proxy.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>
@@ -1714,43 +1758,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>
@@ -1762,7 +1806,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>
@@ -1775,13 +1819,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>
@@ -1801,13 +1845,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>
@@ -1825,127 +1869,127 @@
         <artifactId>jbosssx</artifactId>
         <version>${version.org.jboss.security}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.security</groupId>
         <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>
@@ -1968,14 +2012,14 @@
         <groupId>sun-jaxws</groupId>
         <artifactId>streambuffer</artifactId>
         <version>${version.streambuffer}</version>
-      </dependency>    
-      
+      </dependency>
+
       <dependency>
         <groupId>org.jboss.security</groupId>
         <artifactId>jboss-sunxacml</artifactId>
         <version>2.0.2.SP1</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.security</groupId>
         <artifactId>jboss-xacml</artifactId>
@@ -1987,91 +2031,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>

Modified: branches/Branch_5_x_JBM2/thirdparty/pom.xml
===================================================================
--- branches/Branch_5_x_JBM2/thirdparty/pom.xml	2009-02-16 15:22:52 UTC (rev 84253)
+++ branches/Branch_5_x_JBM2/thirdparty/pom.xml	2009-02-16 15:24:46 UTC (rev 84254)
@@ -1533,6 +1533,30 @@
     </dependency>
     <dependency>
       <groupId>jboss.messaging</groupId>
+      <artifactId>jbm-core</artifactId>
+    </dependency>
+     <dependency>
+      <groupId>jboss.messaging</groupId>
+      <artifactId>jbm-transports</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jboss.messaging</groupId>
+      <artifactId>jbm-logging</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jboss.messaging</groupId>
+      <artifactId>jbm-jbossas-security</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jboss.messaging</groupId>
+      <artifactId>jbm-jms</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.netty</groupId>
+      <artifactId>netty</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jboss.messaging</groupId>
       <artifactId>resources</artifactId>
     </dependency>
     <dependency>
@@ -1660,8 +1684,12 @@
       <artifactId>jbossweb</artifactId>
     </dependency>
     <!-- end jboss deps -->
-    
+
     <dependency>
+      <groupId>org.apache.mina</groupId>
+      <artifactId>mina-core</artifactId>
+    </dependency>
+    <dependency>
       <groupId>jfree</groupId>
       <artifactId>jfreechart</artifactId>
     </dependency>




More information about the jboss-cvs-commits mailing list