[jboss-cvs] JBossAS SVN: r101092 - in branches/Branch_Hornet_Temporary_2/hornetq-int/src: main/java/org/jboss/as/integration/hornetq/deployers/pojo and 1 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Feb 17 17:18:03 EST 2010


Author: clebert.suconic at jboss.com
Date: 2010-02-17 17:18:02 -0500 (Wed, 17 Feb 2010)
New Revision: 101092

Added:
   branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/
   branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQConnectionFactoryDeployment.java
   branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQCoreDeployment.java
   branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQJMSDeployment.java
   branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQQueueDeployment.java
   branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQTopicDeployment.java
Removed:
   branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQCoreDeployment.java
   branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQJMSDeployment.java
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/HornetQJMSRealDeployer.java
   branches/Branch_Hornet_Temporary_2/hornetq-int/src/resources/META-INF/rhq-plugin.xml
Log:
MDB2 dependency

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-02-17 21:47:44 UTC (rev 101091)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQCoreConfigRealDeployer.java	2010-02-17 22:18:02 UTC (rev 101092)
@@ -3,6 +3,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.hornetq.core.config.Configuration;
+import org.jboss.as.integration.hornetq.deployers.pojo.HornetQCoreDeployment;
 import org.jboss.beans.metadata.plugins.builder.BeanMetaDataBuilderFactory;
 import org.jboss.beans.metadata.spi.BeanMetaData;
 import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;

Deleted: branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQCoreDeployment.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQCoreDeployment.java	2010-02-17 21:47:44 UTC (rev 101091)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQCoreDeployment.java	2010-02-17 22:18:02 UTC (rev 101092)
@@ -1,112 +0,0 @@
-package org.jboss.as.integration.hornetq.deployers;
-
-import java.util.Map;
-import java.util.Set;
-
-import org.hornetq.api.core.SimpleString;
-import org.hornetq.core.config.Configuration;
-import org.hornetq.core.config.CoreQueueConfiguration;
-import org.hornetq.core.security.Role;
-import org.hornetq.core.server.HornetQServer;
-import org.hornetq.core.settings.impl.AddressSettings;
-import org.jboss.beans.metadata.api.annotations.Start;
-import org.jboss.beans.metadata.api.annotations.Stop;
-import org.jboss.logging.Logger;
-
-/**
- * 
- * Objects of this class are created by the MicroContainer through
- * BeanMetadataClass at {@link HornetQCoreRealDeployer}
- * 
- * @see HornetQJMSRealDeployer
- * */
-public class HornetQCoreDeployment
-{
-
-   private static final Logger log = Logger.getLogger(HornetQCoreDeployment.class);
-
-   private HornetQServer server;
-
-   private String name;
-
-   private Configuration config;
-
-   public Configuration getJmsConfig()
-   {
-      return config;
-   }
-
-   public void setConfig(Configuration config)
-   {
-      this.config = config;
-   }
-
-   public HornetQServer getServer()
-   {
-      return server;
-   }
-
-   public void setServer(HornetQServer server)
-   {
-      this.server = server;
-   }
-
-   public void setName(String name)
-   {
-      this.name = name;
-   }
-
-   public String getName()
-   {
-      return name;
-   }
-
-   @Start
-   public void start()
-   {
-      log.info("Being started!");
-
-      for (Map.Entry<String, AddressSettings> entry : config.getAddressesSettings().entrySet())
-      {
-         server.getAddressSettingsRepository().addMatch(entry.getKey(), entry.getValue());
-      }
-
-      for (Map.Entry<String, Set<Role>> entry : config.getSecurityRoles().entrySet())
-      {
-         server.getSecurityRepository().addMatch(entry.getKey(), entry.getValue());
-      }
-
-      for (CoreQueueConfiguration coreQueue : config.getQueueConfigurations())
-      {
-         try
-         {
-            server.createQueue(new SimpleString(coreQueue.getAddress()), new SimpleString(coreQueue.getName()), new SimpleString(
-                  coreQueue.getFilterString()), coreQueue.isDurable(), false);
-         }
-         catch (Exception e)
-         {
-            log.warn("Error on creating queue " + coreQueue.getName() + " address = " + coreQueue.getAddress(), e);
-         }
-      }
-   }
-
-   @Stop
-   public void stop()
-   {
-      log.info("Being stopped");
-
-      for (String entry : config.getAddressesSettings().keySet())
-      {
-         server.getAddressSettingsRepository().removeMatch(entry);
-      }
-
-      for (String entry : config.getSecurityRoles().keySet())
-      {
-         server.getSecurityRepository().removeMatch(entry);
-      }
-      
-      
-      // Undeploy core queues means nothing on core queues, so no need to do anything here
-   }
-
-}

