[jboss-cvs] JBossAS SVN: r103233 - in trunk: component-matrix and 3 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Mar 30 02:37:41 EDT 2010


Author: clebert.suconic at jboss.com
Date: 2010-03-30 02:37:41 -0400 (Tue, 30 Mar 2010)
New Revision: 103233

Modified:
   trunk/build/build.xml
   trunk/component-matrix/pom.xml
   trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQConnectionFactoryDeployment.java
   trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQQueueDeployment.java
   trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQTopicDeployment.java
   trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/ConnectionFactoryManageMO.java
   trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/ConnectionFactoryMapper.java
   trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/JMSManageMO.java
   trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/QueueManageMO.java
   trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/TopicManageMO.java
   trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/template/JAXBJMSConfiguration.java
   trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/template/JAXBJMSQueueConfiguration.java
   trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/template/JAXBJMSTopicConfiguration.java
Log:
upgrade hornetQ's tagged snapshot

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2010-03-30 06:36:06 UTC (rev 103232)
+++ trunk/build/build.xml	2010-03-30 06:37:41 UTC (rev 103233)
@@ -1745,7 +1745,7 @@
     -->
    <mkdir dir="${install.default.deploy}/hornetq"/>
    <unzip src="${org.hornetq:hornetq-resources:jar}" dest="${install.default.deploy}/hornetq">
-	  <patternset includes="jboss-6/non-clustered/*" excludes="**/hornetq-users.properties,**/hornetq-roles.properties,**/hornetq-roles.properties,**/login-config.xml">
+	  <patternset includes="jboss-as-6/non-clustered/*" excludes="**/hornetq-users.properties,**/hornetq-roles.properties,**/hornetq-roles.properties,**/login-config.xml">
 	  </patternset>
 	  <mapper type="flatten"/>
    </unzip>
@@ -1757,7 +1757,7 @@
     -->
     <mkdir dir="${install.all.deploy}/hornetq"/>
     <unzip src="${org.hornetq:hornetq-resources:jar}" dest="${install.all.deploy}/hornetq">
-    	  <patternset includes="jboss-6/clustered/*" excludes="**/hornetq-users.properties,**/hornetq-roles.properties,**/hornetq-roles.properties,**/login-config.xml">
+    	  <patternset includes="jboss-as-6/clustered/*" excludes="**/hornetq-users.properties,**/hornetq-roles.properties,**/hornetq-roles.properties,**/login-config.xml">
     	  </patternset>
     	  <mapper type="flatten"/>
     </unzip>

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2010-03-30 06:36:06 UTC (rev 103232)
+++ trunk/component-matrix/pom.xml	2010-03-30 06:37:41 UTC (rev 103233)
@@ -48,7 +48,7 @@
     <version.jboss.jbossws-framework>3.3.0.CR1</version.jboss.jbossws-framework>
     <version.jboss.jbossws-spi>1.3.0.CR1</version.jboss.jbossws-spi>
     <version.jboss.jms-integration-tests>1.0.1.GA</version.jboss.jms-integration-tests>
-    <version.hornetq>2.1.0.r8956</version.hornetq>
+    <version.hornetq>2.1.0.r9008</version.hornetq>
     <version.jboss.web>3.0.0-beta-3</version.jboss.web>
     <version.jgroups>2.6.13.GA</version.jgroups>
     <version.jsr181.api>1.0-MR1</version.jsr181.api>

Modified: trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQConnectionFactoryDeployment.java
===================================================================
--- trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQConnectionFactoryDeployment.java	2010-03-30 06:36:06 UTC (rev 103232)
+++ trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQConnectionFactoryDeployment.java	2010-03-30 06:37:41 UTC (rev 103233)
@@ -1,10 +1,10 @@
 package org.jboss.as.integration.hornetq.deployers.pojo;
 
-import javax.management.ObjectName;
-
 import org.hornetq.jms.server.config.ConnectionFactoryConfiguration;
 import org.jboss.logging.Logger;
 
