[jboss-cvs] JBossAS SVN: r102128 - in branches/Branch_Hornet_Temporary_2/hornetq-int/src: resources and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2010-03-09 09:16:03 -0500 (Tue, 09 Mar 2010)
New Revision: 102128

Modified:
   branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQConfigMultiParserDeployer.java
   branches/Branch_Hornet_Temporary_2/hornetq-int/src/resources/hornetq-deployers-jboss-beans.xml
Log:
Use multi parser.

Modified: branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQConfigMultiParserDeployer.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQConfigMultiParserDeployer.java	2010-03-09 12:25:24 UTC (rev 102127)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQConfigMultiParserDeployer.java	2010-03-09 14:16:03 UTC (rev 102128)
@@ -84,7 +84,7 @@
       {
          for (int i = 0; i < instances.size(); i++)
          {
-            unit.getTransientManagedObjects().addAttachment(Configuration.class.getName() + "#" + i, instances.get(i));
+            unit.getTransientManagedObjects().addAttachment(Configuration.class.getName() + "#" + (i + 1), instances.get(i));
          }
          return null;
       }

Modified: branches/Branch_Hornet_Temporary_2/hornetq-int/src/resources/hornetq-deployers-jboss-beans.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/src/resources/hornetq-deployers-jboss-beans.xml	2010-03-09 12:25:24 UTC (rev 102127)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/resources/hornetq-deployers-jboss-beans.xml	2010-03-09 14:16:03 UTC (rev 102128)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
-   <bean name="HornetQConfigParserDeployerFile1" class="org.jboss.as.integration.hornetq.deployers.HornetQConfigParserDeployer">
+
+   <bean name="HornetQConfigParserDeployerFile" class="org.jboss.as.integration.hornetq.deployers.HornetQConfigMultiParserDeployer">
         <constructor>
-         <parameter>hornetq-configuration.xml</parameter>
+         <parameter>
+             <set elementClass="java.lang.String">
+                <value>hornetq-configuration.xml</value>
+                <value>hornetq-queues.xml</value>
+             </set>
+         </parameter>
       </constructor>
    </bean>
 
-   <bean name="HornetQConfigParserDeployerFile2" class="org.jboss.as.integration.hornetq.deployers.HornetQConfigParserDeployer">
-        <constructor>
-         <parameter>hornetq-queues.xml</parameter>
-      </constructor>
-   </bean>
-   
    <bean name="HornetQCoreConfigRealDeployer" class="org.jboss.as.integration.hornetq.deployers.HornetQCoreConfigRealDeployer"/>
 
    <bean name="HornetQJMSParserDeployer" class="org.jboss.as.integration.hornetq.deployers.HornetQJMSParserDeployer">