Deleted: branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQJMSDeployment.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQJMSDeployment.java	2010-02-17 21:47:44 UTC (rev 101091)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQJMSDeployment.java	2010-02-17 22:18:02 UTC (rev 101092)
@@ -1,149 +0,0 @@
-package org.jboss.as.integration.hornetq.deployers;
-
-import org.hornetq.jms.server.JMSServerManager;
-import org.hornetq.jms.server.config.ConnectionFactoryConfiguration;
-import org.hornetq.jms.server.config.JMSConfiguration;
-import org.hornetq.jms.server.config.JMSQueueConfiguration;
-import org.hornetq.jms.server.config.TopicConfiguration;
-import org.jboss.beans.metadata.api.annotations.Start;
-import org.jboss.beans.metadata.api.annotations.Stop;
-import org.jboss.logging.Logger;
-
-/** 
- * 
- * Objects of this class are created by the MicroContainer through BeanMetadataClass at {@link HornetQJMSRealDeployer}
- * 
- * @see HornetQJMSRealDeployer
- * */
-public class HornetQJMSDeployment
-{
-
-    private static final Logger log = Logger.getLogger(HornetQJMSDeployment.class);
-
-    private JMSServerManager jmsServer;
-
-    private String name;
-
-    private JMSConfiguration jmsConfig;
-
-    public JMSConfiguration getJmsConfig()
-    {
-        return jmsConfig;
-    }
-
-    public void setJmsConfig(JMSConfiguration jmsConfig)
-    {
-        this.jmsConfig = jmsConfig;
-    }
-
-    public JMSServerManager getJmsServer()
-    {
-        return jmsServer;
-    }
-
-    public void setJmsServer(JMSServerManager jmsServer)
-    {
-        this.jmsServer = jmsServer;
-    }
-
-    public void setName(String name)
-    {
-        this.name = name;
-    }
-
-    public String getName()
-    {
-        return name;
-    }
-
-    @Start
-    public void start()
-    {
-        log.info("Being started!");
-
-        for (ConnectionFactoryConfiguration cfConfig : jmsConfig.getConnectionFactoryConfigurations())
-        {
-            log.info("Deploying ConnectionFactory " + cfConfig.getName());
-            try
-            {
-                jmsServer.createConnectionFactory(cfConfig);
-            } catch (Exception e)
-            {
-                log.warn("Error deploying ConnectionFactory: " + cfConfig.getName(), e);
-            }
-        }
-
-        for (JMSQueueConfiguration queueConfig : jmsConfig.getQueueConfigurations())
-        {
-            for (String jndiBinding : queueConfig.getBindings())
-            {
-                log.info("Deploying Queue " + queueConfig.getName() + " on jndiName " + jndiBinding);
-                try
-                {
-                    jmsServer.createQueue(queueConfig.getName(), jndiBinding, queueConfig.getSelector(), queueConfig.isDurable());
-                } catch (Exception e)
-                {
-                    log.warn("Error deploying Queue: " + queueConfig.getName(), e);
-                }
-            }
-        }
-
-        for (TopicConfiguration topicConfig : jmsConfig.getTopicConfigurations())
-        {
-            for (String jndiBinding : topicConfig.getBindings())
-            {
-                log.info("Deploying Topic " + topicConfig.getName() + " on jndiName " + jndiBinding);
-                try
-                {
-                    jmsServer.createTopic(topicConfig.getName(), jndiBinding);
-                } catch (Exception e)
-                {
-                    log.warn("Error deploying Queue: " + topicConfig.getName(), e);
-                }
-            }
-        }
-    }
-
-    @Stop
-    public void stop()
-    {
-        log.info("Being stopped");
-
-        for (ConnectionFactoryConfiguration cfConfig : jmsConfig.getConnectionFactoryConfigurations())
-        {
-            log.info("Destroying ConnectionFactory " + cfConfig.getName());
-            try
-            {
-                jmsServer.destroyConnectionFactory(cfConfig.getName());
-            } catch (Exception e)
-            {
-                log.warn("Error destroying ConnectionFactory: " + cfConfig.getName(), e);
-            }
-        }
-
-        for (JMSQueueConfiguration queueConfig : jmsConfig.getQueueConfigurations())
-        {
-            log.info("Destroying Queue " + queueConfig.getName());
-            try
-            {
-                jmsServer.undeployDestination(queueConfig.getName());
-            } catch (Exception e)
-            {
-                log.warn("Error deploying Queue: " + queueConfig.getName(), e);
-            }
-        }
-
-        for (TopicConfiguration topicConfig : jmsConfig.getTopicConfigurations())
-        {
-            log.info("Destroying Topic " + topicConfig.getName());
-            try
-            {
-                jmsServer.undeployDestination(topicConfig.getName());
-            } catch (Exception e)
-            {
-                log.warn("Error destroying Topic: " + topicConfig.getName(), e);
-            }
-        }
-    }
-
-}

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-02-17 21:47:44 UTC (rev 101091)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQJMSRealDeployer.java	2010-02-17 22:18:02 UTC (rev 101092)
@@ -2,7 +2,13 @@
 
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.hornetq.jms.server.config.ConnectionFactoryConfiguration;
 import org.hornetq.jms.server.config.JMSConfiguration;
