[jboss-cvs] JBossAS SVN: r101961 - in branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers: pojo and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Mar 5 10:36:01 EST 2010
Author: clebert.suconic at jboss.com
Date: 2010-03-05 10:36:01 -0500 (Fri, 05 Mar 2010)
New Revision: 101961
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/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/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQQueueDeployment.java
Log:
deployment changes
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-05 15:34:51 UTC (rev 101960)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/DestinationFactoryDeployerPlugin.java 2010-03-05 15:36:01 UTC (rev 101961)
@@ -6,6 +6,8 @@
import javax.jms.Queue;
import javax.jms.Topic;
+import org.hornetq.api.core.management.ObjectNameBuilder;
+import org.hornetq.jms.client.HornetQDestination;
import org.hornetq.jms.server.JMSServerManager;
import org.hornetq.jms.server.config.JMSConfiguration;
import org.hornetq.jms.server.config.impl.JMSConfigurationImpl;
@@ -94,9 +96,23 @@
mdbDependencies = new HashSet<String>();
mdb.setDepends(mdbDependencies);
}
- // FIXME add dependency
- // This would be the name of the installed Bean (BeanMetaData)
+ try
+ {
+ if (isTopic)
+ {
+ mdbDependencies.add(ObjectNameBuilder.DEFAULT.getJMSTopicObjectName(destinationName).toString());
+ }
+ else
+ {
+ mdbDependencies.add(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(destinationName).toString());
+ }
+ }
+ catch (Exception e)
+ {
+ log.warn(e.getMessage(), e);
+ }
+
unit.addAttachment(JMSConfiguration.class, config);
return true;
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-05 15:34:51 UTC (rev 101960)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQCoreConfigRealDeployer.java 2010-03-05 15:36:01 UTC (rev 101961)
@@ -1,6 +1,5 @@
package org.jboss.as.integration.hornetq.deployers;
-import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import org.hornetq.core.config.Configuration;
@@ -9,8 +8,8 @@
import org.jboss.beans.metadata.spi.BeanMetaData;
import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.vfs.spi.deployer.AbstractSimpleVFSRealDeployer;
-import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
/**
* In a regular flow HornetQCoreParserDeployer will parer hornetq-configuration.xml or hornetq-queues.xml and it
@@ -24,7 +23,7 @@
* @author <mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
*
*/
-public class HornetQCoreConfigRealDeployer extends AbstractSimpleVFSRealDeployer<Configuration>
+public class HornetQCoreConfigRealDeployer extends AbstractSimpleRealDeployer<Configuration>
{
private final AtomicInteger idGenerator = new AtomicInteger(1);
@@ -36,7 +35,7 @@
}
@Override
- public void deploy(VFSDeploymentUnit unit, Configuration config) throws DeploymentException
+ public void deploy(DeploymentUnit unit, Configuration config) throws DeploymentException
{
log.info("ConfigRealDeployer");
String name = "HornetQCoreDeployment::" + idGenerator.incrementAndGet();
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-05 15:34:51 UTC (rev 101960)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQJMSRealDeployer.java 2010-03-05 15:36:01 UTC (rev 101961)
@@ -12,11 +12,10 @@
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.DependencyMetaData;
import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.vfs.spi.deployer.AbstractSimpleVFSRealDeployer;
-import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.kernel.plugins.bootstrap.basic.KernelConstants;
/**
@@ -32,7 +31,7 @@
* @author <mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
*
*/
-public class HornetQJMSRealDeployer extends AbstractSimpleVFSRealDeployer<JMSConfiguration>
+public class HornetQJMSRealDeployer extends AbstractSimpleRealDeployer<JMSConfiguration>
{
public HornetQJMSRealDeployer()
@@ -42,9 +41,8 @@
addInput(HornetQCoreDeployment.class);
}
-
@Override
- public void deploy(VFSDeploymentUnit unit, JMSConfiguration mainConfig) throws DeploymentException
+ public void deploy(DeploymentUnit unit, JMSConfiguration mainConfig) throws DeploymentException
{
log.info("JMSRealDeployer");
@@ -74,7 +72,7 @@
/**
* @param name
*/
- private BeanMetaData createBasicBean(VFSDeploymentUnit unit, String configClass, String name, Object config)
+ private BeanMetaData createBasicBean(DeploymentUnit unit, String configClass, String name, Object config)
{
BeanMetaDataBuilder builder = BeanMetaDataBuilderFactory.createBuilder(name, configClass);
@@ -106,4 +104,5 @@
return builder.getBeanMetaData();
}
+
}
Modified: 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 2010-03-05 15:34:51 UTC (rev 101960)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQQueueDeployment.java 2010-03-05 15:36:01 UTC (rev 101961)
@@ -2,6 +2,7 @@
import javax.management.ObjectName;
+import org.hornetq.api.core.management.ObjectNameBuilder;
import org.hornetq.jms.server.config.JMSQueueConfiguration;
import org.jboss.logging.Logger;
@@ -21,7 +22,7 @@
}
// Register the Control MBean in MC
- registerControlReference(new ObjectName("org.hornetq:module=JMS,name=\"" + config.getName() + "\",type=Queue"));
+ registerControlReference(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(config.getName()));
} catch (Exception e)
{
More information about the jboss-cvs-commits
mailing list