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

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

Author: clebert.suconic at jboss.com
Date: 2011-01-19 17:40:10 -0500 (Wed, 19 Jan 2011)
New Revision: 110410

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/pojo/HornetQCoreDeployment.java
Log:
Avoiding deploying backup configuration at the live server - JBPAPP-5784

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	2011-01-19 22:30:42 UTC (rev 110409)
+++ branches/JBPAPP_5_1_0_Final_HornetQ_2_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQCoreConfigRealDeployer.java	2011-01-19 22:40:10 UTC (rev 110410)
@@ -21,9 +21,8 @@
  */
 package org.jboss.as.integration.hornetq.deployers;
 
-import java.util.concurrent.atomic.AtomicInteger;
-
 import org.hornetq.core.config.Configuration;
+import org.hornetq.core.config.impl.ConfigurationImpl;
 import org.jboss.as.integration.hornetq.deployers.pojo.HornetQCoreDeployment;
 import org.jboss.beans.metadata.plugins.builder.BeanMetaDataBuilderFactory;
 import org.jboss.beans.metadata.spi.BeanMetaData;
@@ -55,8 +54,6 @@
 public class HornetQCoreConfigRealDeployer extends AbstractSimpleRealDeployer<Configuration>
 {
 
-    private final AtomicInteger idGenerator = new AtomicInteger(1);
-
     public HornetQCoreConfigRealDeployer()
     {
         super(Configuration.class);
@@ -76,10 +73,13 @@
         {
            log.trace("Deploying unit: " + unit + " with config " + config);
         }
+        
         String name = config.getName();
         
         BeanMetaDataBuilder builder = BeanMetaDataBuilderFactory.createBuilder(name, HornetQCoreDeployment.class.getName());
 
+        builder.addPropertyMetaData("jmxDomain", config.getJMXDomain());
+        
         builder.addPropertyMetaData("name", name);
 
         builder.addPropertyMetaData("server", builder.createInject("HornetQServer"));

Modified: branches/JBPAPP_5_1_0_Final_HornetQ_2_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQCoreDeployment.java
===================================================================
--- branches/JBPAPP_5_1_0_Final_HornetQ_2_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQCoreDeployment.java	2011-01-19 22:30:42 UTC (rev 110409)
+++ branches/JBPAPP_5_1_0_Final_HornetQ_2_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQCoreDeployment.java	2011-01-19 22:40:10 UTC (rev 110410)
@@ -50,6 +50,8 @@
    private HornetQServer server;
 
    private String name;
+   
+   private String jmxDomain;
 
    private Configuration config;
 
@@ -57,7 +59,15 @@
    {
       return config;
    }
-
+	
+    public String getJmxDomain() {
+		return jmxDomain;
+	}
+	
+	public void setJmxDomain(String jmxDomain) {
+		this.jmxDomain = jmxDomain;
+	}
+   
    public void setConfig(Configuration config)
    {
       this.config = config;
@@ -101,6 +111,11 @@
       {
          log.trace(this.name + " is being started");
       }
+      
+      if (!jmxDomain.equals(server.getConfiguration().getJMXDomain()))
+      {
+    	  return;
+      }
 
       for (Map.Entry<String, AddressSettings> entry : config.getAddressesSettings().entrySet())
       {
@@ -136,6 +151,11 @@
       {
          log.trace(this.name + " is being stopped");
       }
+      
+      if (!jmxDomain.equals(server.getConfiguration().getJMXDomain()))
+      {
+    	  return;
+      }
 
       for (String entry : config.getAddressesSettings().keySet())
       {