ServerRemove should remove, not add

jbossas · Mar 15, 2011 · 8f9c4c0 · 8f9c4c0
1 parent 1ecc882
commit 8f9c4c0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/demos/src/main/java/org/jboss/as/demos/domain/interactive/runner/ExampleRunner.java b/demos/src/main/java/org/jboss/as/demos/domain/interactive/runner/ExampleRunner.java
@@ -513,7 +513,7 @@ private boolean removeServer() throws Exception {
             op.get("operation").set("remove");
             ModelNode address = op.get("address");
             address.add("host", server.getHostName());
-            address.add("server-config", server.getServerGroupName());
+            address.add("server-config", server.getServerName());
             boolean success = true;
             try {
                 executeForResult(OperationBuilder.Factory.create(op).build());

diff --git a/...controller/src/main/java/org/jboss/as/host/controller/operations/ServerRemoveHandler.java b/...controller/src/main/java/org/jboss/as/host/controller/operations/ServerRemoveHandler.java
@@ -19,18 +19,18 @@
 package org.jboss.as.host.controller.operations;
 
 
-import org.jboss.as.controller.BasicOperationResult;
-import org.jboss.as.controller.OperationFailedException;
-import org.jboss.as.controller.OperationResult;
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.GROUP;
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.NAME;
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR;
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.REMOVE;
 
 import java.util.Locale;
 
-import org.jboss.as.controller.ModelAddOperationHandler;
+import org.jboss.as.controller.BasicOperationResult;
+import org.jboss.as.controller.ModelRemoveOperationHandler;
 import org.jboss.as.controller.OperationContext;
+import org.jboss.as.controller.OperationFailedException;
+import org.jboss.as.controller.OperationResult;
 import org.jboss.as.controller.ResultHandler;
 import org.jboss.as.controller.descriptions.DescriptionProvider;
 import org.jboss.as.controller.descriptions.common.InterfaceDescription;
@@ -41,7 +41,7 @@
 * @author <a href="kabir.khan@jboss.com">Kabir Khan</a>
 * @version $Revision: 1.1 $
 */
-public class ServerRemoveHandler implements ModelAddOperationHandler, DescriptionProvider {
+public class ServerRemoveHandler implements ModelRemoveOperationHandler, DescriptionProvider {
 
     public static final String OPERATION_NAME = REMOVE;