+import org.hornetq.jms.server.config.JMSQueueConfiguration;
+import org.hornetq.jms.server.config.TopicConfiguration;
+import org.jboss.as.integration.hornetq.deployers.pojo.HornetQConnectionFactoryDeployment;
+import org.jboss.as.integration.hornetq.deployers.pojo.HornetQQueueDeployment;
+import org.jboss.as.integration.hornetq.deployers.pojo.HornetQTopicDeployment;
 import org.jboss.beans.metadata.plugins.builder.BeanMetaDataBuilderFactory;
 import org.jboss.beans.metadata.spi.BeanMetaData;
 import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
@@ -16,8 +22,9 @@
  * then be called directly by the VFS Deployment Framework, as the Input object
  * for this is a JMSConfiguration class.
  * 
- * In an alternate flow, other deployers (e.g. TorqueBox) may install a JMSConfiguration object
- * directly and this deployer will take over without the need of a real XML file
+ * In an alternate flow, other deployers (e.g. TorqueBox) may install a
+ * JMSConfiguration object directly and this deployer will take over without the
+ * need of a real XML file
  * 
  * @author <mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
  * 
@@ -25,30 +32,53 @@
 public class HornetQJMSRealDeployer extends AbstractSimpleVFSRealDeployer<JMSConfiguration>
 {
 
-    private final AtomicInteger idGenerator = new AtomicInteger(1);
+   public HornetQJMSRealDeployer()
+   {
+      super(JMSConfiguration.class);
+      addOutput(BeanMetaData.class);
+   }
+   
 
-    public HornetQJMSRealDeployer()
-    {
-        super(JMSConfiguration.class);
-        addOutput(BeanMetaData.class);
-    }
+   @Override
+   public void deploy(VFSDeploymentUnit unit, JMSConfiguration mainConfig) throws DeploymentException
+   {
 
-    @Override
-    public void deploy(VFSDeploymentUnit unit, JMSConfiguration config) throws DeploymentException
-    {
-        String name = "HornetQJMSDeployment::" + idGenerator.incrementAndGet();
+      for (JMSQueueConfiguration config : mainConfig.getQueueConfigurations())
+      {
+         String name = "org.hornetq:module=JMS,name=\"" + config.getName() + "\",type=DeployedQueue";
 
-        BeanMetaDataBuilder builder = BeanMetaDataBuilderFactory.createBuilder(name, HornetQJMSDeployment.class.getName());
+         unit.addAttachment(name, createBasicBean(HornetQQueueDeployment.class.getName(), name, config));
+      }
 
-        builder.addPropertyMetaData("name", name);
+      for (TopicConfiguration config : mainConfig.getTopicConfigurations())
+      {
+         String name = "org.hornetq:module=JMS,name=\"" + config.getName() + "\",type=DeployedQueue";
 
-        builder.addPropertyMetaData("jmsServer", builder.createInject("JMSServerManager"));
+         unit.addAttachment(name, createBasicBean(HornetQTopicDeployment.class.getName(), name, config));
+      }
 
-        builder.addPropertyMetaData("jmsConfig", config);
+      for (ConnectionFactoryConfiguration config : mainConfig.getConnectionFactoryConfigurations())
+      {
+         String name = "org.hornetq:module=JMS,name=\"" + config.getName() + "\",type=DeployedConnectionFactory";
 
-        BeanMetaData bean = builder.getBeanMetaData();
+         unit.addAttachment(name, createBasicBean(HornetQConnectionFactoryDeployment.class.getName(), name, config));
+      }
+   }
 
-        unit.addAttachment(name, bean);
-    }
+   /**
+    * @param name
+    */
+   private BeanMetaData createBasicBean(String configClass, String name, Object config)
+   {
+      BeanMetaDataBuilder builder = BeanMetaDataBuilderFactory.createBuilder(name, configClass);
 
+      builder.addPropertyMetaData("name", name);
+
+      builder.addPropertyMetaData("jmsServer", builder.createInject("JMSServerManager"));
+      
+      builder.addPropertyMetaData("config", config);
+      
+      return builder.getBeanMetaData();
+   }
+
 }

