[jboss-cvs] JBossAS SVN: r109731 - branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms.

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

Author: ataylor
Date: 2010-12-06 12:41:57 -0500 (Mon, 06 Dec 2010)
New Revision: 109731

Modified:
   branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/ConnectionFactoryManageMO.java
   branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/ConnectionFactoryMapper.java
Log:
hornetq integration changes

Modified: branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/ConnectionFactoryManageMO.java
===================================================================
--- branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/ConnectionFactoryManageMO.java	2010-12-06 17:19:54 UTC (rev 109730)
+++ branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/ConnectionFactoryManageMO.java	2010-12-06 17:41:57 UTC (rev 109731)
@@ -105,6 +105,7 @@
            @ManagementParameter(name = "name", description = "the connection factory name"),
            @ManagementParameter(name = "ha", description = "does the connection factory support high availibility"),
            @ManagementParameter(name = "useDiscovery", description = "should we use a discovery group configuration or a connector configuration"),
+           @ManagementParameter(name = "cfType", description = "the type of connection factory"),
            @ManagementParameter(name = "connectorNames", description = "comma-separated list of connectors to uses"),
            @ManagementParameter(name = "bindings", description = "comma-separated list of JNDI bindings"),
            @ManagementParameter(name = "clientId", description = "the client id"),

Modified: branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/ConnectionFactoryMapper.java
===================================================================
--- branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/ConnectionFactoryMapper.java	2010-12-06 17:19:54 UTC (rev 109730)
+++ branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/ConnectionFactoryMapper.java	2010-12-06 17:41:57 UTC (rev 109731)
@@ -46,6 +46,9 @@
    {
       String[] itemNames = {
             "name",
+            "ha",
+            "useDiscovery",
+            "cfType",
             "connectorNames",
             "Bindings",
             "ClientID",
@@ -80,6 +83,9 @@
       };
       String[] itemDescriptions = {
             "name",
+            "ha",
+            "useDiscovery",
+            "cfType",
             "connectorNames",
             "Bindings",
             "ClientID",
@@ -144,6 +150,9 @@
             SimpleMetaType.STRING,
             SimpleMetaType.STRING,
             SimpleMetaType.STRING,
+            SimpleMetaType.STRING,
+            SimpleMetaType.STRING,
+            SimpleMetaType.STRING,
             SimpleMetaType.STRING
       };
       TYPE = new ImmutableCompositeMetaType("javax.jms.ConnectionFactory", "Connection Factory Settings",
@@ -175,7 +184,10 @@
       {
          connectorNames.append(groupConfiguration.getName());
       }
-
+      cvs.set("ha", new SimpleValueSupport(SimpleMetaType.STRING, control.isHA()));
+      cvs.set("useDiscovery", new SimpleValueSupport(SimpleMetaType.STRING, control.getDiscoveryGroupConfiguration() != null));
+      //todo uncomment on next HornetQ release
+      //cvs.set("cfType", new SimpleValueSupport(SimpleMetaType.STRING, control.getFactoryType()));
       cvs.set("connectorNames", new SimpleValueSupport(SimpleMetaType.STRING, connectorNames));
       cvs.set("Bindings", new SimpleValueSupport(SimpleMetaType.STRING, getJndiString(control.getJNDIBindings())));
       cvs.set("ClientID", new SimpleValueSupport(SimpleMetaType.STRING, control.getClientID()));