[jboss-cvs] JBossAS SVN: r102147 - branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers.

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

Author: clebert.suconic at jboss.com
Date: 2010-03-09 12:13:42 -0500 (Tue, 09 Mar 2010)
New Revision: 102147

Removed:
   branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQConfigParserDeployer.java
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/HornetQConfigMultiParserDeployer.java
   branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQCoreConfigRealDeployer.java
   branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQJMSRealDeployer.java
Log:
Changes on the deployers

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:56:18 UTC (rev 102146)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/DestinationFactoryDeployerPlugin.java	2010-03-09 17:13:42 UTC (rev 102147)
@@ -111,12 +111,6 @@
 	   {
 	      log.warn(e.getMessage(), e);
 	   }
-
-	   // 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);
-	   
-      // Register the output
-      //unit.getTransientManagedObjects().addAttachment(JMSConfiguration.class.getName(), config, JMSConfiguration.class);
       
       unit.addAttachment(JMSConfiguration.class, config);
 		

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 16:56:18 UTC (rev 102146)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQConfigMultiParserDeployer.java	2010-03-09 17:13:42 UTC (rev 102147)
@@ -57,7 +57,8 @@
       try
       {
          Configuration config = parser.parseMainConfig(deploymentStream);
-         log.debug("Main Config = " + config);
+         // TODO: this should be log.debug after merge
+         log.info("Main Config = " + config);
          return config;
       }
       finally

Deleted: branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQConfigParserDeployer.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQConfigParserDeployer.java	2010-03-09 16:56:18 UTC (rev 102146)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQConfigParserDeployer.java	2010-03-09 17:13:42 UTC (rev 102147)
@@ -1,62 +0,0 @@
-package org.jboss.as.integration.hornetq.deployers;
-
-import java.io.InputStream;
-
-import org.hornetq.core.config.Configuration;
-import org.hornetq.core.deployers.impl.FileConfigurationParser;
-import org.jboss.deployers.vfs.spi.deployer.AbstractVFSParsingDeployer;
-import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.logging.Logger;
-import org.jboss.virtual.VirtualFile;
-
-/**
- * This Deployer will take a hornetq-configuration.xml parse the Configuration
- * and attach the Configuration output into the deployment unit. Another
- * deployer that takes Configuration as an input will then take over and install
- * the queues at the proper places.
- * 
- * @see HornetQJMSRealDeployer
- * 
- * @author <mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
- * 
- */
-public class HornetQConfigParserDeployer extends AbstractVFSParsingDeployer<Configuration>
-{
-
-   private static final Logger log = Logger.getLogger(HornetQConfigParserDeployer.class);
-
-   private final FileConfigurationParser parser;
-
-   public HornetQConfigParserDeployer(final String name)
-   {
-      super(Configuration.class);
-
-      this.parser = new FileConfigurationParser();
-      
-      this.setSuffix(name);
-   }
-
-   @Override
-   protected Configuration parse(VFSDeploymentUnit unit, VirtualFile file, Configuration root) throws Exception
-   {
-
-      InputStream deploymentStream = null;
-
-      try
-      {
-         deploymentStream = file.openStream();
-         Configuration config = parser.parseMainConfig(deploymentStream);
-         log.info("Main Config = " + config);
-
-         return config;
-      } finally
-      {
-         try
-         {
-            deploymentStream.close();
-         } catch (Exception ignored)
-         {
-         }
-      }
-   }
-}

Modified: branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQCoreConfigRealDeployer.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQCoreConfigRealDeployer.java	2010-03-09 16:56:18 UTC (rev 102146)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQCoreConfigRealDeployer.java	2010-03-09 17:13:42 UTC (rev 102147)
@@ -10,6 +10,7 @@
 import org.jboss.deployers.spi.DeploymentException;
 import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
 import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.metadata.ejb.jboss.JBossMetaData;
 
 /**
  * In a regular flow HornetQCoreParserDeployer will parer hornetq-configuration.xml or hornetq-queues.xml and it
@@ -32,6 +33,9 @@
     {
         super(Configuration.class);
         addOutput(BeanMetaData.class);
+        
+        // This is just to guarantee the order. JBossMetaData deployment should happen before
+        addInput(JBossMetaData.class);
     }
 
     @Override

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:56:18 UTC (rev 102146)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQJMSRealDeployer.java	2010-03-09 17:13:42 UTC (rev 102147)
@@ -37,12 +37,12 @@
    public HornetQJMSRealDeployer()
    {
       super(JMSConfiguration.class);
-      log.info("Instantiating HornetQJMSRealDeployer");
 
       // This is just to guarantee the order. The CoreDeployments should happen before
       addInput(HornetQCoreDeployment.class);
+      // This is just to guarantee the order. JBossMetaData deployment should happen before
+      addInput(JBossMetaData.class);
 
-      addInput(JBossMetaData.class); // CreateDestinationDeployer has this as an output
       addOutput(BeanMetaData.class);
    }