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

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

Author: clebert.suconic at jboss.com
Date: 2010-03-09 11:22:43 -0500 (Tue, 09 Mar 2010)
New Revision: 102143

Modified:
   branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/DestinationFactoryDeployerPlugin.java
   branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQJMSRealDeployer.java
   branches/Branch_Hornet_Temporary_2/hornetq-int/src/resources/hornetq-deployers-jboss-beans.xml
Log:
Adding some debug info

Modified: branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/DestinationFactoryDeployerPlugin.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/DestinationFactoryDeployerPlugin.java	2010-03-09 16:15:08 UTC (rev 102142)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/DestinationFactoryDeployerPlugin.java	2010-03-09 16:22:43 UTC (rev 102143)
@@ -113,10 +113,12 @@
 	   }
 
 	   // This is a hack, until I can figure out how to make the micro container to make the call for me
-	   HornetQJMSRealDeployer.staticDeploy(unit, config);
+	   //HornetQJMSRealDeployer.staticDeploy(unit, config);
 	   
       // Register the output
-      unit.getTransientManagedObjects().addAttachment(JMSConfiguration.class.getName(), config, JMSConfiguration.class);
+      //unit.getTransientManagedObjects().addAttachment(JMSConfiguration.class.getName(), config, JMSConfiguration.class);
+      
+      unit.addAttachment(JMSConfiguration.class, config);
 		
 		return true;
 	}

Modified: branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQJMSRealDeployer.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQJMSRealDeployer.java	2010-03-09 16:15:08 UTC (rev 102142)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQJMSRealDeployer.java	2010-03-09 16:22:43 UTC (rev 102143)
@@ -37,7 +37,11 @@
    public HornetQJMSRealDeployer()
    {
       super(JMSConfiguration.class);
+      log.info("Instantiating HornetQJMSRealDeployer");
+
+      // This is just to guarantee the order. The CoreDeployments should happen before
       addInput(HornetQCoreDeployment.class);
+
       addInput(JBossMetaData.class); // CreateDestinationDeployer has this as an output
       addOutput(BeanMetaData.class);
    }

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 16:15:08 UTC (rev 102142)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/resources/hornetq-deployers-jboss-beans.xml	2010-03-09 16:22:43 UTC (rev 102143)
@@ -18,9 +18,11 @@
    <bean name="HornetQJMSParserDeployer" class="org.jboss.as.integration.hornetq.deployers.HornetQJMSParserDeployer">
       <property name="mgtObjectCreator"><inject bean="HornetQManagedObjectCreator" /></property>
    </bean>
+
+   <bean name="HornetQJMSRealDeployer" class="org.jboss.as.integration.hornetq.deployers.HornetQJMSRealDeployer">
+       <demand>HornetQDestinationCreator</demand>
+   </bean>
    
-   <bean name="HornetQJMSRealDeployer" class="org.jboss.as.integration.hornetq.deployers.HornetQJMSRealDeployer"/>
-
    <!-- Destination creator for HornetQ
         This gets "automagically" injected into CreateDestinationDeployer Bean at ejb-deployer-jboss.xml through incallback and uncallback
     -->