Added: branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQConnectionFactoryDeployment.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQConnectionFactoryDeployment.java	                        (rev 0)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQConnectionFactoryDeployment.java	2010-02-17 22:18:02 UTC (rev 101092)
@@ -0,0 +1,37 @@
+package org.jboss.as.integration.hornetq.deployers.pojo;
+
+import org.hornetq.jms.server.config.ConnectionFactoryConfiguration;
+import org.jboss.logging.Logger;
+
+public class HornetQConnectionFactoryDeployment extends HornetQJMSDeployment<ConnectionFactoryConfiguration>
+{
+   private static final Logger log = Logger.getLogger(HornetQConnectionFactoryDeployment.class);
+
+   @Override
+   public void start() throws Exception
+   {
+      log.info("Deploying ConnectionFactory " + config.getName());
+      try
+      {
+         jmsServer.createConnectionFactory(config);
+      } catch (Exception e)
+      {
+         log.warn("Error deploying ConnectionFactory: " + config.getName(), e);
+         throw e;
+      }
+   }
+
+   @Override
+   public void stop() throws Exception
+   {
+      log.info("Destroying ConnectionFactory " + config.getName());
+      try
+      {
+         jmsServer.destroyConnectionFactory(config.getName());
+      } catch (Exception e)
+      {
+         log.warn("Error destroying ConnectionFactory: " + config.getName(), e);
+      }
+   }
+
+}

