[jboss-cvs] JBossAS SVN: r110236 - in branches/JBPAPP_5_1_0_Final_HornetQ_2_2: hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers and 1 other directory.

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

Author: clebert.suconic at jboss.com
Date: 2010-12-30 19:55:33 -0500 (Thu, 30 Dec 2010)
New Revision: 110236

Modified:
   branches/JBPAPP_5_1_0_Final_HornetQ_2_2/component-matrix/pom.xml
   branches/JBPAPP_5_1_0_Final_HornetQ_2_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/DeploymentFactory.java
   branches/JBPAPP_5_1_0_Final_HornetQ_2_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQCoreConfigRealDeployer.java
Log:
JBPAPP-5557 - fixing deployment order on HornetQ integration

Modified: branches/JBPAPP_5_1_0_Final_HornetQ_2_2/component-matrix/pom.xml
===================================================================
--- branches/JBPAPP_5_1_0_Final_HornetQ_2_2/component-matrix/pom.xml	2010-12-30 15:57:01 UTC (rev 110235)
+++ branches/JBPAPP_5_1_0_Final_HornetQ_2_2/component-matrix/pom.xml	2010-12-31 00:55:33 UTC (rev 110236)
@@ -41,7 +41,7 @@
     <version.jboss.jbossws>3.1.2.SP7</version.jboss.jbossws>
     <version.jboss.jms-integration-tests>1.0.1.GA</version.jboss.jms-integration-tests>
     <version.jboss.messaging>1.4.7.GA</version.jboss.messaging>
-    <version.hornetq>2.2.0.QA-10041</version.hornetq>
+    <version.hornetq>2.2.0.QA-10090</version.hornetq>
     <version.jboss.web>2.1.10.GA</version.jboss.web>
     <version.jgroups>2.6.16.GA</version.jgroups>
     <version.junit>3.8.2</version.junit>

Modified: branches/JBPAPP_5_1_0_Final_HornetQ_2_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/DeploymentFactory.java
===================================================================
--- branches/JBPAPP_5_1_0_Final_HornetQ_2_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/DeploymentFactory.java	2010-12-30 15:57:01 UTC (rev 110235)
+++ branches/JBPAPP_5_1_0_Final_HornetQ_2_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/DeploymentFactory.java	2010-12-31 00:55:33 UTC (rev 110236)
@@ -107,6 +107,8 @@
       
       builder.addPropertyMetaData("mbeanServer", builder.createInject("MBeanServer"));
       
+      builder.addDependency("HornetQ.main.config");
+      
       for (Map.Entry<String, Object> entry : unit.getAttachments().entrySet())
       {
          if (entry.getValue() instanceof BeanMetaData)

Modified: branches/JBPAPP_5_1_0_Final_HornetQ_2_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQCoreConfigRealDeployer.java
===================================================================
--- branches/JBPAPP_5_1_0_Final_HornetQ_2_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQCoreConfigRealDeployer.java	2010-12-30 15:57:01 UTC (rev 110235)
+++ branches/JBPAPP_5_1_0_Final_HornetQ_2_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQCoreConfigRealDeployer.java	2010-12-31 00:55:33 UTC (rev 110236)
@@ -72,11 +72,11 @@
     @Override
     public void deploy(DeploymentUnit unit, Configuration config) throws DeploymentException
     {
-       if (log.isTraceEnabled())
-       {
-          log.trace("Deploying unit: " + unit + " with config " + config);
-       }
-        String name = "HornetQCoreDeployment::" + idGenerator.incrementAndGet();
+        if (log.isTraceEnabled())
+        {
+           log.trace("Deploying unit: " + unit + " with config " + config);
+        }
+        String name = config.getName();
         
         BeanMetaDataBuilder builder = BeanMetaDataBuilderFactory.createBuilder(name, HornetQCoreDeployment.class.getName());