AS7-1772 Add a hornetq-server level to the messaging subsystem mgmt r…

…esource tree
jbossas · Sep 14, 2011 · 4b3fab9 · 4b3fab9
1 parent d7aae12
commit 4b3fab9
Show file tree

Hide file tree

Showing 29 changed files with 862 additions and 459 deletions.
diff --git a/cli/src/main/java/org/jboss/as/cli/handlers/jms/CreateJmsResourceHandler.java b/cli/src/main/java/org/jboss/as/cli/handlers/jms/CreateJmsResourceHandler.java
@@ -100,6 +100,7 @@ public ModelNode buildRequest(CommandContext ctx) throws OperationFormatExceptio
         }
 
         String name = null;
+        String serverName = "default"; // TODO read server name from props
         final Map<String, String> props;
         if(propsStr != null) {
             props = new HashMap<String, String>();
@@ -134,6 +135,7 @@ public ModelNode buildRequest(CommandContext ctx) throws OperationFormatExceptio
 
             DefaultOperationRequestBuilder builder = new DefaultOperationRequestBuilder();
             builder.addNode("subsystem", "messaging");
+            builder.addNode("hornetq-server", serverName);
             builder.addNode("jms-queue", name);
             builder.setOperationName("add");
             builder.getModelNode().get("entries").add(jndiName);
@@ -148,6 +150,7 @@ public ModelNode buildRequest(CommandContext ctx) throws OperationFormatExceptio
 
             DefaultOperationRequestBuilder builder = new DefaultOperationRequestBuilder();
             builder.addNode("subsystem", "messaging");
+            builder.addNode("hornetq-server", serverName);
             builder.addNode("jms-topic", name);
             builder.setOperationName("add");
             builder.getModelNode().get("entries").add(jndiName);
@@ -164,6 +167,7 @@ public ModelNode buildRequest(CommandContext ctx) throws OperationFormatExceptio
 
             DefaultOperationRequestBuilder builder = new DefaultOperationRequestBuilder();
             builder.addNode("subsystem", "messaging");
+            builder.addNode("hornetq-server", serverName);
             builder.addNode("connection-factory", name);
             builder.setOperationName("add");
             builder.getModelNode().get("entries").add(jndiName);

diff --git a/cli/src/main/java/org/jboss/as/cli/handlers/jms/DeleteJmsResourceHandler.java b/cli/src/main/java/org/jboss/as/cli/handlers/jms/DeleteJmsResourceHandler.java
@@ -55,6 +55,7 @@ public ModelNode buildRequest(CommandContext ctx)
 
         //String target = null;
         String jndiName = null;
+        String serverName = "default"; // TODO read server name from props
 
         String[] args = ctx.getArgumentsString().split("\\s+");
         int i = 0;
@@ -87,6 +88,7 @@ public ModelNode buildRequest(CommandContext ctx)
 
         DefaultOperationRequestBuilder builder = new DefaultOperationRequestBuilder();
         builder.addNode("subsystem", "messaging");
+        builder.addNode("hornetq-server", serverName);
         builder.addNode(resource, jndiName);
         builder.setOperationName("remove");
         return builder.buildRequest();

diff --git a/cli/src/main/java/org/jboss/as/cli/handlers/jms/JmsCFAddHandler.java b/cli/src/main/java/org/jboss/as/cli/handlers/jms/JmsCFAddHandler.java
@@ -130,7 +130,11 @@ public ModelNode buildRequest(CommandContext ctx) throws CommandFormatException
             builder.addNode("profile",profile);
         }
 
+
+        String serverName = "default"; // TODO read server name from props
+
         builder.addNode("subsystem", "messaging");
+        builder.addNode("hornetq-server", serverName);
         builder.setOperationName("add");
 
         final String name = this.name.getValue(args, true);

diff --git a/cli/src/main/java/org/jboss/as/cli/handlers/jms/JmsCFRemoveHandler.java b/cli/src/main/java/org/jboss/as/cli/handlers/jms/JmsCFRemoveHandler.java
@@ -98,6 +98,7 @@ public boolean canAppearNext(CommandContext ctx) throws CommandFormatException {
     public ModelNode buildRequest(CommandContext ctx) throws CommandFormatException {
 
         final String name = this.name.getValue(ctx.getParsedCommandLine(), true);
+        String serverName = "default"; // TODO read server name from props
 
         DefaultOperationRequestBuilder builder = new DefaultOperationRequestBuilder();
         if(ctx.isDomainMode()) {
@@ -108,6 +109,7 @@ public ModelNode buildRequest(CommandContext ctx) throws CommandFormatException
             builder.addNode("profile", profile);
         }
         builder.addNode("subsystem", "messaging");
+        builder.addNode("hornetq-server", serverName);
         builder.addNode("connection-factory", name);
         builder.setOperationName("remove");
 

diff --git a/cli/src/main/java/org/jboss/as/cli/handlers/jms/JmsQueueAddHandler.java b/cli/src/main/java/org/jboss/as/cli/handlers/jms/JmsQueueAddHandler.java
@@ -102,8 +102,10 @@ public ModelNode buildRequest(CommandContext ctx) throws CommandFormatException
         }
 
         final String name = this.name.getValue(args, true);
+        String serverName = "default"; // TODO read server name from props
 
         builder.addNode("subsystem", "messaging");
+        builder.addNode("hornetq-server", serverName);
         builder.addNode("jms-queue", name);
         builder.setOperationName("add");
 

diff --git a/cli/src/main/java/org/jboss/as/cli/handlers/jms/JmsQueueRemoveHandler.java b/cli/src/main/java/org/jboss/as/cli/handlers/jms/JmsQueueRemoveHandler.java
@@ -108,8 +108,10 @@ public ModelNode buildRequest(CommandContext ctx) throws CommandFormatException
         }
 
         final String name = this.name.getValue(ctx.getParsedCommandLine(), true);