Copied: branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQCoreDeployment.java (from rev 101081, branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQCoreDeployment.java)
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQCoreDeployment.java	                        (rev 0)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQCoreDeployment.java	2010-02-17 22:18:02 UTC (rev 101092)
@@ -0,0 +1,113 @@
+package org.jboss.as.integration.hornetq.deployers.pojo;
+
+import java.util.Map;
+import java.util.Set;
+
+import org.hornetq.api.core.SimpleString;
+import org.hornetq.core.config.Configuration;
+import org.hornetq.core.config.CoreQueueConfiguration;
+import org.hornetq.core.security.Role;
+import org.hornetq.core.server.HornetQServer;
+import org.hornetq.core.settings.impl.AddressSettings;
+import org.jboss.as.integration.hornetq.deployers.HornetQJMSRealDeployer;
+import org.jboss.beans.metadata.api.annotations.Start;
+import org.jboss.beans.metadata.api.annotations.Stop;
+import org.jboss.logging.Logger;
+
+/**
+ * 
+ * Objects of this class are created by the MicroContainer through
+ * BeanMetadataClass at {@link HornetQCoreRealDeployer}
+ * 
+ * @see HornetQJMSRealDeployer
+ * */
+public class HornetQCoreDeployment
+{
+
+   private static final Logger log = Logger.getLogger(HornetQCoreDeployment.class);
+
+   private HornetQServer server;
+
+   private String name;
+
+   private Configuration config;
+
+   public Configuration getJmsConfig()
+   {
+      return config;
+   }
+
+   public void setConfig(Configuration config)
+   {
+      this.config = config;
+   }
+
+   public HornetQServer getServer()
+   {
+      return server;
+   }
+
+   public void setServer(HornetQServer server)
+   {
+      this.server = server;
+   }
+
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+
+   public String getName()
+   {
+      return name;
+   }
+
+   @Start
+   public void start()
+   {
+      log.info("Being started!");
+
+      for (Map.Entry<String, AddressSettings> entry : config.getAddressesSettings().entrySet())
+      {
+         server.getAddressSettingsRepository().addMatch(entry.getKey(), entry.getValue());
+      }
+
+      for (Map.Entry<String, Set<Role>> entry : config.getSecurityRoles().entrySet())
+      {
+         server.getSecurityRepository().addMatch(entry.getKey(), entry.getValue());
+      }
+
+      for (CoreQueueConfiguration coreQueue : config.getQueueConfigurations())
+      {
+         try
+         {
+            server.createQueue(new SimpleString(coreQueue.getAddress()), new SimpleString(coreQueue.getName()), new SimpleString(
+                  coreQueue.getFilterString()), coreQueue.isDurable(), false);
+         }
+         catch (Exception e)
+         {
+            log.warn("Error on creating queue " + coreQueue.getName() + " address = " + coreQueue.getAddress(), e);
+         }
+      }
+   }
+
+   @Stop
+   public void stop()
+   {
+      log.info("Being stopped");
+
+      for (String entry : config.getAddressesSettings().keySet())
+      {
+         server.getAddressSettingsRepository().removeMatch(entry);
+      }
+
+      for (String entry : config.getSecurityRoles().keySet())
+      {
+         server.getSecurityRepository().removeMatch(entry);
+      }
+      
+      
+      // Undeploy core queues means nothing on core queues, so no need to do anything here
+   }
+
+}

Copied: branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQJMSDeployment.java (from rev 101081, branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQJMSDeployment.java)
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQJMSDeployment.java	                        (rev 0)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQJMSDeployment.java	2010-02-17 22:18:02 UTC (rev 101092)
@@ -0,0 +1,59 @@
+package org.jboss.as.integration.hornetq.deployers.pojo;
+
+import org.hornetq.jms.server.JMSServerManager;
+import org.jboss.as.integration.hornetq.deployers.HornetQJMSRealDeployer;
+import org.jboss.logging.Logger;
+
+/**
+ * 
+ * Objects of this class are created by the MicroContainer through
+ * BeanMetadataClass at {@link HornetQJMSRealDeployer}
+ * 
+ * @see HornetQJMSRealDeployer
+ * */
+public abstract class HornetQJMSDeployment<T>
+{
+
+   private static final Logger log = Logger.getLogger(HornetQJMSDeployment.class);
+
+   protected JMSServerManager jmsServer;
+
+   protected String name;
+   
+   protected T config;
+   
+   public T getConfig()
+   {
+      return config;
+   }
+   
+   public void setConfig(T config)
+   {
+      this.config = config;
+   }
+
+   public JMSServerManager getJmsServer()
+   {
+      return jmsServer;
+   }
+
+   public void setJmsServer(JMSServerManager jmsServer)
+   {
+      this.jmsServer = jmsServer;
+   }
+
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+
+   public String getName()
+   {
+      return name;
+   }
+
+   public abstract void start() throws Exception;
+
+   public abstract void stop() throws Exception;
+
+}

