Author: adietish
Date: 2011-08-10 05:56:27 -0400 (Wed, 10 Aug 2011)
New Revision: 33757
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7Manager.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7Messages.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7Messages.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/Activator.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/DeploymentOperationResult.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/JBoss7ManagerService.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/ModelDescriptionConstants.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/util/
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/util/AS7ManagerUtil.java
Removed:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/AS7Messages.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/AS7Messages.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/Activator.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7Manager.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7ManagerUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/DeploymentOperationResult.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBoss7ManagerService.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/ModelDescriptionConstants.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/internal/
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/MANIFEST.MF
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/jboss-management-service.xml
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/CommandFormatException.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/CommandLineException.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/DefaultOperationRequestAddress.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/DefaultOperationRequestBuilder.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/OperationFormatException.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/OperationRequestAddress.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/OperationRequestBuilder.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/ValidatingOperationCallbackHandler.java
trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/AS7ManagerIntegrationTest.java
trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/utils/AS7ManagerTestUtils.java
Log:
[JBIDE-9500] corrected package structure to reflect what's being exported/hidden
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/MANIFEST.MF
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/MANIFEST.MF 2011-08-10
09:14:55 UTC (rev 33756)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/MANIFEST.MF 2011-08-10
09:56:27 UTC (rev 33757)
@@ -3,7 +3,7 @@
Bundle-Name: JBoss AS7 management API
Bundle-SymbolicName: org.jboss.ide.eclipse.as.management.as7
Bundle-Version: 2.3.0.qualifier
-Bundle-Activator: org.jboss.ide.eclipse.as.management.as7.Activator
+Bundle-Activator: org.jboss.ide.eclipse.as.internal.management.as7.Activator
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
org.jboss.ide.eclipse.as.core
Bundle-ActivationPolicy: lazy
@@ -20,5 +20,5 @@
xnio-api-3.0.0.Beta3.jar,
xnio-nio-3.0.0.Beta3.jar
Service-Component: META-INF/jboss-management-service.xml
-Export-Package:
org.jboss.ide.eclipse.as.management.as7.deployment;x-friends:="org.jboss.ide.eclipse.as.management.as7.tests"
+Export-Package:
org.jboss.ide.eclipse.as.internal.management.as7;x-friends:="org.jboss.ide.eclipse.as.management.as7.tests"
Bundle-Vendor: JBoss by Red Hat
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/jboss-management-service.xml
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/jboss-management-service.xml 2011-08-10
09:14:55 UTC (rev 33756)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/jboss-management-service.xml 2011-08-10
09:56:27 UTC (rev 33757)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<scr:component
xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0"
name="org.jboss.ide.eclipse.as.management.as7.service">
- <implementation
class="org.jboss.ide.eclipse.as.management.as7.deployment.JBoss7ManagerService"/>
+ <implementation
class="org.jboss.ide.eclipse.as.internal.management.as7.JBoss7ManagerService"/>
<service>
<provide
interface="org.jboss.ide.eclipse.as.core.server.IJBoss7ManagerService"/>
</service>
Copied:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7Manager.java
(from rev 33714,
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7Manager.java)
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7Manager.java
(rev 0)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7Manager.java 2011-08-10
09:56:27 UTC (rev 33757)
@@ -0,0 +1,228 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at
http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.ide.eclipse.as.internal.management.as7;
+
+import static
org.jboss.ide.eclipse.as.internal.management.as7.ModelDescriptionConstants.ADDRESS;
+import static
org.jboss.ide.eclipse.as.internal.management.as7.ModelDescriptionConstants.DEPLOYMENT;
+import static
org.jboss.ide.eclipse.as.internal.management.as7.ModelDescriptionConstants.ENABLED;
+import static
org.jboss.ide.eclipse.as.internal.management.as7.ModelDescriptionConstants.FAILURE_DESCRIPTION;
+import static
org.jboss.ide.eclipse.as.internal.management.as7.ModelDescriptionConstants.NAME;
+import static
org.jboss.ide.eclipse.as.internal.management.as7.ModelDescriptionConstants.OP;
+import static
org.jboss.ide.eclipse.as.internal.management.as7.ModelDescriptionConstants.READ_ATTRIBUTE_OPERATION;
+import static
org.jboss.ide.eclipse.as.internal.management.as7.ModelDescriptionConstants.READ_RESOURCE_OPERATION;
+import static
org.jboss.ide.eclipse.as.internal.management.as7.ModelDescriptionConstants.RESULT;
+import static
org.jboss.ide.eclipse.as.internal.management.as7.ModelDescriptionConstants.SERVER_STATE;
+import static
org.jboss.ide.eclipse.as.internal.management.as7.ModelDescriptionConstants.SHUTDOWN;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.UnknownHostException;
+import java.util.concurrent.Future;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.osgi.util.NLS;
+import org.jboss.as.controller.client.ModelControllerClient;
+import org.jboss.as.controller.client.helpers.standalone.DeploymentAction;
+import org.jboss.as.controller.client.helpers.standalone.DeploymentPlanBuilder;
+import org.jboss.as.controller.client.helpers.standalone.ServerDeploymentManager;
+import org.jboss.as.controller.client.helpers.standalone.ServerDeploymentPlanResult;
+import org.jboss.as.protocol.old.StreamUtils;
+import org.jboss.dmr.ModelNode;
+import org.jboss.ide.eclipse.as.core.server.internal.v7.IJBoss7DeploymentResult;
+import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7DeploymentState;
+import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ManangerException;
+import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ServerState;
+import org.jboss.ide.eclipse.as.internal.management.as7.util.AS7ManagerUtil;
+
+/**
+ * @author André Dietisheim
+ */
+public class AS7Manager {
+
+ public static final int MGMT_PORT = 9999;
+
+ private ModelControllerClient client;
+ private ServerDeploymentManager manager;
+
+ public AS7Manager(String host) throws UnknownHostException {
+ this(host, MGMT_PORT);
+ }
+
+ public AS7Manager(String host, int port) throws UnknownHostException {
+ this.client = ModelControllerClient.Factory.create(host, port);
+ this.manager = ServerDeploymentManager.Factory.create(client);
+ }
+
+ public IJBoss7DeploymentResult undeploySync(String name, IProgressMonitor monitor)
+ throws JBoss7ManangerException {
+ IJBoss7DeploymentResult result = undeploy(name);
+ result.getStatus();
+ return result;
+ }
+
+ public IJBoss7DeploymentResult deploySync(String name, File file, IProgressMonitor
monitor)
+ throws JBoss7ManangerException {
+ IJBoss7DeploymentResult result = deploy(name, file);
+ result.getStatus();
+ return result;
+ }
+
+ public IJBoss7DeploymentResult undeploy(String name) throws JBoss7ManangerException {
+ try {
+ DeploymentPlanBuilder builder = manager.newDeploymentPlan();
+ builder = builder.undeploy(name).andRemoveUndeployed();
+ return new DeploymentOperationResult(builder.getLastAction(),
manager.execute(builder.build()));
+ } catch (Exception e) {
+ throw new JBoss7ManangerException(e);
+ }
+ }
+
+ public IJBoss7DeploymentResult remove(String name) throws JBoss7ManangerException {
+ try {
+ DeploymentPlanBuilder builder = manager.newDeploymentPlan();
+ builder = builder.remove(name);
+ return new DeploymentOperationResult(builder.getLastAction(),
manager.execute(builder.build()));
+ } catch (Exception e) {
+ throw new JBoss7ManangerException(e);
+ }
+ }
+
+ public IJBoss7DeploymentResult deploy(File file) throws JBoss7ManangerException {
+ return deploy(file.getName(), file);
+ }
+
+ public IJBoss7DeploymentResult add(String name, File file) throws
JBoss7ManangerException {
+ try {
+ return execute(manager.newDeploymentPlan().add(name, file));
+ } catch (IOException e) {
+ throw new JBoss7ManangerException(e);
+ }
+ }
+
+ public IJBoss7DeploymentResult deploy(String name, File file) throws
JBoss7ManangerException {
+ try {
+ return execute(manager.newDeploymentPlan().add(name, file).andDeploy());
+ } catch (IOException e) {
+ throw new JBoss7ManangerException(e);
+ }
+ }
+
+ public IJBoss7DeploymentResult replace(File file) throws JBoss7ManangerException {
+ return replace(file.getName(), file);
+ }
+
+ public IJBoss7DeploymentResult replace(String name, File file) throws
JBoss7ManangerException {
+ try {
+ return execute(manager.newDeploymentPlan().replace(name, file));
+ } catch (IOException e) {
+ throw new JBoss7ManangerException(e);
+ }
+ }
+
+ public JBoss7DeploymentState getDeploymentState(String name) throws
JBoss7ManangerException {
+ ModelNode request = new ModelNode();
+ request.get(OP).set(READ_RESOURCE_OPERATION);
+ request.get(ADDRESS).add(DEPLOYMENT, name);
+ ModelNode result = execute(request);
+
+ Boolean enabled = AS7ManagerUtil.getBooleanProperty(ENABLED, result);
+ if (enabled == null) {
+ throw new JBoss7ManangerException(
+ NLS.bind(AS7Messages.ModuleStateEvaluationFailed, name));
+ } else if (enabled) {
+ return JBoss7DeploymentState.STARTED;
+ } else {
+ return JBoss7DeploymentState.STOPPED;
+ }
+ }
+
+ /**
+ * Shuts the server down.
+ *
+ * @throws JBoss7ManangerException
+ */
+ public void stopServer() throws JBoss7ManangerException {
+ ModelNode request = new ModelNode();
+ request.get(OP).set(SHUTDOWN);
+ quietlyExecute(request);
+ }
+
+ public JBoss7ServerState getServerState() throws JBoss7ManangerException {
+ ModelNode request = new ModelNode();
+ request.get(OP).set(READ_ATTRIBUTE_OPERATION);
+ request.get(NAME).set(SERVER_STATE);
+ ModelNode response = execute(request);
+ return toJBoss7ServerState(response);
+ }
+
+ public boolean isRunning() {
+ try {
+ return getServerState() == JBoss7ServerState.RUNNING;
+ } catch (Exception e) {
+ return false;
+ }
+ }
+
+ private JBoss7ServerState toJBoss7ServerState(ModelNode response) throws
JBoss7ManangerException {
+ try {
+ return JBoss7ServerState.valueOfIgnoreCase(response.asString());
+ } catch (IllegalArgumentException e) {
+ throw new JBoss7ManangerException(e);
+ }
+ }
+
+ public void dispose() {
+ StreamUtils.safeClose(client);
+ }
+
+ private ModelNode execute(ModelNode node) throws JBoss7ManangerException {
+ try {
+ ModelNode response = client.execute(node);
+ if (!AS7ManagerUtil.isSuccess(response)) {
+ throw new JBoss7ManangerException(
+ NLS.bind(AS7Messages.OperationOnAddressFailed,
+ new Object[] { node.get(OP),
+ node.get(ADDRESS),
+ response.get(FAILURE_DESCRIPTION) }
+ ));
+ }
+ return response.get(RESULT);
+ } catch (Exception e) {
+ throw new JBoss7ManangerException(e);
+ }
+ }
+
+ public void quietlyExecute(ModelNode node) throws JBoss7ManangerException {
+ try {
+ client.execute(node);
+ } catch (Exception e) {
+ if (!isConnectionCloseException(e)) {
+ throw new JBoss7ManangerException(e);
+ }
+ }
+ }
+
+ private boolean isConnectionCloseException(Exception e) {
+ return e instanceof IOException
+ && e.getMessage() != null
+ && e.getMessage().indexOf("Channel closed") > -1;
+ }
+
+ private IJBoss7DeploymentResult execute(DeploymentPlanBuilder builder) throws
JBoss7ManangerException {
+ try {
+ DeploymentAction action = builder.getLastAction();
+ Future<ServerDeploymentPlanResult> planResult =
manager.execute(builder.build());
+ return new DeploymentOperationResult(action, planResult);
+ } catch (Exception e) {
+ throw new JBoss7ManangerException(e);
+ }
+ }
+}
\ No newline at end of file
Copied:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7Messages.java
(from rev 33712,
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/AS7Messages.java)
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7Messages.java
(rev 0)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7Messages.java 2011-08-10
09:56:27 UTC (rev 33757)
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at
http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.ide.eclipse.as.internal.management.as7;
+
+import org.eclipse.osgi.util.NLS;
+
+public class AS7Messages extends NLS {
+ public static String ModuleStateEvaluationFailed;
+ public static String OperationOnAddressFailed;
+ public static String FailedToBuildOperation;
+ public static String OperationOutcomeToString;
+ public static String OperationOnUnitNotExecuted;
+ public static String OperationOnUnitFailed;
+ public static String OperationOnUnitRolledBack;
+ public static String OperationNotExecConfigRequiresRestart;
+ static {
+ NLS.initializeMessages("org.jboss.ide.eclipse.as.management.as7.AS7Messages",
//$NON-NLS-1$
+ AS7Messages.class);
+ }
+
+}
Copied:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7Messages.properties
(from rev 33712,
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/AS7Messages.properties)
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7Messages.properties
(rev 0)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7Messages.properties 2011-08-10
09:56:27 UTC (rev 33757)
@@ -0,0 +1,8 @@
+ModuleStateEvaluationFailed=Could not evaluate state for deployment {0}
+OperationOnAddressFailed=Could not execute {0} for {1}. Failure was {2}.
+FailedToBuildOperation=Failed to build operation.
+OperationOutcomeToString=Operation outcome is {0}.
+OperationOnUnitNotExecuted=The operation {0} was not executed on unit {1}
+OperationOnUnitFailed=The operation {0} failed for unit {1}
+OperationOnUnitRolledBack=The operation {0} for unit {1} was rolled back
+OperationNotExecConfigRequiresRestart=The operation {0} was not executed on unit {1}. The
server configuration was changed though and the server needs to be restarted.
\ No newline at end of file
Copied:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/Activator.java
(from rev 33712,
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/Activator.java)
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/Activator.java
(rev 0)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/Activator.java 2011-08-10
09:56:27 UTC (rev 33757)
@@ -0,0 +1,54 @@
+package org.jboss.ide.eclipse.as.internal.management.as7;
+
+import org.eclipse.core.runtime.Plugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends Plugin {
+
+ // The plug-in ID
+ public static final String PLUGIN_ID =
"org.jboss.ide.eclipse.as.management.as7"; //$NON-NLS-1$
+
+ // The shared instance
+ private static Activator plugin;
+
+ /**
+ * The constructor
+ */
+ public Activator() {
+ }
+
+ public static BundleContext getContext() {
+ return plugin.getBundle().getBundleContext();
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+ */
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+ plugin = this;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+ */
+ public void stop(BundleContext context) throws Exception {
+ plugin = null;
+ super.stop(context);
+ }
+
+ /**
+ * Returns the shared instance
+ *
+ * @return the shared instance
+ */
+ public static Activator getDefault() {
+ return plugin;
+ }
+
+}
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/CommandFormatException.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/internal/CommandFormatException.java 2011-08-09
08:44:16 UTC (rev 33712)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/CommandFormatException.java 2011-08-10
09:56:27 UTC (rev 33757)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
*/
-package org.jboss.ide.eclipse.as.management.as7.internal;
+package org.jboss.ide.eclipse.as.internal.management.as7;
/**
* @author Alexey Loubyansky
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/CommandLineException.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/internal/CommandLineException.java 2011-08-09
08:44:16 UTC (rev 33712)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/CommandLineException.java 2011-08-10
09:56:27 UTC (rev 33757)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
*/
-package org.jboss.ide.eclipse.as.management.as7.internal;
+package org.jboss.ide.eclipse.as.internal.management.as7;
/**
* @author Alexey Loubyansky
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/DefaultOperationRequestAddress.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/internal/DefaultOperationRequestAddress.java 2011-08-09
08:44:16 UTC (rev 33712)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/DefaultOperationRequestAddress.java 2011-08-10
09:56:27 UTC (rev 33757)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
*/
-package org.jboss.ide.eclipse.as.management.as7.internal;
+package org.jboss.ide.eclipse.as.internal.management.as7;
import java.util.ArrayList;
import java.util.Iterator;
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/DefaultOperationRequestBuilder.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/internal/DefaultOperationRequestBuilder.java 2011-08-09
08:44:16 UTC (rev 33712)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/DefaultOperationRequestBuilder.java 2011-08-10
09:56:27 UTC (rev 33757)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
*/
-package org.jboss.ide.eclipse.as.management.as7.internal;
+package org.jboss.ide.eclipse.as.internal.management.as7;
import java.io.IOException;
import java.util.Iterator;
@@ -28,7 +28,7 @@
import javax.security.auth.callback.UnsupportedCallbackException;
import org.jboss.dmr.ModelNode;
-import org.jboss.ide.eclipse.as.management.as7.internal.OperationRequestAddress.Node;
+import org.jboss.ide.eclipse.as.internal.management.as7.OperationRequestAddress.Node;
/**
*
Copied:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/DeploymentOperationResult.java
(from rev 33712,
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/DeploymentOperationResult.java)
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/DeploymentOperationResult.java
(rev 0)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/DeploymentOperationResult.java 2011-08-10
09:56:27 UTC (rev 33757)
@@ -0,0 +1,95 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at
http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.ide.eclipse.as.internal.management.as7;
+
+import java.text.MessageFormat;
+import java.util.concurrent.Future;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.osgi.util.NLS;
+import org.jboss.as.controller.client.helpers.standalone.DeploymentAction;
+import org.jboss.as.controller.client.helpers.standalone.ServerDeploymentActionResult;
+import org.jboss.as.controller.client.helpers.standalone.ServerDeploymentPlanResult;
+import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ManangerException;
+import org.jboss.ide.eclipse.as.core.server.internal.v7.IJBoss7DeploymentResult;
+
+/**
+ * A class that holds the status of a deployment operation.
+ *
+ * @author André Dietisheim
+ *
+ */
+public class DeploymentOperationResult implements IJBoss7DeploymentResult {
+
+ private Future<ServerDeploymentPlanResult> planResult;
+ private DeploymentAction action;
+
+ DeploymentOperationResult(DeploymentAction action,
Future<ServerDeploymentPlanResult> planResult) {
+ Assert.isNotNull(action);
+ this.action = action;
+ Assert.isNotNull(planResult);
+ this.planResult = planResult;
+ }
+
+ /* (non-Javadoc)
+ * @see
org.jboss.ide.eclipse.as.management.as7.deployment.IDeploymentResult#getStatus()
+ */
+ @Override
+ public IStatus getStatus() throws JBoss7ManangerException {
+ try {
+ ServerDeploymentActionResult actionResult =
planResult.get().getDeploymentActionResult(action.getId());
+ return createStatus(action.getDeploymentUnitUniqueName(), action.getType().name(),
actionResult);
+ } catch (Exception e) {
+ throw new JBoss7ManangerException(e);
+ }
+ }
+
+ private IStatus createStatus(String deploymentName, String actionName,
ServerDeploymentActionResult actionResult) {
+ if (actionResult == null) {
+ return null;
+ }
+
+ IStatus status = null;
+ switch (actionResult.getResult()) {
+ case NOT_EXECUTED:
+ status = createStatus(IStatus.ERROR, NLS.bind(
+ AS7Messages.OperationOnUnitNotExecuted,
+ actionName, deploymentName));
+ break;
+ case EXECUTED:
+ status = Status.OK_STATUS;
+ break;
+ case FAILED:
+ status = createStatus(IStatus.ERROR, NLS.bind(AS7Messages.OperationOnUnitFailed,
+ actionName, deploymentName));
+ break;
+ case ROLLED_BACK:
+ status = createStatus(IStatus.ERROR,
+ NLS.bind(AS7Messages.OperationOnUnitRolledBack,
+ actionName, deploymentName));
+ break;
+ case CONFIGURATION_MODIFIED_REQUIRES_RESTART:
+ status = createStatus(
+ IStatus.WARNING,
+ NLS.bind(AS7Messages.OperationNotExecConfigRequiresRestart,
+ actionName, deploymentName));
+ break;
+ }
+ return status;
+ }
+
+ private IStatus createStatus(int severity, String messagePattern, Object...
messageArguments) {
+ return new Status(severity, Activator.getContext().getBundle().getSymbolicName(),
MessageFormat.format(
+ messagePattern, messageArguments));
+ }
+}
\ No newline at end of file
Property changes on:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/DeploymentOperationResult.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Copied:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/JBoss7ManagerService.java
(from rev 33717,
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBoss7ManagerService.java)
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/JBoss7ManagerService.java
(rev 0)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/JBoss7ManagerService.java 2011-08-10
09:56:27 UTC (rev 33757)
@@ -0,0 +1,81 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at
http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.ide.eclipse.as.internal.management.as7;
+
+import java.io.File;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.jboss.ide.eclipse.as.core.server.IJBoss7ManagerService;
+import org.jboss.ide.eclipse.as.core.server.internal.v7.IJBoss7DeploymentResult;
+import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7DeploymentState;
+import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ServerState;
+
+/**
+ * @author Rob Stryker
+ */
+public class JBoss7ManagerService implements IJBoss7ManagerService {
+
+ public IJBoss7DeploymentResult deployAsync(String host, int port, String
deploymentName,
+ File file, IProgressMonitor monitor) throws Exception {
+ AS7Manager manager = new AS7Manager(host, port);
+ return manager.deploy(deploymentName, file);
+ }
+
+ public IJBoss7DeploymentResult deploySync(String host, int port, String deploymentName,
+ File file, IProgressMonitor monitor) throws Exception {
+ AS7Manager manager = new AS7Manager(host, port);
+ return manager.deploySync(deploymentName, file, monitor);
+ }
+
+ public IJBoss7DeploymentResult undeployAsync(String host, int port, String
deploymentName,
+ boolean removeFile, IProgressMonitor monitor) throws Exception {
+ AS7Manager manager = new AS7Manager(host, port);
+ return manager.undeploy(deploymentName);
+ }
+
+ public IJBoss7DeploymentResult syncUndeploy(String host, int port, String
deploymentName,
+ boolean removeFile, IProgressMonitor monitor) throws Exception {
+ AS7Manager manager = new AS7Manager(host, port);
+ return manager.undeploySync(deploymentName, monitor);
+ }
+
+ public JBoss7DeploymentState getDeploymentState(String host, int port, String
deploymentName) throws Exception {
+ AS7Manager manager = new AS7Manager(host, port);
+ return manager.getDeploymentState(deploymentName);
+ }
+
+ @Deprecated
+ public JBoss7ServerState getServerState(String host) throws Exception {
+ return getServerState(host, AS7Manager.MGMT_PORT);
+ }
+
+ public JBoss7ServerState getServerState(String host, int port) throws Exception {
+ AS7Manager manager = new AS7Manager(host, port);
+ return manager.getServerState();
+ }
+
+ public boolean isRunning(String host, int port) throws Exception {
+ return new AS7Manager(host, port).isRunning();
+ }
+
+ @Deprecated
+ public void stop(String host) throws Exception {
+ stop(host, AS7Manager.MGMT_PORT);
+ }
+
+ public void stop(String host, int port) throws Exception {
+ new AS7Manager(host, port).stopServer();
+ }
+
+ @Override
+ public void dispose() {
+ }
+}
Copied:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/ModelDescriptionConstants.java
(from rev 33712,
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/ModelDescriptionConstants.java)
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/ModelDescriptionConstants.java
(rev 0)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/ModelDescriptionConstants.java 2011-08-10
09:56:27 UTC (rev 33757)
@@ -0,0 +1,184 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at
http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.ide.eclipse.as.internal.management.as7;
+
+
+/**
+ * String constants frequently used in model descriptions.
+ *
+ * @author Brian Stansberry
+ */
+public class ModelDescriptionConstants {
+
+ // KEEP THESE IN ALPHABETICAL ORDER!
+
+ /** The key for {@link AttributeAccess.AccessType} fields. */
+ public static final String ACCESS_TYPE = "access-type";
+ public static final String ADD = "add";
+ public static final String ADD_OPERATION = "add-operation";
+ public static final String ADDRESS = "address";
+ public static final String ANY = "any";
+ public static final String ANY_ADDRESS = "any-address";
+ public static final String ANY_IPV4_ADDRESS = "any-ipv4-address";
+ public static final String ANY_IPV6_ADDRESS = "any-ipv6-address";
+ public static final String ATTRIBUTES = "attributes";
+ public static final String AUTO_START = "auto-start";
+ public static final String BYTES = "bytes";
+ public static final String CANCELLED = "cancelled";
+ public static final String CHILD_TYPE = "child-type";
+ public static final String CHILDREN = "children";
+ public static final String COMPOSITE = "composite";
+ public static final String CONCURRENT_GROUPS = "concurrent-groups";
+ public static final String CPU_AFFINITY = "cpu-affinity";
+ public static final String CRITERIA = "criteria";
+ public static final String COMPENSATING_OPERATION =
"compensating-operation";
+ public static final String DEFAULT = "default";
+ public static final String DESCRIBE = "describe";
+ public static final String DEFAULT_INTERFACE = "default-interface";
+ public static final String DEPLOY = "deploy";
+ public static final String DEPLOYMENT = "deployment";
+ public static final String DEPLOYMENT_SCANNER = "deployment-scanner";
+ public static final String DESCRIPTION = "description";
+ public static final String DISABLE = "disable";
+ public static final String DOMAIN_CONTROLLER = "domain-controller";
+ public static final String DOMAIN_FAILURE_DESCRIPTION =
"domain-failure-description";
+ public static final String DOMAIN_RESULTS = "domain-results";
+ public static final String ENABLE = "enable";
+ public static final String ENABLED = "enabled";
+ public static final String EXTENSION = "extension";
+ public static final String FAILED = "failed";
+ public static final String FAILURE_DESCRIPTION = "failure-description";
+ public static final String FIXED_PORT = "fixed-port";
+ public static final String FULL_REPLACE_DEPLOYMENT =
"full-replace-deployment";
+ public static final String GRACEFUL_SHUTDOWN_TIMEOUT =
"graceful-shutdown-timeout";
+ public static final String GROUP = "group";
+ public static final String HASH = "hash";
+ public static final String HEAD_COMMENT_ALLOWED = "head-comment-allowed";
+ public static final String HTTP_INTERFACE = "http-interface";
+ public static final String HOST = "host";
+ public static final String HOST_FAILURE_DESCRIPTION =
"host-failure-description";
+ public static final String HOST_FAILURE_DESCRIPTIONS =
"host-failure-descriptions";
+ public static final String IGNORED = "ignored";
+ public static final String INCLUDE = "include";
+ public static final String INCLUDES = "includes";
+ public static final String INCLUDE_RUNTIME = "include-runtime";
+ public static final String INET_ADDRESS = "inet-address";
+ public static final String INPUT_STREAM_INDEX = "input-stream-index";
+ public static final String INTERFACE = "interface";
+ public static final String IN_SERIES = "in-series";
+ public static final String JVM = "jvm";
+ public static final String JVM_TYPE = "type";
+ public static final String LOCAL = "local";
+ public static final String LOCALE = "locale";
+ public static final String MANAGEMENT_INTERFACES =
"management-interfaces";
+ public static final String MASK = "mask";
+ public static final String MAX = "max";
+ public static final String MAX_FAILED_SERVERS = "max-failed-servers";
+ public static final String MAX_FAILURE_PERCENTAGE =
"max-failure-percentage";
+ public static final String MAX_LENGTH = "max-length";
+ public static final String MAX_OCCURS = "max-occurs";
+ public static final String MAX_THREADS = "max-threads";
+ public static final String MIN = "min";
+ public static final String MIN_LENGTH = "min-length";
+ public static final String MIN_OCCURS = "min-occurs";
+ public static final String MIN_VALUE = "min-value";
+ public static final String MODEL_DESCRIPTION = "model-description";
+ public static final String MULTICAST_ADDRESS = "multicast-address";
+ public static final String MULTICAST_PORT = "multicast-port";
+ public static final String NAME = "name";
+ public static final String NAMESPACE = "namespace";
+ public static final String NAMESPACES = "namespaces";
+ public static final String NATIVE_INTERFACE = "native-interface";
+ public static final String NETWORK = "network";
+ public static final String NILLABLE = "nillable";
+ public static final String NOT = "not";
+ /** Use this as the standard operation name field in the operation *request*
ModelNode */
+ public static final String OP = "operation";
+ /** Use this standard operation address field in the operation *request* ModelNode
*/
+ public static final String OP_ADDR = "address";
+ public static final String OPERATIONS = "operations";
+ public static final String OPERATION_HEADERS = "operation-headers";
+ /** Use this standard operation address field in the operation *description*
ModelNode */
+ public static final String OPERATION_NAME = "operation-name";
+ public static final String OUTCOME = "outcome";
+ public static final String PATH = "path";
+ public static final String PORT = "port";
+ public static final String PORT_OFFSET = "port-offset";
+ public static final String PRIORITY = "priority";
+ public static final String PROFILE = "profile";
+ public static final String PROFILE_NAME = "profile-name";
+ public static final String READ_ATTRIBUTE_OPERATION = "read-attribute";
+ public static final String READ_CHILDREN_NAMES_OPERATION =
"read-children-names";
+ public static final String READ_CHILDREN_TYPES_OPERATION =
"read-children-types";
+ public static final String READ_CHILDREN_RESOURCES_OPERATION =
"read-children-resources";
+ public static final String READ_CONFIG_AS_XML_OPERATION =
"read-config-as-xml";
+ public static final String READ_OPERATION_DESCRIPTION_OPERATION =
"read-operation-description";
+ public static final String READ_OPERATION_NAMES_OPERATION =
"read-operation-names";
+ public static final String READ_RESOURCE_DESCRIPTION_OPERATION =
"read-resource-description";
+ public static final String READ_RESOURCE_METRICS =
"read-resource-metrics";
+ public static final String READ_RESOURCE_OPERATION = "read-resource";
+ public static final String REDEPLOY = "redeploy";
+ public static final String RELATIVE_TO = "relative-to";
+ public static final String REMOVE = "remove";
+ public static final String REMOTE = "remote";
+ public static final String REPLACE_DEPLOYMENT = "replace-deployment";
+ public static final String REPLY_PROPERTIES = "reply-properties";
+ public static final String REQUEST_PROPERTIES = "request-properties";
+ public static final String RECURSIVE = "recursive";
+ public static final String REQUIRED = "required";
+ public static final String RESPONSE = "response";
+ public static final String RESULT = "result";
+ public static final String ROLLBACK_ACROSS_GROUPS =
"rollback-across-groups";
+ public static final String ROLLBACK_FAILURE_DESCRIPTION =
"rollback-failure-description";
+ public static final String ROLLBACK_ON_RUNTIME_FAILURE =
"rollback-on-runtime-failure";
+ public static final String ROLLED_BACK = "rolled-back";
+ public static final String ROLLING_TO_SERVERS = "rolling-to-servers";
+ public static final String ROLLOUT_PLAN = "rollout-plan";
+ public static final String RUNTIME_NAME = "runtime-name";
+ public static final String RUNNING_SERVER = "server";
+ public static final String SCANNER = "scanner";
+ public static final String SCAN_ENABLED = "scan-enabled";
+ public static final String SCAN_INTERVAL = "scan-interval";
+ public static final String SCHEMA_LOCATION = "schema-location";
+ public static final String SCHEMA_LOCATIONS = "schema-locations";
+ public static final String SERVER = "server";
+ public static final String SERVERS = "servers";
+ public static final String SERVER_CONFIG = "server-config";
+ public static final String SERVER_GROUP = "server-group";
+ public static final String SERVER_GROUPS = "server-groups";
+ public static final String SERVER_OPERATIONS = "server-operations";
+ public static final String SERVER_STATE = "server-state";
+ public static final String SHUTDOWN = "shutdown";
+ public static final String SOCKET_BINDING = "socket-binding";
+ public static final String SOCKET_BINDING_GROUP = "socket-binding-group";
+ public static final String SOCKET_BINDING_GROUP_NAME =
"socket-binding-group-name";
+ public static final String SOCKET_BINDING_PORT_OFFSET =
"socket-binding-port-offset";
+ public static final String START = "start";
+ public static final String STEPS = "steps";
+ /** The key for {@link AttributeAccess.Storage} fields. */
+ public static final String STORAGE = "storage";
+ public static final String SUBSYSTEM = "subsystem";
+ public static final String SUCCESS = "success";
+ public static final String SYSTEM_PROPERTY = "system-property";
+ public static final String SYSTEM_PROPERTIES = "system-properties";
+ public static final String TAIL_COMMENT_ALLOWED = "tail-comment-allowed";
+ public static final String TO_REPLACE = "to-replace";
+ public static final String TYPE = "type";
+ public static final String UNDEPLOY = "undeploy";
+ public static final String UPLOAD_DEPLOYMENT_BYTES =
"upload-deployment-bytes";
+ public static final String UPLOAD_DEPLOYMENT_URL =
"upload-deployment-url";
+ public static final String UPLOAD_DEPLOYMENT_STREAM =
"upload-deployment-stream";
+ public static final String URL = "url";
+ public static final String VALUE = "value";
+ public static final String VALUE_TYPE = "value-type";
+ public static final String WRITE_ATTRIBUTE_OPERATION = "write-attribute";
+
+}
Property changes on:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/ModelDescriptionConstants.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/OperationFormatException.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/internal/OperationFormatException.java 2011-08-09
08:44:16 UTC (rev 33712)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/OperationFormatException.java 2011-08-10
09:56:27 UTC (rev 33757)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
*/
-package org.jboss.ide.eclipse.as.management.as7.internal;
+package org.jboss.ide.eclipse.as.internal.management.as7;
/**
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/OperationRequestAddress.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/internal/OperationRequestAddress.java 2011-08-09
08:44:16 UTC (rev 33712)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/OperationRequestAddress.java 2011-08-10
09:56:27 UTC (rev 33757)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
*/
-package org.jboss.ide.eclipse.as.management.as7.internal;
+package org.jboss.ide.eclipse.as.internal.management.as7;
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/OperationRequestBuilder.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/internal/OperationRequestBuilder.java 2011-08-09
08:44:16 UTC (rev 33712)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/OperationRequestBuilder.java 2011-08-10
09:56:27 UTC (rev 33757)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
*/
-package org.jboss.ide.eclipse.as.management.as7.internal;
+package org.jboss.ide.eclipse.as.internal.management.as7;
import org.jboss.dmr.ModelNode;
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/ValidatingOperationCallbackHandler.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/internal/ValidatingOperationCallbackHandler.java 2011-08-09
08:44:16 UTC (rev 33712)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/ValidatingOperationCallbackHandler.java 2011-08-10
09:56:27 UTC (rev 33757)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
*/
-package org.jboss.ide.eclipse.as.management.as7.internal;
+package org.jboss.ide.eclipse.as.internal.management.as7;
import java.util.regex.Pattern;
Copied:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/util/AS7ManagerUtil.java
(from rev 33712,
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7ManagerUtil.java)
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/util/AS7ManagerUtil.java
(rev 0)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/util/AS7ManagerUtil.java 2011-08-10
09:56:27 UTC (rev 33757)
@@ -0,0 +1,162 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at
http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.ide.eclipse.as.internal.management.as7.util;
+
+import static
org.jboss.ide.eclipse.as.internal.management.as7.ModelDescriptionConstants.CHILD_TYPE;
+import static
org.jboss.ide.eclipse.as.internal.management.as7.ModelDescriptionConstants.DEPLOYMENT;
+import static
org.jboss.ide.eclipse.as.internal.management.as7.ModelDescriptionConstants.FAILURE_DESCRIPTION;
+import static
org.jboss.ide.eclipse.as.internal.management.as7.ModelDescriptionConstants.OUTCOME;
+import static
org.jboss.ide.eclipse.as.internal.management.as7.ModelDescriptionConstants.READ_CHILDREN_NAMES_OPERATION;
+import static
org.jboss.ide.eclipse.as.internal.management.as7.ModelDescriptionConstants.REQUEST_PROPERTIES;
+import static
org.jboss.ide.eclipse.as.internal.management.as7.ModelDescriptionConstants.RESULT;
+import static
org.jboss.ide.eclipse.as.internal.management.as7.ModelDescriptionConstants.SUCCESS;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.osgi.util.NLS;
+import org.jboss.as.controller.client.ModelControllerClient;
+import org.jboss.as.controller.client.Operation;
+import org.jboss.dmr.ModelNode;
+import org.jboss.dmr.ModelType;
+import org.jboss.dmr.Property;
+import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ManangerException;
+import org.jboss.ide.eclipse.as.internal.management.as7.AS7Messages;
+import org.jboss.ide.eclipse.as.internal.management.as7.DefaultOperationRequestBuilder;
+import org.jboss.ide.eclipse.as.internal.management.as7.OperationFormatException;
+
+/**
+ * Various utility methods to deal with the as7 management api.
+ *
+ * @author Alexey Loubyansky
+ * @author André Dietisheim
+ */
+public class AS7ManagerUtil {
+
+ public static boolean isSuccess(ModelNode operationResult) {
+ if (operationResult != null) {
+ ModelNode outcome = operationResult.get(OUTCOME);
+ return outcome != null && outcome.asString().equals(SUCCESS);
+ }
+ return false;
+ }
+
+ public static String getFailureDescription(ModelNode operationResult) {
+ if (operationResult == null) {
+ return null;
+ }
+
+ ModelNode descr = operationResult.get(FAILURE_DESCRIPTION);
+ if (descr == null) {
+ return null;
+ }
+
+ return descr.asString();
+ }
+
+ public static List<String> getList(ModelNode operationResult) {
+ if (!operationResult.hasDefined(RESULT))
+ return Collections.emptyList();
+
+ List<ModelNode> nodeList = operationResult.get(RESULT).asList();
+ if (nodeList.isEmpty())
+ return Collections.emptyList();
+
+ List<String> list = new ArrayList<String>(nodeList.size());
+ for (ModelNode node : nodeList) {
+ list.add(node.asString());
+ }
+ return list;
+ }
+
+ public static List<String> getRequestPropertyNames(ModelNode operationResult) {
+ if (!operationResult.hasDefined(RESULT))
+ return Collections.emptyList();
+
+ ModelNode result = operationResult.get(RESULT);
+ if (!result.hasDefined(REQUEST_PROPERTIES))
+ return Collections.emptyList();
+
+ List<Property> nodeList = result.get(REQUEST_PROPERTIES).asPropertyList();
+ if (nodeList.isEmpty())
+ return Collections.emptyList();
+
+ List<String> list = new ArrayList<String>(nodeList.size());
+ for (Property node : nodeList) {
+ list.add(node.getName());
+ }
+ return list;
+ }
+
+ public static boolean isDeployed(String name, ModelControllerClient client) {
+ return getDeployments(client).contains(name);
+ }
+
+ public static List<String> getDeployments(ModelControllerClient client) {
+
+ DefaultOperationRequestBuilder builder = new DefaultOperationRequestBuilder();
+ final ModelNode request;
+ try {
+ builder.operationName(READ_CHILDREN_NAMES_OPERATION);
+ builder.addProperty(CHILD_TYPE, DEPLOYMENT);
+ request = builder.buildRequest();
+ } catch (OperationFormatException e) {
+ throw new IllegalStateException(AS7Messages.FailedToBuildOperation, e);
+ }
+
+ try {
+ ModelNode outcome = client.execute(request);
+ if (isSuccess(outcome)) {
+ return getList(outcome);
+ }
+ } catch (Exception e) {
+ }
+
+ return Collections.emptyList();
+ }
+
+ public static Boolean getBooleanProperty(String propertyName, ModelNode node) {
+ if (node == null) {
+ return null;
+ }
+ ModelNode valueNode = node.get(propertyName);
+ if (valueNode == null) {
+ return null;
+ }
+ String value = valueNode.toString();
+ if (value == null
+ || valueNode.getType() != ModelType.BOOLEAN) {
+ return null;
+ }
+ return Boolean.valueOf(value);
+ }
+
+ public static ModelNode execute(Operation operation, ModelControllerClient client)
throws JBoss7ManangerException {
+ try {
+ ModelNode result = client.execute(operation);
+ if (result.hasDefined(OUTCOME)
+ && SUCCESS.equals(result.get(OUTCOME).asString())) {
+ return result.get(RESULT);
+ }
+ else if (result.hasDefined(FAILURE_DESCRIPTION)) {
+ throw new JBoss7ManangerException(result.get(FAILURE_DESCRIPTION).toString());
+ }
+ else {
+ throw new JBoss7ManangerException(NLS.bind(
+ AS7Messages.OperationOutcomeToString, result.get(OUTCOME).asString()));
+ }
+ } catch (IOException e) {
+ throw new JBoss7ManangerException(e);
+ }
+ }
+}
\ No newline at end of file
Deleted:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/AS7Messages.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/AS7Messages.java 2011-08-10
09:14:55 UTC (rev 33756)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/AS7Messages.java 2011-08-10
09:56:27 UTC (rev 33757)
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at
http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.ide.eclipse.as.management.as7;
-
-import org.eclipse.osgi.util.NLS;
-
-public class AS7Messages extends NLS {
- public static String ModuleStateEvaluationFailed;
- public static String OperationOnAddressFailed;
- public static String FailedToBuildOperation;
- public static String OperationOutcomeToString;
- public static String OperationOnUnitNotExecuted;
- public static String OperationOnUnitFailed;
- public static String OperationOnUnitRolledBack;
- public static String OperationNotExecConfigRequiresRestart;
- static {
- NLS.initializeMessages("org.jboss.ide.eclipse.as.management.as7.AS7Messages",
//$NON-NLS-1$
- AS7Messages.class);
- }
-
-}
Deleted:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/AS7Messages.properties
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/AS7Messages.properties 2011-08-10
09:14:55 UTC (rev 33756)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/AS7Messages.properties 2011-08-10
09:56:27 UTC (rev 33757)
@@ -1,8 +0,0 @@
-ModuleStateEvaluationFailed=Could not evaluate state for deployment {0}
-OperationOnAddressFailed=Could not execute {0} for {1}. Failure was {2}.
-FailedToBuildOperation=Failed to build operation.
-OperationOutcomeToString=Operation outcome is {0}.
-OperationOnUnitNotExecuted=The operation {0} was not executed on unit {1}
-OperationOnUnitFailed=The operation {0} failed for unit {1}
-OperationOnUnitRolledBack=The operation {0} for unit {1} was rolled back
-OperationNotExecConfigRequiresRestart=The operation {0} was not executed on unit {1}. The
server configuration was changed though and the server needs to be restarted.
\ No newline at end of file
Deleted:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/Activator.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/Activator.java 2011-08-10
09:14:55 UTC (rev 33756)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/Activator.java 2011-08-10
09:56:27 UTC (rev 33757)
@@ -1,54 +0,0 @@
-package org.jboss.ide.eclipse.as.management.as7;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends Plugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID =
"org.jboss.ide.eclipse.as.management.as7"; //$NON-NLS-1$
-
- // The shared instance
- private static Activator plugin;
-
- /**
- * The constructor
- */
- public Activator() {
- }
-
- public static BundleContext getContext() {
- return plugin.getBundle().getBundleContext();
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
-}
Deleted:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7Manager.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7Manager.java 2011-08-10
09:14:55 UTC (rev 33756)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7Manager.java 2011-08-10
09:56:27 UTC (rev 33757)
@@ -1,228 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at
http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.ide.eclipse.as.management.as7.deployment;
-
-import static
org.jboss.ide.eclipse.as.management.as7.deployment.ModelDescriptionConstants.ADDRESS;
-import static
org.jboss.ide.eclipse.as.management.as7.deployment.ModelDescriptionConstants.DEPLOYMENT;
-import static
org.jboss.ide.eclipse.as.management.as7.deployment.ModelDescriptionConstants.ENABLED;
-import static
org.jboss.ide.eclipse.as.management.as7.deployment.ModelDescriptionConstants.FAILURE_DESCRIPTION;
-import static
org.jboss.ide.eclipse.as.management.as7.deployment.ModelDescriptionConstants.NAME;
-import static
org.jboss.ide.eclipse.as.management.as7.deployment.ModelDescriptionConstants.OP;
-import static
org.jboss.ide.eclipse.as.management.as7.deployment.ModelDescriptionConstants.READ_ATTRIBUTE_OPERATION;
-import static
org.jboss.ide.eclipse.as.management.as7.deployment.ModelDescriptionConstants.READ_RESOURCE_OPERATION;
-import static
org.jboss.ide.eclipse.as.management.as7.deployment.ModelDescriptionConstants.RESULT;
-import static
org.jboss.ide.eclipse.as.management.as7.deployment.ModelDescriptionConstants.SERVER_STATE;
-import static
org.jboss.ide.eclipse.as.management.as7.deployment.ModelDescriptionConstants.SHUTDOWN;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.UnknownHostException;
-import java.util.concurrent.Future;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osgi.util.NLS;
-import org.jboss.as.controller.client.ModelControllerClient;
-import org.jboss.as.controller.client.helpers.standalone.DeploymentAction;
-import org.jboss.as.controller.client.helpers.standalone.DeploymentPlanBuilder;
-import org.jboss.as.controller.client.helpers.standalone.ServerDeploymentManager;
-import org.jboss.as.controller.client.helpers.standalone.ServerDeploymentPlanResult;
-import org.jboss.as.protocol.old.StreamUtils;
-import org.jboss.dmr.ModelNode;
-import org.jboss.ide.eclipse.as.core.server.internal.v7.IJBoss7DeploymentResult;
-import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7DeploymentState;
-import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ManangerException;
-import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ServerState;
-import org.jboss.ide.eclipse.as.management.as7.AS7Messages;
-
-/**
- * @author André Dietisheim
- */
-public class AS7Manager {
-
- public static final int MGMT_PORT = 9999;
-
- private ModelControllerClient client;
- private ServerDeploymentManager manager;
-
- public AS7Manager(String host) throws UnknownHostException {
- this(host, MGMT_PORT);
- }
-
- public AS7Manager(String host, int port) throws UnknownHostException {
- this.client = ModelControllerClient.Factory.create(host, port);
- this.manager = ServerDeploymentManager.Factory.create(client);
- }
-
- public IJBoss7DeploymentResult undeploySync(String name, IProgressMonitor monitor)
- throws JBoss7ManangerException {
- IJBoss7DeploymentResult result = undeploy(name);
- result.getStatus();
- return result;
- }
-
- public IJBoss7DeploymentResult deploySync(String name, File file, IProgressMonitor
monitor)
- throws JBoss7ManangerException {
- IJBoss7DeploymentResult result = deploy(name, file);
- result.getStatus();
- return result;
- }
-
- public IJBoss7DeploymentResult undeploy(String name) throws JBoss7ManangerException {
- try {
- DeploymentPlanBuilder builder = manager.newDeploymentPlan();
- builder = builder.undeploy(name).andRemoveUndeployed();
- return new DeploymentOperationResult(builder.getLastAction(),
manager.execute(builder.build()));
- } catch (Exception e) {
- throw new JBoss7ManangerException(e);
- }
- }
-
- public IJBoss7DeploymentResult remove(String name) throws JBoss7ManangerException {
- try {
- DeploymentPlanBuilder builder = manager.newDeploymentPlan();
- builder = builder.remove(name);
- return new DeploymentOperationResult(builder.getLastAction(),
manager.execute(builder.build()));
- } catch (Exception e) {
- throw new JBoss7ManangerException(e);
- }
- }
-
- public IJBoss7DeploymentResult deploy(File file) throws JBoss7ManangerException {
- return deploy(file.getName(), file);
- }
-
- public IJBoss7DeploymentResult add(String name, File file) throws
JBoss7ManangerException {
- try {
- return execute(manager.newDeploymentPlan().add(name, file));
- } catch (IOException e) {
- throw new JBoss7ManangerException(e);
- }
- }
-
- public IJBoss7DeploymentResult deploy(String name, File file) throws
JBoss7ManangerException {
- try {
- return execute(manager.newDeploymentPlan().add(name, file).andDeploy());
- } catch (IOException e) {
- throw new JBoss7ManangerException(e);
- }
- }
-
- public IJBoss7DeploymentResult replace(File file) throws JBoss7ManangerException {
- return replace(file.getName(), file);
- }
-
- public IJBoss7DeploymentResult replace(String name, File file) throws
JBoss7ManangerException {
- try {
- return execute(manager.newDeploymentPlan().replace(name, file));
- } catch (IOException e) {
- throw new JBoss7ManangerException(e);
- }
- }
-
- public JBoss7DeploymentState getDeploymentState(String name) throws
JBoss7ManangerException {
- ModelNode request = new ModelNode();
- request.get(OP).set(READ_RESOURCE_OPERATION);
- request.get(ADDRESS).add(DEPLOYMENT, name);
- ModelNode result = execute(request);
-
- Boolean enabled = AS7ManagerUtil.getBooleanProperty(ENABLED, result);
- if (enabled == null) {
- throw new JBoss7ManangerException(
- NLS.bind(AS7Messages.ModuleStateEvaluationFailed, name));
- } else if (enabled) {
- return JBoss7DeploymentState.STARTED;
- } else {
- return JBoss7DeploymentState.STOPPED;
- }
- }
-
- /**
- * Shuts the server down.
- *
- * @throws JBoss7ManangerException
- */
- public void stopServer() throws JBoss7ManangerException {
- ModelNode request = new ModelNode();
- request.get(OP).set(SHUTDOWN);
- quietlyExecute(request);
- }
-
- public JBoss7ServerState getServerState() throws JBoss7ManangerException {
- ModelNode request = new ModelNode();
- request.get(OP).set(READ_ATTRIBUTE_OPERATION);
- request.get(NAME).set(SERVER_STATE);
- ModelNode response = execute(request);
- return toJBoss7ServerState(response);
- }
-
- public boolean isRunning() {
- try {
- return getServerState() == JBoss7ServerState.RUNNING;
- } catch (Exception e) {
- return false;
- }
- }
-
- private JBoss7ServerState toJBoss7ServerState(ModelNode response) throws
JBoss7ManangerException {
- try {
- return JBoss7ServerState.valueOfIgnoreCase(response.asString());
- } catch (IllegalArgumentException e) {
- throw new JBoss7ManangerException(e);
- }
- }
-
- public void dispose() {
- StreamUtils.safeClose(client);
- }
-
- private ModelNode execute(ModelNode node) throws JBoss7ManangerException {
- try {
- ModelNode response = client.execute(node);
- if (!AS7ManagerUtil.isSuccess(response)) {
- throw new JBoss7ManangerException(
- NLS.bind(AS7Messages.OperationOnAddressFailed,
- new Object[] { node.get(OP),
- node.get(ADDRESS),
- response.get(FAILURE_DESCRIPTION) }
- ));
- }
- return response.get(RESULT);
- } catch (Exception e) {
- throw new JBoss7ManangerException(e);
- }
- }
-
- public void quietlyExecute(ModelNode node) throws JBoss7ManangerException {
- try {
- client.execute(node);
- } catch (Exception e) {
- if (!isConnectionCloseException(e)) {
- throw new JBoss7ManangerException(e);
- }
- }
- }
-
- private boolean isConnectionCloseException(Exception e) {
- return e instanceof IOException
- && e.getMessage() != null
- && e.getMessage().indexOf("Channel closed") > -1;
- }
-
- private IJBoss7DeploymentResult execute(DeploymentPlanBuilder builder) throws
JBoss7ManangerException {
- try {
- DeploymentAction action = builder.getLastAction();
- Future<ServerDeploymentPlanResult> planResult =
manager.execute(builder.build());
- return new DeploymentOperationResult(action, planResult);
- } catch (Exception e) {
- throw new JBoss7ManangerException(e);
- }
- }
-}
\ No newline at end of file
Deleted:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7ManagerUtil.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7ManagerUtil.java 2011-08-10
09:14:55 UTC (rev 33756)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7ManagerUtil.java 2011-08-10
09:56:27 UTC (rev 33757)
@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at
http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.ide.eclipse.as.management.as7.deployment;
-
-import static
org.jboss.ide.eclipse.as.management.as7.deployment.ModelDescriptionConstants.CHILD_TYPE;
-import static
org.jboss.ide.eclipse.as.management.as7.deployment.ModelDescriptionConstants.DEPLOYMENT;
-import static
org.jboss.ide.eclipse.as.management.as7.deployment.ModelDescriptionConstants.FAILURE_DESCRIPTION;
-import static
org.jboss.ide.eclipse.as.management.as7.deployment.ModelDescriptionConstants.OUTCOME;
-import static
org.jboss.ide.eclipse.as.management.as7.deployment.ModelDescriptionConstants.READ_CHILDREN_NAMES_OPERATION;
-import static
org.jboss.ide.eclipse.as.management.as7.deployment.ModelDescriptionConstants.REQUEST_PROPERTIES;
-import static
org.jboss.ide.eclipse.as.management.as7.deployment.ModelDescriptionConstants.RESULT;
-import static
org.jboss.ide.eclipse.as.management.as7.deployment.ModelDescriptionConstants.SUCCESS;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.osgi.util.NLS;
-import org.jboss.as.controller.client.ModelControllerClient;
-import org.jboss.as.controller.client.Operation;
-import org.jboss.dmr.ModelNode;
-import org.jboss.dmr.ModelType;
-import org.jboss.dmr.Property;
-import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ManangerException;
-import org.jboss.ide.eclipse.as.management.as7.AS7Messages;
-import org.jboss.ide.eclipse.as.management.as7.internal.DefaultOperationRequestBuilder;
-import org.jboss.ide.eclipse.as.management.as7.internal.OperationFormatException;
-
-/**
- * Various utility methods to deal with the as7 management api.
- *
- * @author Alexey Loubyansky
- * @author André Dietisheim
- */
-public class AS7ManagerUtil {
-
- public static boolean isSuccess(ModelNode operationResult) {
- if (operationResult != null) {
- ModelNode outcome = operationResult.get(OUTCOME);
- return outcome != null && outcome.asString().equals(SUCCESS);
- }
- return false;
- }
-
- public static String getFailureDescription(ModelNode operationResult) {
- if (operationResult == null) {
- return null;
- }
-
- ModelNode descr = operationResult.get(FAILURE_DESCRIPTION);
- if (descr == null) {
- return null;
- }
-
- return descr.asString();
- }
-
- public static List<String> getList(ModelNode operationResult) {
- if (!operationResult.hasDefined(RESULT))
- return Collections.emptyList();
-
- List<ModelNode> nodeList = operationResult.get(RESULT).asList();
- if (nodeList.isEmpty())
- return Collections.emptyList();
-
- List<String> list = new ArrayList<String>(nodeList.size());
- for (ModelNode node : nodeList) {
- list.add(node.asString());
- }
- return list;
- }
-
- public static List<String> getRequestPropertyNames(ModelNode operationResult) {
- if (!operationResult.hasDefined(RESULT))
- return Collections.emptyList();
-
- ModelNode result = operationResult.get(RESULT);
- if (!result.hasDefined(REQUEST_PROPERTIES))
- return Collections.emptyList();
-
- List<Property> nodeList = result.get(REQUEST_PROPERTIES).asPropertyList();
- if (nodeList.isEmpty())
- return Collections.emptyList();
-
- List<String> list = new ArrayList<String>(nodeList.size());
- for (Property node : nodeList) {
- list.add(node.getName());
- }
- return list;
- }
-
- public static boolean isDeployed(String name, ModelControllerClient client) {
- return getDeployments(client).contains(name);
- }
-
- public static List<String> getDeployments(ModelControllerClient client) {
-
- DefaultOperationRequestBuilder builder = new DefaultOperationRequestBuilder();
- final ModelNode request;
- try {
- builder.operationName(READ_CHILDREN_NAMES_OPERATION);
- builder.addProperty(CHILD_TYPE, DEPLOYMENT);
- request = builder.buildRequest();
- } catch (OperationFormatException e) {
- throw new IllegalStateException(AS7Messages.FailedToBuildOperation, e);
- }
-
- try {
- ModelNode outcome = client.execute(request);
- if (isSuccess(outcome)) {
- return getList(outcome);
- }
- } catch (Exception e) {
- }
-
- return Collections.emptyList();
- }
-
- public static Boolean getBooleanProperty(String propertyName, ModelNode node) {
- if (node == null) {
- return null;
- }
- ModelNode valueNode = node.get(propertyName);
- if (valueNode == null) {
- return null;
- }
- String value = valueNode.toString();
- if (value == null
- || valueNode.getType() != ModelType.BOOLEAN) {
- return null;
- }
- return Boolean.valueOf(value);
- }
-
- public static ModelNode execute(Operation operation, ModelControllerClient client)
throws JBoss7ManangerException {
- try {
- ModelNode result = client.execute(operation);
- if (result.hasDefined(OUTCOME)
- && SUCCESS.equals(result.get(OUTCOME).asString())) {
- return result.get(RESULT);
- }
- else if (result.hasDefined(FAILURE_DESCRIPTION)) {
- throw new JBoss7ManangerException(result.get(FAILURE_DESCRIPTION).toString());
- }
- else {
- throw new JBoss7ManangerException(NLS.bind(
- AS7Messages.OperationOutcomeToString, result.get(OUTCOME).asString()));
- }
- } catch (IOException e) {
- throw new JBoss7ManangerException(e);
- }
- }
-}
\ No newline at end of file
Deleted:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/DeploymentOperationResult.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/DeploymentOperationResult.java 2011-08-10
09:14:55 UTC (rev 33756)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/DeploymentOperationResult.java 2011-08-10
09:56:27 UTC (rev 33757)
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at
http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.ide.eclipse.as.management.as7.deployment;
-
-import java.text.MessageFormat;
-import java.util.concurrent.Future;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osgi.util.NLS;
-import org.jboss.as.controller.client.helpers.standalone.DeploymentAction;
-import org.jboss.as.controller.client.helpers.standalone.ServerDeploymentActionResult;
-import org.jboss.as.controller.client.helpers.standalone.ServerDeploymentPlanResult;
-import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ManangerException;
-import org.jboss.ide.eclipse.as.core.server.internal.v7.IJBoss7DeploymentResult;
-import org.jboss.ide.eclipse.as.management.as7.AS7Messages;
-import org.jboss.ide.eclipse.as.management.as7.Activator;
-
-/**
- * A class that holds the status of a deployment operation.
- *
- * @author André Dietisheim
- *
- */
-public class DeploymentOperationResult implements IJBoss7DeploymentResult {
-
- private Future<ServerDeploymentPlanResult> planResult;
- private DeploymentAction action;
-
- DeploymentOperationResult(DeploymentAction action,
Future<ServerDeploymentPlanResult> planResult) {
- Assert.isNotNull(action);
- this.action = action;
- Assert.isNotNull(planResult);
- this.planResult = planResult;
- }
-
- /* (non-Javadoc)
- * @see
org.jboss.ide.eclipse.as.management.as7.deployment.IDeploymentResult#getStatus()
- */
- @Override
- public IStatus getStatus() throws JBoss7ManangerException {
- try {
- ServerDeploymentActionResult actionResult =
planResult.get().getDeploymentActionResult(action.getId());
- return createStatus(action.getDeploymentUnitUniqueName(), action.getType().name(),
actionResult);
- } catch (Exception e) {
- throw new JBoss7ManangerException(e);
- }
- }
-
- private IStatus createStatus(String deploymentName, String actionName,
ServerDeploymentActionResult actionResult) {
- if (actionResult == null) {
- return null;
- }
-
- IStatus status = null;
- switch (actionResult.getResult()) {
- case NOT_EXECUTED:
- status = createStatus(IStatus.ERROR, NLS.bind(
- AS7Messages.OperationOnUnitNotExecuted,
- actionName, deploymentName));
- break;
- case EXECUTED:
- status = Status.OK_STATUS;
- break;
- case FAILED:
- status = createStatus(IStatus.ERROR, NLS.bind(AS7Messages.OperationOnUnitFailed,
- actionName, deploymentName));
- break;
- case ROLLED_BACK:
- status = createStatus(IStatus.ERROR,
- NLS.bind(AS7Messages.OperationOnUnitRolledBack,
- actionName, deploymentName));
- break;
- case CONFIGURATION_MODIFIED_REQUIRES_RESTART:
- status = createStatus(
- IStatus.WARNING,
- NLS.bind(AS7Messages.OperationNotExecConfigRequiresRestart,
- actionName, deploymentName));
- break;
- }
- return status;
- }
-
- private IStatus createStatus(int severity, String messagePattern, Object...
messageArguments) {
- return new Status(severity, Activator.getContext().getBundle().getSymbolicName(),
MessageFormat.format(
- messagePattern, messageArguments));
- }
-}
\ No newline at end of file
Deleted:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBoss7ManagerService.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBoss7ManagerService.java 2011-08-10
09:14:55 UTC (rev 33756)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBoss7ManagerService.java 2011-08-10
09:56:27 UTC (rev 33757)
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at
http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.ide.eclipse.as.management.as7.deployment;
-
-import java.io.File;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.jboss.ide.eclipse.as.core.server.IJBoss7ManagerService;
-import org.jboss.ide.eclipse.as.core.server.internal.v7.IJBoss7DeploymentResult;
-import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7DeploymentState;
-import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ServerState;
-
-/**
- * @author Rob Stryker
- */
-public class JBoss7ManagerService implements IJBoss7ManagerService {
-
- public IJBoss7DeploymentResult deployAsync(String host, int port, String
deploymentName,
- File file, IProgressMonitor monitor) throws Exception {
- AS7Manager manager = new AS7Manager(host, port);
- return manager.deploy(deploymentName, file);
- }
-
- public IJBoss7DeploymentResult deploySync(String host, int port, String deploymentName,
- File file, IProgressMonitor monitor) throws Exception {
- AS7Manager manager = new AS7Manager(host, port);
- return manager.deploySync(deploymentName, file, monitor);
- }
-
- public IJBoss7DeploymentResult undeployAsync(String host, int port, String
deploymentName,
- boolean removeFile, IProgressMonitor monitor) throws Exception {
- AS7Manager manager = new AS7Manager(host, port);
- return manager.undeploy(deploymentName);
- }
-
- public IJBoss7DeploymentResult syncUndeploy(String host, int port, String
deploymentName,
- boolean removeFile, IProgressMonitor monitor) throws Exception {
- AS7Manager manager = new AS7Manager(host, port);
- return manager.undeploySync(deploymentName, monitor);
- }
-
- public JBoss7DeploymentState getDeploymentState(String host, int port, String
deploymentName) throws Exception {
- AS7Manager manager = new AS7Manager(host, port);
- return manager.getDeploymentState(deploymentName);
- }
-
- @Deprecated
- public JBoss7ServerState getServerState(String host) throws Exception {
- return getServerState(host, AS7Manager.MGMT_PORT);
- }
-
- public JBoss7ServerState getServerState(String host, int port) throws Exception {
- AS7Manager manager = new AS7Manager(host, port);
- return manager.getServerState();
- }
-
- public boolean isRunning(String host, int port) throws Exception {
- return new AS7Manager(host, port).isRunning();
- }
-
- @Deprecated
- public void stop(String host) throws Exception {
- stop(host, AS7Manager.MGMT_PORT);
- }
-
- public void stop(String host, int port) throws Exception {
- new AS7Manager(host, port).stopServer();
- }
-
- @Override
- public void dispose() {
- }
-}
Deleted:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/ModelDescriptionConstants.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/ModelDescriptionConstants.java 2011-08-10
09:14:55 UTC (rev 33756)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/ModelDescriptionConstants.java 2011-08-10
09:56:27 UTC (rev 33757)
@@ -1,180 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at
http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.ide.eclipse.as.management.as7.deployment;
-
-
-/**
- * String constants frequently used in model descriptions.
- *
- * @author Brian Stansberry
- */
-public class ModelDescriptionConstants {
-
- // KEEP THESE IN ALPHABETICAL ORDER!
-
- /** The key for {@link AttributeAccess.AccessType} fields. */
- public static final String ACCESS_TYPE = "access-type";
- public static final String ADD = "add";
- public static final String ADD_OPERATION = "add-operation";
- public static final String ADDRESS = "address";
- public static final String ANY = "any";
- public static final String ANY_ADDRESS = "any-address";
- public static final String ANY_IPV4_ADDRESS = "any-ipv4-address";
- public static final String ANY_IPV6_ADDRESS = "any-ipv6-address";
- public static final String ATTRIBUTES = "attributes";
- public static final String AUTO_START = "auto-start";
- public static final String BYTES = "bytes";
- public static final String CANCELLED = "cancelled";
- public static final String CHILD_TYPE = "child-type";
- public static final String CHILDREN = "children";
- public static final String COMPOSITE = "composite";
- public static final String CONCURRENT_GROUPS = "concurrent-groups";
- public static final String CPU_AFFINITY = "cpu-affinity";
- public static final String CRITERIA = "criteria";
- public static final String COMPENSATING_OPERATION =
"compensating-operation";
- public static final String DEFAULT = "default";
- public static final String DESCRIBE = "describe";
- public static final String DEFAULT_INTERFACE = "default-interface";
- public static final String DEPLOY = "deploy";
- public static final String DEPLOYMENT = "deployment";
- public static final String DESCRIPTION = "description";
- public static final String DISABLE = "disable";
- public static final String DOMAIN_CONTROLLER = "domain-controller";
- public static final String DOMAIN_FAILURE_DESCRIPTION =
"domain-failure-description";
- public static final String DOMAIN_RESULTS = "domain-results";
- public static final String ENABLE = "enable";
- public static final String ENABLED = "enabled";
- public static final String EXTENSION = "extension";
- public static final String FAILED = "failed";
- public static final String FAILURE_DESCRIPTION = "failure-description";
- public static final String FIXED_PORT = "fixed-port";
- public static final String FULL_REPLACE_DEPLOYMENT =
"full-replace-deployment";
- public static final String GRACEFUL_SHUTDOWN_TIMEOUT =
"graceful-shutdown-timeout";
- public static final String GROUP = "group";
- public static final String HASH = "hash";
- public static final String HEAD_COMMENT_ALLOWED = "head-comment-allowed";
- public static final String HTTP_INTERFACE = "http-interface";
- public static final String HOST = "host";
- public static final String HOST_FAILURE_DESCRIPTION =
"host-failure-description";
- public static final String HOST_FAILURE_DESCRIPTIONS =
"host-failure-descriptions";
- public static final String IGNORED = "ignored";
- public static final String INCLUDE = "include";
- public static final String INCLUDES = "includes";
- public static final String INCLUDE_RUNTIME = "include-runtime";
- public static final String INET_ADDRESS = "inet-address";
- public static final String INPUT_STREAM_INDEX = "input-stream-index";
- public static final String INTERFACE = "interface";
- public static final String IN_SERIES = "in-series";
- public static final String JVM = "jvm";
- public static final String JVM_TYPE = "type";
- public static final String LOCAL = "local";
- public static final String LOCALE = "locale";
- public static final String MANAGEMENT_INTERFACES =
"management-interfaces";
- public static final String MASK = "mask";
- public static final String MAX = "max";
- public static final String MAX_FAILED_SERVERS = "max-failed-servers";
- public static final String MAX_FAILURE_PERCENTAGE =
"max-failure-percentage";
- public static final String MAX_LENGTH = "max-length";
- public static final String MAX_OCCURS = "max-occurs";
- public static final String MAX_THREADS = "max-threads";
- public static final String MIN = "min";
- public static final String MIN_LENGTH = "min-length";
- public static final String MIN_OCCURS = "min-occurs";
- public static final String MIN_VALUE = "min-value";
- public static final String MODEL_DESCRIPTION = "model-description";
- public static final String MULTICAST_ADDRESS = "multicast-address";
- public static final String MULTICAST_PORT = "multicast-port";
- public static final String NAME = "name";
- public static final String NAMESPACE = "namespace";
- public static final String NAMESPACES = "namespaces";
- public static final String NATIVE_INTERFACE = "native-interface";
- public static final String NETWORK = "network";
- public static final String NILLABLE = "nillable";
- public static final String NOT = "not";
- /** Use this as the standard operation name field in the operation *request*
ModelNode */
- public static final String OP = "operation";
- /** Use this standard operation address field in the operation *request* ModelNode
*/
- public static final String OP_ADDR = "address";
- public static final String OPERATIONS = "operations";
- public static final String OPERATION_HEADERS = "operation-headers";
- /** Use this standard operation address field in the operation *description*
ModelNode */
- public static final String OPERATION_NAME = "operation-name";
- public static final String OUTCOME = "outcome";
- public static final String PATH = "path";
- public static final String PORT = "port";
- public static final String PORT_OFFSET = "port-offset";
- public static final String PRIORITY = "priority";
- public static final String PROFILE = "profile";
- public static final String PROFILE_NAME = "profile-name";
- public static final String READ_ATTRIBUTE_OPERATION = "read-attribute";
- public static final String READ_CHILDREN_NAMES_OPERATION =
"read-children-names";
- public static final String READ_CHILDREN_TYPES_OPERATION =
"read-children-types";
- public static final String READ_CHILDREN_RESOURCES_OPERATION =
"read-children-resources";
- public static final String READ_CONFIG_AS_XML_OPERATION =
"read-config-as-xml";
- public static final String READ_OPERATION_DESCRIPTION_OPERATION =
"read-operation-description";
- public static final String READ_OPERATION_NAMES_OPERATION =
"read-operation-names";
- public static final String READ_RESOURCE_DESCRIPTION_OPERATION =
"read-resource-description";
- public static final String READ_RESOURCE_METRICS =
"read-resource-metrics";
- public static final String READ_RESOURCE_OPERATION = "read-resource";
- public static final String REDEPLOY = "redeploy";
- public static final String RELATIVE_TO = "relative-to";
- public static final String REMOVE = "remove";
- public static final String REMOTE = "remote";
- public static final String REPLACE_DEPLOYMENT = "replace-deployment";
- public static final String REPLY_PROPERTIES = "reply-properties";
- public static final String REQUEST_PROPERTIES = "request-properties";
- public static final String RECURSIVE = "recursive";
- public static final String REQUIRED = "required";
- public static final String RESPONSE = "response";
- public static final String RESULT = "result";
- public static final String ROLLBACK_ACROSS_GROUPS =
"rollback-across-groups";
- public static final String ROLLBACK_FAILURE_DESCRIPTION =
"rollback-failure-description";
- public static final String ROLLBACK_ON_RUNTIME_FAILURE =
"rollback-on-runtime-failure";
- public static final String ROLLED_BACK = "rolled-back";
- public static final String ROLLING_TO_SERVERS = "rolling-to-servers";
- public static final String ROLLOUT_PLAN = "rollout-plan";
- public static final String RUNTIME_NAME = "runtime-name";
- public static final String RUNNING_SERVER = "server";
- public static final String SCHEMA_LOCATION = "schema-location";
- public static final String SCHEMA_LOCATIONS = "schema-locations";
- public static final String SERVER = "server";
- public static final String SERVERS = "servers";
- public static final String SERVER_CONFIG = "server-config";
- public static final String SERVER_GROUP = "server-group";
- public static final String SERVER_GROUPS = "server-groups";
- public static final String SERVER_OPERATIONS = "server-operations";
- public static final String SERVER_STATE = "server-state";
- public static final String SHUTDOWN = "shutdown";
- public static final String SOCKET_BINDING = "socket-binding";
- public static final String SOCKET_BINDING_GROUP = "socket-binding-group";
- public static final String SOCKET_BINDING_GROUP_NAME =
"socket-binding-group-name";
- public static final String SOCKET_BINDING_PORT_OFFSET =
"socket-binding-port-offset";
- public static final String START = "start";
- public static final String STEPS = "steps";
- /** The key for {@link AttributeAccess.Storage} fields. */
- public static final String STORAGE = "storage";
- public static final String SUBSYSTEM = "subsystem";
- public static final String SUCCESS = "success";
- public static final String SYSTEM_PROPERTY = "system-property";
- public static final String SYSTEM_PROPERTIES = "system-properties";
- public static final String TAIL_COMMENT_ALLOWED = "tail-comment-allowed";
- public static final String TO_REPLACE = "to-replace";
- public static final String TYPE = "type";
- public static final String UNDEPLOY = "undeploy";
- public static final String UPLOAD_DEPLOYMENT_BYTES =
"upload-deployment-bytes";
- public static final String UPLOAD_DEPLOYMENT_URL =
"upload-deployment-url";
- public static final String UPLOAD_DEPLOYMENT_STREAM =
"upload-deployment-stream";
- public static final String URL = "url";
- public static final String VALUE = "value";
- public static final String VALUE_TYPE = "value-type";
- public static final String WRITE_ATTRIBUTE_OPERATION = "write-attribute";
-
-}
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/AS7ManagerIntegrationTest.java
===================================================================
---
trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/AS7ManagerIntegrationTest.java 2011-08-10
09:14:55 UTC (rev 33756)
+++
trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/AS7ManagerIntegrationTest.java 2011-08-10
09:56:27 UTC (rev 33757)
@@ -26,8 +26,8 @@
import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7DeploymentState;
import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ManangerException;
import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ServerState;
+import org.jboss.ide.eclipse.as.internal.management.as7.AS7Manager;
import org.jboss.ide.eclipse.as.internal.management.as7.tests.utils.AS7ManagerTestUtils;
-import org.jboss.ide.eclipse.as.management.as7.deployment.AS7Manager;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/utils/AS7ManagerTestUtils.java
===================================================================
---
trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/utils/AS7ManagerTestUtils.java 2011-08-10
09:14:55 UTC (rev 33756)
+++
trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/utils/AS7ManagerTestUtils.java 2011-08-10
09:56:27 UTC (rev 33757)
@@ -27,7 +27,7 @@
import org.eclipse.core.runtime.Platform;
import org.jboss.ide.eclipse.as.core.server.internal.v7.IJBoss7DeploymentResult;
import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ManangerException;
-import org.jboss.ide.eclipse.as.management.as7.deployment.AS7Manager;
+import org.jboss.ide.eclipse.as.internal.management.as7.AS7Manager;
import org.osgi.framework.Bundle;
/**