+        String serverName = "default"; // TODO read server name from props
 
         builder.addNode("subsystem", "messaging");
+        builder.addNode("hornetq-server", serverName);
         builder.addNode("jms-queue", name);
         builder.setOperationName("remove");
 

diff --git a/cli/src/main/java/org/jboss/as/cli/handlers/jms/JmsTopicAddHandler.java b/cli/src/main/java/org/jboss/as/cli/handlers/jms/JmsTopicAddHandler.java
@@ -94,8 +94,10 @@ public ModelNode buildRequest(CommandContext ctx) throws CommandFormatException
         }
 
         final String name = this.name.getValue(args, true);
+        String serverName = "default"; // TODO read server name from props
 
         builder.addNode("subsystem", "messaging");
+        builder.addNode("hornetq-server", serverName);
         builder.addNode("jms-topic", name);
         builder.setOperationName("add");
 

diff --git a/cli/src/main/java/org/jboss/as/cli/handlers/jms/JmsTopicRemoveHandler.java b/cli/src/main/java/org/jboss/as/cli/handlers/jms/JmsTopicRemoveHandler.java
@@ -108,8 +108,10 @@ public ModelNode buildRequest(CommandContext ctx) throws CommandFormatException
         }
 
         final String name = this.name.getValue(ctx.getParsedCommandLine(), true);
+        String serverName = "default"; // TODO read server name from props
 
         builder.addNode("subsystem", "messaging");
+        builder.addNode("hornetq-server", serverName);
         builder.addNode("jms-topic", name);
         builder.setOperationName("remove");
 