Added: branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQQueueDeployment.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQQueueDeployment.java	                        (rev 0)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQQueueDeployment.java	2010-02-17 22:18:02 UTC (rev 101092)
@@ -0,0 +1,34 @@
+package org.jboss.as.integration.hornetq.deployers.pojo;
+
+import org.hornetq.jms.server.config.JMSQueueConfiguration;
+import org.jboss.logging.Logger;
+
+public class HornetQQueueDeployment extends HornetQJMSDeployment<JMSQueueConfiguration>
+{
+   private static final Logger log = Logger.getLogger(HornetQQueueDeployment.class);
+
+   @Override
+   public void start() throws Exception
+   {
+      try
+      {
+         for (String jndiBinding : config.getBindings())
+         {
+            log.info("Deploying Queue " + config.getName() + " on jndiName " + jndiBinding);
+            jmsServer.createQueue(config.getName(), jndiBinding, config.getSelector(), config.isDurable());
+         }
+      } catch (Exception e)
+      {
+         log.warn("Error deploying Queue: " + config.getName(), e);
+         throw e;
+      }
+   }
+
+   @Override
+   public void stop() throws Exception
+   {
+      log.info("Undeploying queue " + config.getName());
+      jmsServer.undeployDestination(config.getName());
+   }
+
+}

Added: branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQTopicDeployment.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQTopicDeployment.java	                        (rev 0)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQTopicDeployment.java	2010-02-17 22:18:02 UTC (rev 101092)
@@ -0,0 +1,40 @@
+package org.jboss.as.integration.hornetq.deployers.pojo;
+
+import org.hornetq.jms.server.config.TopicConfiguration;
+import org.jboss.logging.Logger;
+
+public class HornetQTopicDeployment extends HornetQJMSDeployment<TopicConfiguration>
+{
+   private static final Logger log = Logger.getLogger(HornetQTopicDeployment.class);
+
+   @Override
+   public void start() throws Exception
+   {
+      try
+      {
+         for (String jndiBinding : config.getBindings())
+         {
+            log.info("Deploying Topic " + config.getName() + " on jndiName " + jndiBinding);
+            jmsServer.createTopic(config.getName(), jndiBinding);
+         }
+      } catch (Exception e)
+      {
+         log.warn("Error deploying Topic: " + config.getName(), e);
+         throw e;
+      }
+   }
+
+   @Override
+   public void stop() throws Exception
+   {
+      log.info("Undeploying Topic " + config.getName());
+      try
+      {
+         jmsServer.undeployDestination(config.getName());
+      } catch (Exception e)
+      {
+         log.warn("Error destroying Topic: " + config.getName(), e);
+      }
+   }
+
+}

Modified: branches/Branch_Hornet_Temporary_2/hornetq-int/src/resources/META-INF/rhq-plugin.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/src/resources/META-INF/rhq-plugin.xml	2010-02-17 21:47:44 UTC (rev 101091)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/resources/META-INF/rhq-plugin.xml	2010-02-17 22:18:02 UTC (rev 101092)
@@ -946,23 +946,6 @@
                 <c:simple-property name="resourceNameProperty" default="name"/>
                 <c:simple-property name="searchString" default="name=*"/>
             </plugin-configuration>
-            <operation name="addRole" displayName="Add Role" description="Add a Role to this address.">
-              <parameters>
-                  <c:simple-property required="true" name="name" displayName="Name of the role to add"/>
-                  <c:simple-property required="true" type="boolean" name="boolean:send" displayName="Can the user send to this address?"/>
-                  <c:simple-property required="true" type="boolean" name="boolean:consume" displayName="Can the user consume from this address?"/>
-                  <c:simple-property required="true" type="boolean" name="boolean:createDurableQueue" displayName="Can the user create a durable queue?"/>
-                  <c:simple-property required="true" type="boolean" name="boolean:deleteDurableQueue" displayName="Can the user delete a durable queue?"/>
-                  <c:simple-property required="true" type="boolean" name="boolean:createNonDurableQueue" displayName="Can the user create a temp queue?"/>
-                  <c:simple-property required="true" type="boolean" name="boolean:deleteNonDurableQueue" displayName="Can the user delete a temp queue?"/>
-                  <c:simple-property required="true" type="boolean" name="boolean:manage" displayName="Can the user send management messages?"/>
-		        </parameters>
-            </operation>
-            <operation name="removeRole" displayName="Remove Role" description="Remove a Role from this address.">
-              <parameters>
-                  <c:simple-property required="true" name="name" displayName="Name of the role to remove"/>  
-		        </parameters>
-            </operation>
             <metric property="Address"
                  displayName="Address"
                  description="the address"




More information about the jboss-cvs-commits mailing list