+import javax.management.ObjectName;
+
 public class HornetQConnectionFactoryDeployment extends HornetQJMSDeployment<ConnectionFactoryConfiguration>
 {
    private static final Logger log = Logger.getLogger(HornetQConnectionFactoryDeployment.class);
@@ -15,7 +15,7 @@
       log.info("Deploying ConnectionFactory " + config.getName());
       try
       {
-         jmsServer.createConnectionFactory(config);
+         jmsServer.createConnectionFactory(false, config, config.getBindings());
          
          // Register the Control MBean in MC
          registerControlReference(new ObjectName("org.hornetq:module=JMS,name=\"" + config.getName() + "\",type=ConnectionFactory"));

Modified: trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQQueueDeployment.java
===================================================================
--- trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQQueueDeployment.java	2010-03-30 06:36:06 UTC (rev 103232)
+++ trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQQueueDeployment.java	2010-03-30 06:37:41 UTC (rev 103233)
@@ -1,11 +1,11 @@
 package org.jboss.as.integration.hornetq.deployers.pojo;
 
-import javax.management.ObjectName;
-
 import org.hornetq.api.core.management.ObjectNameBuilder;
 import org.hornetq.jms.server.config.JMSQueueConfiguration;
 import org.jboss.logging.Logger;
 
+import javax.management.ObjectName;
+
 public class HornetQQueueDeployment extends HornetQJMSDeployment<JMSQueueConfiguration>
 {
    private static final Logger log = Logger.getLogger(HornetQQueueDeployment.class);
@@ -15,12 +15,10 @@
    {
       try
       {
-         for (String jndiBinding : config.getBindings())
-         {
-            log.info("Deploying Queue " + config.getName() + " on jndiName " + jndiBinding);
-            jmsServer.createQueue(config.getName(), jndiBinding, config.getSelector(), config.isDurable());
-         }
          
+         log.info("Deploying Queue " + config.getName());
+         jmsServer.createQueue(false, config.getName(), config.getSelector(), config.isDurable(), config.getBindings());
+         
          // Register the Control MBean in MC
          registerControlReference(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(config.getName()));
          
@@ -38,7 +36,7 @@
       
       unregisterControlReference(new ObjectName("org.hornetq:module=JMS,name=\"" + config.getName() + "\",type=Queue"));
       
-      jmsServer.undeployDestination(config.getName());
+      jmsServer.destroyQueue(config.getName());
    }
 
 }

Modified: trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQTopicDeployment.java
===================================================================
--- trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQTopicDeployment.java	2010-03-30 06:36:06 UTC (rev 103232)
+++ trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQTopicDeployment.java	2010-03-30 06:37:41 UTC (rev 103233)
@@ -1,10 +1,10 @@
 package org.jboss.as.integration.hornetq.deployers.pojo;
 
-import javax.management.ObjectName;
-
 import org.hornetq.jms.server.config.TopicConfiguration;
 import org.jboss.logging.Logger;
 
+import javax.management.ObjectName;
+
 public class HornetQTopicDeployment extends HornetQJMSDeployment<TopicConfiguration>
 {
    private static final Logger log = Logger.getLogger(HornetQTopicDeployment.class);
@@ -14,12 +14,7 @@
    {
       try
       {
-         for (String jndiBinding : config.getBindings())
-         {
-            log.info("Deploying Topic " + config.getName() + " on jndiName " + jndiBinding);
-            jmsServer.createTopic(config.getName(), jndiBinding);
-         }
-         //
+         jmsServer.createTopic(false, config.getName(), config.getBindings());
          registerControlReference(new ObjectName("org.hornetq:module=JMS,name=\"" + config.getName() + "\",type=Topic"));
       }
       catch (Exception e)
@@ -37,7 +32,7 @@
       {
          unregisterControlReference(new ObjectName("org.hornetq:module=JMS,name=\"" + config.getName() + "\",type=Topic"));
          
-         jmsServer.undeployDestination(config.getName());
+         jmsServer.destroyTopic(config.getName());
       }
       catch (Exception e)
       {

Modified: trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/ConnectionFactoryManageMO.java
===================================================================
--- trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/ConnectionFactoryManageMO.java	2010-03-30 06:36:06 UTC (rev 103232)
+++ trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/ConnectionFactoryManageMO.java	2010-03-30 06:37:41 UTC (rev 103233)
@@ -80,10 +80,20 @@
       String[] val = new String[names.length];
       for (int i = 0, valLength = val.length; i < valLength; i++)
       {
-         val[i] = control.getClass().getMethod(names[i]).invoke(control).toString();
+         Object o = control.getClass().getMethod(names[i]).invoke(control);
+         if(o instanceof Object[])
+         {
+            val[i] = coomaSeparatedString((Object[]) o);
+         }
+         else
+         {
+            val[i] = o.toString();
+         }
       }
       return val;
    }
+
+
    @ManagementOperation(name = "getConnectionFactories", description = "returns the JMS Connection Factories")
    public String[] getJMSConnectionFactories()
    {

Modified: trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/ConnectionFactoryMapper.java
===================================================================
--- trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/ConnectionFactoryMapper.java	2010-03-30 06:36:06 UTC (rev 103232)
+++ trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/ConnectionFactoryMapper.java	2010-03-30 06:37:41 UTC (rev 103233)
@@ -225,7 +225,7 @@
       cvs.set("liveTransportParams", new SimpleValueSupport(SimpleMetaType.STRING, liveTransportParams));
       cvs.set("backupTransportClassNames", new SimpleValueSupport(SimpleMetaType.STRING, backupTransportClassNames));
       cvs.set("backupTransportParams", new SimpleValueSupport(SimpleMetaType.STRING, backupTransportParams));
-      cvs.set("Bindings", new SimpleValueSupport(SimpleMetaType.STRING, getJndiString(control.getBindings())));
+      cvs.set("Bindings", new SimpleValueSupport(SimpleMetaType.STRING, getJndiString(control.getJNDIBindings())));
       cvs.set("DiscoveryAddress", new SimpleValueSupport(SimpleMetaType.STRING, control.getDiscoveryAddress()));
       cvs.set("DiscoveryPort", new SimpleValueSupport(SimpleMetaType.STRING, control.getDiscoveryPort()));
       cvs.set("DiscoveryRefreshTimeout", new SimpleValueSupport(SimpleMetaType.STRING, control.getDiscoveryRefreshTimeout()));
@@ -280,7 +280,7 @@
       return TYPE;
    }
 
-   private String getJndiString(List<String> array)
+   private String getJndiString(String[] array)
    {
       StringBuffer sb = new StringBuffer();
       for (String o : array)

Modified: trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/JMSManageMO.java
===================================================================
--- trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/JMSManageMO.java	2010-03-30 06:36:06 UTC (rev 103232)
+++ trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/JMSManageMO.java	2010-03-30 06:37:41 UTC (rev 103233)
@@ -34,8 +34,11 @@
 public class JMSManageMO
 {
    protected JMSServerControl jmsServerControl;
+
    protected ManagementService managementService;
+
    protected HornetQServerControl hornetQServerControl;
+
    private HornetQServer server;
 
 
@@ -51,12 +54,27 @@
       hornetQServerControl = (HornetQServerControl) managementService.getResource(ResourceNames.CORE_SERVER);
    }
 
+   protected String coomaSeparatedString(Object[] objects)
+   {
+      StringBuffer sb = new StringBuffer("");
+      for (Object object : objects)
+      {
+         if (sb.length() > 0)
+         {
+            sb.append(",");
+         }
+         sb.append(object.toString());
+      }
+      return sb.toString();
+   }
+
+
    protected Object[] getParams(String[] params, Class[] classes)
    {
       Object[] objects = new Object[params.length];
       for (int i = 0, objectsLength = objects.length; i < objectsLength; i++)
       {
-         if("null".equalsIgnoreCase(params[i]))
+         if ("null".equalsIgnoreCase(params[i]))
          {
             objects[i] = null;
          }

Modified: trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/QueueManageMO.java
===================================================================
--- trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/QueueManageMO.java	2010-03-30 06:36:06 UTC (rev 103232)
+++ trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/QueueManageMO.java	2010-03-30 06:37:41 UTC (rev 103233)
@@ -114,7 +114,7 @@
    {
       Object[] config = new Object[3];
       JMSQueueControl control = (JMSQueueControl) managementService.getResource(name);
-      JMSQueueConfiguration queueConfiguration = new JMSQueueConfigurationImpl(control.getName(), control.getSelector(), !control.isTemporary(), control.getJNDIBinding());
+      JMSQueueConfiguration queueConfiguration = new JMSQueueConfigurationImpl(control.getName(), control.getSelector(), !control.isTemporary(), control.getJNDIBindings());
       config[0] = queueConfiguration;
       config[1] = hornetQServerControl.getAddressSettings(name);
       Set<Role> roles = hornetQServerControl.getSecuritySettings(name);
@@ -180,7 +180,15 @@
       String[] val = new String[names.length];
       for (int i = 0, valLength = val.length; i < valLength; i++)
       {
-         val[i] = control.getClass().getMethod(names[i]).invoke(control).toString();
+         Object o = control.getClass().getMethod(names[i]).invoke(control);
+         if(o instanceof Object[])
+         {
+            val[i] = coomaSeparatedString((Object[]) o);
+         }
+         else
+         {
+            val[i] = o.toString();
+         }
       }
       return val;
    }

Modified: trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/TopicManageMO.java
===================================================================
--- trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/TopicManageMO.java	2010-03-30 06:36:06 UTC (rev 103232)
+++ trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/TopicManageMO.java	2010-03-30 06:37:41 UTC (rev 103233)
@@ -63,7 +63,7 @@
    {
       Object[] config = new Object[3];
       TopicControl control = (TopicControl) managementService.getResource(name);
-      TopicConfiguration topicConfiguration = new TopicConfigurationImpl(control.getName(), control.getJNDIBinding());
+      TopicConfiguration topicConfiguration = new TopicConfigurationImpl(control.getName(), control.getJNDIBindings());
       config[0] = topicConfiguration;
       config[1] = hornetQServerControl.getAddressSettings(name);
       Set<Role> roles = hornetQServerControl.getSecuritySettings(name);
@@ -195,7 +195,15 @@
       String[] val = new String[names.length];
       for (int i = 0, valLength = val.length; i < valLength; i++)
       {
-         val[i] = control.getClass().getMethod(names[i]).invoke(control).toString();
+         Object o = control.getClass().getMethod(names[i]).invoke(control);
+         if(o instanceof Object[])
+         {
+            val[i] = coomaSeparatedString((Object[]) o);
+         }
+         else
+         {
+            val[i] = o.toString();
+         }
       }
       return val;
    }

Modified: trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/template/JAXBJMSConfiguration.java
===================================================================
--- trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/template/JAXBJMSConfiguration.java	2010-03-30 06:36:06 UTC (rev 103232)
+++ trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/template/JAXBJMSConfiguration.java	2010-03-30 06:37:41 UTC (rev 103233)
@@ -53,27 +53,23 @@
    @XmlElement(name="topic", type=JAXBJMSTopicConfiguration.class)
    private List<TopicConfiguration> topics;
    
-   @Override
    public List<ConnectionFactoryConfiguration> getConnectionFactoryConfigurations()
    {
       // TODO Auto-generated method stub
       return null;
    }
 
-   @Override
    public Context getContext()
    {
       // TODO Auto-generated method stub
       return null;
    }
 
-   @Override
    public void setContext(Context arg0)
    {
       // TODO Auto-generated method stub
    }
 
-   @Override
    public List<JMSQueueConfiguration> getQueueConfigurations()
    {
       return queues;
@@ -84,7 +80,6 @@
       this.queues = queues;
    }
 
-   @Override
    public List<TopicConfiguration> getTopicConfigurations()
    {
       return topics;

Modified: trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/template/JAXBJMSQueueConfiguration.java
===================================================================
--- trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/template/JAXBJMSQueueConfiguration.java	2010-03-30 06:36:06 UTC (rev 103232)
+++ trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/template/JAXBJMSQueueConfiguration.java	2010-03-30 06:37:41 UTC (rev 103233)
@@ -50,7 +50,6 @@
    @XmlElement
    private String selector;
    
-   @Override
    public String[] getBindings()
    {
       return bindings;
@@ -61,7 +60,6 @@
       this.bindings = bindings;
    }
    
-   @Override
    public String getName()
    {
       return name;
@@ -72,7 +70,6 @@
       this.name = name;
    }
 
-   @Override
    public String getSelector()
    {
       return selector;
@@ -83,7 +80,6 @@
       this.selector = selector;
    }
 
-   @Override
    public boolean isDurable()
    {
       // TODO Auto-generated method stub

Modified: trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/template/JAXBJMSTopicConfiguration.java
===================================================================
--- trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/template/JAXBJMSTopicConfiguration.java	2010-03-30 06:36:06 UTC (rev 103232)
+++ trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/template/JAXBJMSTopicConfiguration.java	2010-03-30 06:37:41 UTC (rev 103233)
@@ -45,7 +45,6 @@
    @XmlJavaTypeAdapter(BindingEntryAdapter.class)
    private String[] bindings;
 
-   @Override
    public String[] getBindings()
    {
       return bindings;
@@ -56,7 +55,6 @@
       this.bindings = bindings;
    }
    
-   @Override
    public String getName()
    {
       return name;




More information about the jboss-cvs-commits mailing list