diff --git a/demos/legacy/src/main/java/org/jboss/as/demos/client/jms/runner/ExampleRunner.java b/demos/legacy/src/main/java/org/jboss/as/demos/client/jms/runner/ExampleRunner.java
@@ -67,6 +67,7 @@ public static void main(String[] args) throws Exception {
             ModelNode op = new ModelNode();
             op.get("operation").set("add");
             op.get("address").add("subsystem", "messaging");
+            op.get("address").add("hornetq-server", "default");
             op.get("address").add("jms-queue", QUEUE_NAME);
             op.get("entries").add(QUEUE_NAME);
             applyUpdate(op, client);
@@ -125,6 +126,7 @@ public void onMessage(Message message) {
                 ModelNode op = new ModelNode();
                 op.get("operation").set("remove");
                 op.get("address").add("subsystem", "messaging");
+                op.get("address").add("hornetq-server", "default");
                 op.get("address").add("jms-queue", QUEUE_NAME);
                 applyUpdate(op, client);
             }

diff --git a/demos/legacy/src/main/java/org/jboss/as/demos/client/messaging/runner/ExampleRunner.java b/demos/legacy/src/main/java/org/jboss/as/demos/client/messaging/runner/ExampleRunner.java
@@ -71,6 +71,7 @@ public static void main(String[] args) throws Exception {
             ModelNode op = new ModelNode();
             op.get("operation").set("add");
             op.get("address").add("subsystem", "messaging");
+            op.get("address").add("hornetq-server", "default");
             op.get("address").add("queue", queueName);
             op.get("queue-address").set(queueName);
             applyUpdate(op, client);
@@ -106,6 +107,7 @@ public static void main(String[] args) throws Exception {
             op = new ModelNode();
             op.get("operation").set("remove");
             op.get("address").add("subsystem", "messaging");
+            op.get("address").add("hornetq-server", "default");
             op.get("address").add("queue", queueName);
             applyUpdate(op, client);
 

diff --git a/demos/legacy/src/main/java/org/jboss/as/demos/domain/interactive/runner/ExampleRunner.java b/demos/legacy/src/main/java/org/jboss/as/demos/domain/interactive/runner/ExampleRunner.java
@@ -21,42 +21,21 @@
  */
 package org.jboss.as.demos.domain.interactive.runner;
 
-import org.jboss.as.controller.client.Operation;
-import org.jboss.as.controller.client.OperationBuilder;
-import org.jboss.as.controller.client.helpers.domain.DeploymentActionsCompleteBuilder;
-import org.jboss.as.controller.client.helpers.domain.DeploymentPlan;
-import org.jboss.as.controller.client.helpers.domain.DeploymentPlanBuilder;
-import org.jboss.as.controller.client.helpers.domain.DeploymentPlanResult;
-import org.jboss.as.controller.client.helpers.domain.DomainClient;
-import org.jboss.as.controller.client.helpers.domain.DomainDeploymentManager;
-import org.jboss.as.controller.client.helpers.domain.ServerGroupDeploymentPlanBuilder;
-import org.jboss.as.controller.client.helpers.domain.ServerIdentity;
-import org.jboss.as.controller.client.helpers.domain.ServerStatus;
-import org.jboss.as.controller.client.helpers.domain.UndeployDeploymentPlanBuilder;
-import org.jboss.as.controller.descriptions.ModelDescriptionConstants;
-import org.jboss.as.demos.DemoAuthentication;
-import org.jboss.as.demos.DomainDeploymentUtils;
-import org.jboss.as.demos.fakejndi.FakeJndi;
-import org.jboss.dmr.ModelNode;
-import org.jboss.dmr.Property;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADD;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.GROUP;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.HOST;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.PORT;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.PORT_OFFSET;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.READ_RESOURCE_OPERATION;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.RECURSIVE;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SERVER_CONFIG;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SERVER_GROUPS;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SOCKET_BINDING;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SOCKET_BINDING_GROUP;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SOCKET_BINDING_PORT_OFFSET;
 
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueReceiver;
-import javax.jms.QueueSender;
-import javax.jms.QueueSession;
-import javax.jms.TextMessage;
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-import javax.management.remote.JMXConnectorFactory;
-import javax.management.remote.JMXServiceURL;
-import javax.swing.JFileChooser;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.plaf.metal.MetalLookAndFeel;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -80,7 +59,42 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
-import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.*;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+import javax.jms.Queue;
+import javax.jms.QueueConnection;
+import javax.jms.QueueConnectionFactory;
+import javax.jms.QueueReceiver;
+import javax.jms.QueueSender;
+import javax.jms.QueueSession;
+import javax.jms.TextMessage;
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+import javax.management.remote.JMXConnectorFactory;
+import javax.management.remote.JMXServiceURL;
+import javax.swing.JFileChooser;
+import javax.swing.filechooser.FileNameExtensionFilter;
+import javax.swing.plaf.metal.MetalLookAndFeel;
+
+import org.jboss.as.controller.client.Operation;
+import org.jboss.as.controller.client.OperationBuilder;
+import org.jboss.as.controller.client.helpers.domain.DeploymentActionsCompleteBuilder;
+import org.jboss.as.controller.client.helpers.domain.DeploymentPlan;
+import org.jboss.as.controller.client.helpers.domain.DeploymentPlanBuilder;
+import org.jboss.as.controller.client.helpers.domain.DeploymentPlanResult;
+import org.jboss.as.controller.client.helpers.domain.DomainClient;
+import org.jboss.as.controller.client.helpers.domain.DomainDeploymentManager;
+import org.jboss.as.controller.client.helpers.domain.ServerGroupDeploymentPlanBuilder;
+import org.jboss.as.controller.client.helpers.domain.ServerIdentity;
+import org.jboss.as.controller.client.helpers.domain.ServerStatus;
+import org.jboss.as.controller.client.helpers.domain.UndeployDeploymentPlanBuilder;
+import org.jboss.as.controller.descriptions.ModelDescriptionConstants;
+import org.jboss.as.demos.DemoAuthentication;
+import org.jboss.as.demos.DomainDeploymentUtils;
+import org.jboss.as.demos.fakejndi.FakeJndi;
+import org.jboss.dmr.ModelNode;
+import org.jboss.dmr.Property;
 
 /**
  * Demonstration of basic aspects of administering servers via the domain management API.
@@ -965,6 +979,7 @@ private boolean addJmsQueue() throws Exception {
         final ModelNode address = new ModelNode();
         address.add(ModelDescriptionConstants.PROFILE, "default");
         address.add(ModelDescriptionConstants.SUBSYSTEM, "messaging");
+        address.add("hornetq-server", "default");
         address.add("jms-queue", queueName);
 
         final ModelNode queueAddOperation = new ModelNode();

diff --git a/messaging/src/main/java/org/jboss/as/messaging/CommonAttributes.java b/messaging/src/main/java/org/jboss/as/messaging/CommonAttributes.java
@@ -528,6 +528,7 @@ public interface CommonAttributes {
     String SECURITY_SETTING ="security-setting";
     String SECURITY_SETTINGS ="security-settings";
     String SEND_XML_NAME ="send";
+    String HORNETQ_SERVER = "hornetq-server";
     String STARTED = "started";
     String STATIC_CONNECTORS = "static-connectors";
     String STRING ="string";
@@ -592,4 +593,5 @@ public interface CommonAttributes {
 
     String[] PATHS = new String[] {CommonAttributes.BINDINGS_DIRECTORY, CommonAttributes.JOURNAL_DIRECTORY, CommonAttributes.LARGE_MESSAGES_DIRECTORY, CommonAttributes.PAGING_DIRECTORY};
 
+
 }