Author: adietish Date: 2011-08-10 09:15:56 -0400 (Wed, 10 Aug 2011) New Revision: 33764 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/IJBoss7DeploymentResult.java trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/IJBoss7ManagerService.java trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7DeploymentState.java trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ManagerServiceProxy.java trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ManagerUtil.java trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ManangerConnectException.java trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ManangerException.java trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ServerState.java Removed: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBoss7ManagerService.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/IJBoss7DeploymentResult.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7DeploymentState.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServiceProxy.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerUtil.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManangerConnectException.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManangerException.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerState.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java 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/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/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/util/AS7ManagerUtil.java trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.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/JBossManagementServiceTest.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 trunk/as/tests/org.jboss.ide.eclipse.as.test/META-INF/MANIFEST.MF trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/JBossManagerTest.java Log: [JBIDE-9500] corrected package naming, package export/hiding, moved classes to correct place (from core to managent.as7) Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF 2011-08-10 13:05:14 UTC (rev 33763) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF 2011-08-10 13:15:56 UTC (rev 33764) @@ -44,3 +44,4 @@ . Bundle-Vendor: %Bundle-Vendor.0 Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Import-Package: org.jboss.ide.eclipse.as.management.as7 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java 2011-08-10 13:05:14 UTC (rev 33763) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java 2011-08-10 13:15:56 UTC (rev 33764) @@ -92,8 +92,6 @@ public static String ExtensionManager_could_not_load_publishers; public static String PublishRenameFailure; - public static String JBoss7ServerState_noEnumForString; - static { NLS.initializeMessages(BUNDLE_NAME, Messages.class); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties 2011-08-10 13:05:14 UTC (rev 33763) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties 2011-08-10 13:15:56 UTC (rev 33764) @@ -70,5 +70,3 @@ JMXScannerCanceled=JBossTools was unable to contact the JBoss deployment scanner in a reasonable amount of time. This step has been skipped. ConnectingToServerViaJMX=Connecting to {0} via JMX ExtensionManager_could_not_load_publishers=Could not load publishers - -JBoss7ServerState_noEnumForString="No JBoss7ServerState enum for string {0}" Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBoss7ManagerService.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBoss7ManagerService.java 2011-08-10 13:05:14 UTC (rev 33763) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBoss7ManagerService.java 2011-08-10 13:15:56 UTC (rev 33764) @@ -1,159 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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.core.server; - -import java.io.File; - -import org.eclipse.core.runtime.IProgressMonitor; -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; - -public interface IJBoss7ManagerService { - - public static final String AS_VERSION_PROPERTY = "as.version"; //$NON-NLS-1$ - - public static final String AS_VERSION_700 = "700"; //$NON-NLS-1$ - - /** - * Asynchronously deploy a file to a server - * @param host - * - * The host - * @param port - * The port - * @param name - * The deployment's name - * @param file - * The file to be deployed - * @param monitor - * The progress monitor - * - * @return Not sure what to return yet - * @throws Exception - */ - public IJBoss7DeploymentResult deployAsync(String host, int port, - String deploymentName, File file, IProgressMonitor monitor) throws Exception; - - /** - * Synchronously deploy a file to a server - * - * @param host - * The host - * @param port - * The port - * @param name - * The deployment's name - * @param file - * The file to be deployed - * @param monitor - * The progress monitor - * - * @return Not sure what to return yet - * @throws Exception - */ - public IJBoss7DeploymentResult deploySync(String host, int port, - String deploymentName, File file, IProgressMonitor monitor) throws Exception; - - /** - * Asynchronously undeploy a file to a server - * - * @param host - * The host - * @param port - * The port - * @param name - * The deployment's name - * @param file - * The file to be deployed - * @param monitor - * The progress monitor - * - * @return Not sure what to return yet - * @throws Exception - */ - public IJBoss7DeploymentResult undeployAsync(String host, int port, - String deploymentName, boolean removeFile, IProgressMonitor monitor) throws Exception; - - /** - * Synchronously undeploy a file to a server - * - * @param host - * The host - * @param port - * The port - * @param name - * The deployment's name - * @param file - * The file to be deployed - * @param monitor - * The progress monitor - * - * @return Not sure what to return yet - * @throws Exception - */ - public IJBoss7DeploymentResult syncUndeploy(String host, int port, - String deploymentName, boolean removeFile, IProgressMonitor monitor) throws Exception; - - /** - * Returns the state for a given deployment name on a given host and port. - * - * @param host - * the host to query - * @param port - * the port to contact it on - * @param deploymentName - * the name of the deployment that shall be queried - * - * @return the state of the deployment - * @throws Exception - */ - public JBoss7DeploymentState getDeploymentState(String host, int port, String deploymentName) throws Exception; - - /** - * Returns the state of the server - * - * @param host the server to query - * @param port the port to communicate on - * @return the state of the server - * - * @throws Exception - */ - public JBoss7ServerState getServerState(String host, int port) throws Exception; - - /** - * Returns <code>true</code> if the server is running, <code>false</code> - * otherwise. - * - * @param host the server to to query - * @param port the port to communicate on - * @return true if it's running, false otherwise - * @throws Exception - */ - public boolean isRunning(String host, int port) throws Exception; - - @Deprecated - public JBoss7ServerState getServerState(String host) throws Exception; - - /** - * Stops the given server - * - * @throws JBoss7ManangerException - * @throws Exception - */ - public void stop(String host, int port) throws Exception; - - @Deprecated - public void stop(String host) throws Exception; - - public void dispose(); -} Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/IJBoss7DeploymentResult.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/IJBoss7DeploymentResult.java 2011-08-10 13:05:14 UTC (rev 33763) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/IJBoss7DeploymentResult.java 2011-08-10 13:15:56 UTC (rev 33764) @@ -1,19 +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.core.server.internal.v7; - -import org.eclipse.core.runtime.IStatus; - -public interface IJBoss7DeploymentResult { - - public abstract IStatus getStatus() throws JBoss7ManangerException; - -} \ No newline at end of file Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7DeploymentState.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7DeploymentState.java 2011-08-10 13:05:14 UTC (rev 33763) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7DeploymentState.java 2011-08-10 13:15:56 UTC (rev 33764) @@ -1,22 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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.core.server.internal.v7; - - -/** - * An enum that reflects the state of a deployment. - * - * @author André Dietisheim - */ -public enum JBoss7DeploymentState { - STARTED , - STOPPED; -} \ No newline at end of file Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2011-08-10 13:05:14 UTC (rev 33763) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2011-08-10 13:15:56 UTC (rev 33764) @@ -20,12 +20,15 @@ import org.eclipse.core.runtime.Status; import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; -import org.jboss.ide.eclipse.as.core.server.IJBoss7ManagerService; import org.jboss.ide.eclipse.as.core.server.IServerStatePoller; import org.jboss.ide.eclipse.as.core.server.IServerStatePoller2; import org.jboss.ide.eclipse.as.core.server.internal.PollThread; import org.jboss.ide.eclipse.as.core.server.internal.ServerStatePollerType; -import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ManagerUtil.IServiceAware; +import org.jboss.ide.eclipse.as.management.as7.IJBoss7ManagerService; +import org.jboss.ide.eclipse.as.management.as7.JBoss7ManagerUtil; +import org.jboss.ide.eclipse.as.management.as7.JBoss7ManangerConnectException; +import org.jboss.ide.eclipse.as.management.as7.JBoss7ServerState; +import org.jboss.ide.eclipse.as.management.as7.JBoss7ManagerUtil.IServiceAware; /** * @author André Dietisheim Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServiceProxy.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServiceProxy.java 2011-08-10 13:05:14 UTC (rev 33763) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServiceProxy.java 2011-08-10 13:15:56 UTC (rev 33764) @@ -1,97 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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.core.server.internal.v7; - -import java.io.File; -import java.text.MessageFormat; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.jboss.ide.eclipse.as.core.server.IJBoss7ManagerService; -import org.osgi.framework.BundleContext; -import org.osgi.framework.InvalidSyntaxException; -import org.osgi.util.tracker.ServiceTracker; - -/** - * @author André Dietisheim - */ -public class JBoss7ManagerServiceProxy extends ServiceTracker<IJBoss7ManagerService, IJBoss7ManagerService> - implements IJBoss7ManagerService { - - public JBoss7ManagerServiceProxy(BundleContext context, String asVersion) throws InvalidSyntaxException { - super( - context, - context.createFilter(MessageFormat - .format("(&(objectClass={0})(as.version={1}))", IJBoss7ManagerService.class.getCanonicalName(), asVersion)), null); //$NON-NLS-1$ - } - - public IJBoss7DeploymentResult deployAsync(String host, int port, String deploymentName, File file, - IProgressMonitor monitor) throws Exception { - return checkedGetService().deployAsync(host, port, deploymentName, file, monitor); - } - - public IJBoss7DeploymentResult deploySync(String host, int port, String deploymentName, File file, - IProgressMonitor monitor) throws Exception { - return checkedGetService().deployAsync(host, port, deploymentName, file, monitor); - } - - public IJBoss7DeploymentResult undeployAsync(String host, int port, String deploymentName, boolean removeFile, - IProgressMonitor monitor) throws Exception { - return checkedGetService().undeployAsync(host, port, deploymentName, removeFile, monitor); - } - - public IJBoss7DeploymentResult syncUndeploy(String host, int port, String deploymentName, boolean removeFile, - IProgressMonitor monitor) throws Exception { - return checkedGetService().syncUndeploy(host, port, deploymentName, removeFile, monitor); - } - - public JBoss7DeploymentState getDeploymentState(String host, int port, String deploymentName) throws Exception { - return checkedGetService().getDeploymentState(host, port, deploymentName); - } - - public JBoss7ServerState getServerState(String host, int port) throws Exception { - return checkedGetService().getServerState(host, port); - } - - public boolean isRunning(String host, int port) throws Exception { - try { - return checkedGetService().isRunning(host, port); - } catch (Exception e) { - return false; - } - } - - @Deprecated - public JBoss7ServerState getServerState(String host) throws Exception { - return checkedGetService().getServerState(host); - } - - public void stop(String host, int port) throws Exception { - checkedGetService().stop(host, port); - } - - @Deprecated - public void stop(String host) throws Exception { - checkedGetService().stop(host); - } - - private IJBoss7ManagerService checkedGetService() throws JBoss7ManangerException { - IJBoss7ManagerService service = getService(); - if (service == null) { - throw new JBoss7ManangerException("Could not acquire JBoss Management service"); //$NON-NLS-1$ - } - return service; - } - - public void dispose() { - close(); - } - -} Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerUtil.java 2011-08-10 13:05:14 UTC (rev 33763) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerUtil.java 2011-08-10 13:15:56 UTC (rev 33764) @@ -1,61 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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.core.server.internal.v7; - -import org.eclipse.wst.server.core.IServer; -import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; -import org.jboss.ide.eclipse.as.core.server.IJBoss7ManagerService; -import org.osgi.framework.BundleContext; - -public class JBoss7ManagerUtil { - - private static final String JBOSS7_RUNTIME = "org.jboss.ide.eclipse.as.runtime.70"; //$NON-NLS-1$ - - public static IJBoss7ManagerService getService(IServer server) throws Exception { - BundleContext context = JBossServerCorePlugin.getContext(); - JBoss7ManagerServiceProxy proxy = new JBoss7ManagerServiceProxy(context, getRequiredVersion(server)); - proxy.open(); - return proxy; - } - - private static String getRequiredVersion(IServer server) { - String id = server.getRuntime().getRuntimeType().getId(); - if (JBOSS7_RUNTIME.equals(id)) { - return IJBoss7ManagerService.AS_VERSION_700; - } - return null; - } - - public static void dispose(IJBoss7ManagerService service) { - if (service != null) { - service.dispose(); - } - } - - public static <RESULT> RESULT executeWithService(IServiceAware<RESULT> serviceAware, IServer server) throws Exception { - IJBoss7ManagerService service = null; - try { - service = JBoss7ManagerUtil.getService(server); - return serviceAware.execute(service); - } finally { - if (service != null) { - service.dispose(); - } - } - } - - public static interface IServiceAware<RESULT> { - - public RESULT execute(IJBoss7ManagerService service) throws Exception; - - } - -} Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManangerConnectException.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManangerConnectException.java 2011-08-10 13:05:14 UTC (rev 33763) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManangerConnectException.java 2011-08-10 13:15:56 UTC (rev 33764) @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 Red Hat Inc.. - * All rights reserved. This program and the accompanying materials - * are 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 Incorporated - initial API and implementation - *******************************************************************************/ -package org.jboss.ide.eclipse.as.core.server.internal.v7; - -/** - * @author André Dietisheim - */ -public class JBoss7ManangerConnectException extends JBoss7ManangerException { - - private static final long serialVersionUID = 1L; - - public JBoss7ManangerConnectException(Throwable cause) { - super(cause); - } - -} Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManangerException.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManangerException.java 2011-08-10 13:05:14 UTC (rev 33763) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManangerException.java 2011-08-10 13:15:56 UTC (rev 33764) @@ -1,32 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 Red Hat Inc.. - * All rights reserved. This program and the accompanying materials - * are 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 Incorporated - initial API and implementation - *******************************************************************************/ -package org.jboss.ide.eclipse.as.core.server.internal.v7; - -/** - * @author André Dietisheim - */ -public class JBoss7ManangerException extends Exception { - - private static final long serialVersionUID = 1L; - - public JBoss7ManangerException(String message, Throwable cause) { - super(message, cause); - } - - public JBoss7ManangerException(Throwable cause) { - super(cause); - } - - public JBoss7ManangerException(String message) { - super(message); - } - -} Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerState.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerState.java 2011-08-10 13:05:14 UTC (rev 33763) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerState.java 2011-08-10 13:15:56 UTC (rev 33764) @@ -1,41 +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.core.server.internal.v7; - -import java.text.MessageFormat; - -import org.jboss.ide.eclipse.as.core.Messages; - -/** - * @author André Dietisheim - */ -public enum JBoss7ServerState { - STARTING, RUNNING, RESTART_REQUIRED; - - public static JBoss7ServerState valueOfIgnoreCase(String stateString) { - JBoss7ServerState matchingState = null; - if (stateString != null && stateString.length() > 0) { - for (JBoss7ServerState availableState : values()) { - if (stateString.equalsIgnoreCase(availableState.name())) { - matchingState = availableState; - break; - } - } - } - if (matchingState == null) { - throw new IllegalArgumentException(MessageFormat.format( - Messages.JBoss7ServerState_noEnumForString, - stateString)); - } - - return matchingState; - } -} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java 2011-08-10 13:05:14 UTC (rev 33763) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java 2011-08-10 13:15:56 UTC (rev 33764) @@ -17,11 +17,12 @@ import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; import org.jboss.ide.eclipse.as.core.Messages; import org.jboss.ide.eclipse.as.core.extensions.polling.WebPortPoller; -import org.jboss.ide.eclipse.as.core.server.IJBoss7ManagerService; import org.jboss.ide.eclipse.as.core.server.IServerStatePoller; import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossBehaviorDelegate; import org.jboss.ide.eclipse.as.core.util.PollThreadUtils; import org.jboss.ide.eclipse.as.core.util.ServerConverter; +import org.jboss.ide.eclipse.as.management.as7.IJBoss7ManagerService; +import org.jboss.ide.eclipse.as.management.as7.JBoss7ManagerUtil; public class LocalJBoss7BehaviorDelegate extends LocalJBossBehaviorDelegate { 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 13:05:14 UTC (rev 33763) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/MANIFEST.MF 2011-08-10 13:15:56 UTC (rev 33764) @@ -5,7 +5,7 @@ Bundle-Version: 2.3.0.qualifier 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 + org.eclipse.wst.server.core;bundle-version="1.1.302" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ClassPath: ., @@ -20,5 +20,6 @@ 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.internal.management.as7;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", + org.jboss.ide.eclipse.as.management.as7 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 13:05:14 UTC (rev 33763) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/jboss-management-service.xml 2011-08-10 13:15:56 UTC (rev 33764) @@ -2,7 +2,7 @@ <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.internal.management.as7.JBoss7ManagerService"/> <service> - <provide interface="org.jboss.ide.eclipse.as.core.server.IJBoss7ManagerService"/> + <provide interface="org.jboss.ide.eclipse.as.management.as7.IJBoss7ManagerService"/> </service> <property name="as.version" type="String" value="700"/> </scr:component> Modified: 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/AS7Manager.java 2011-08-10 13:05:14 UTC (rev 33763) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7Manager.java 2011-08-10 13:15:56 UTC (rev 33764) @@ -36,11 +36,11 @@ 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; +import org.jboss.ide.eclipse.as.management.as7.IJBoss7DeploymentResult; +import org.jboss.ide.eclipse.as.management.as7.JBoss7DeploymentState; +import org.jboss.ide.eclipse.as.management.as7.JBoss7ManangerException; +import org.jboss.ide.eclipse.as.management.as7.JBoss7ServerState; /** * @author André Dietisheim Modified: 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.java 2011-08-10 13:05:14 UTC (rev 33763) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7Messages.java 2011-08-10 13:15:56 UTC (rev 33764) @@ -13,6 +13,8 @@ import org.eclipse.osgi.util.NLS; public class AS7Messages extends NLS { + public static String JBoss7ServerState_noEnumForString; + public static String ModuleStateEvaluationFailed; public static String OperationOnAddressFailed; public static String FailedToBuildOperation; Modified: 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/AS7Messages.properties 2011-08-10 13:05:14 UTC (rev 33763) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7Messages.properties 2011-08-10 13:15:56 UTC (rev 33764) @@ -1,3 +1,5 @@ +JBoss7ServerState_noEnumForString="No JBoss7ServerState enum for string {0}" + ModuleStateEvaluationFailed=Could not evaluate state for deployment {0} OperationOnAddressFailed=Could not execute {0} for {1}. Failure was {2}. FailedToBuildOperation=Failed to build operation. Modified: 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/DeploymentOperationResult.java 2011-08-10 13:05:14 UTC (rev 33763) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/DeploymentOperationResult.java 2011-08-10 13:15:56 UTC (rev 33764) @@ -20,8 +20,8 @@ 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.IJBoss7DeploymentResult; +import org.jboss.ide.eclipse.as.management.as7.JBoss7ManangerException; /** * A class that holds the status of a deployment operation. Modified: 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/JBoss7ManagerService.java 2011-08-10 13:05:14 UTC (rev 33763) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/JBoss7ManagerService.java 2011-08-10 13:15:56 UTC (rev 33764) @@ -13,10 +13,10 @@ 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; +import org.jboss.ide.eclipse.as.management.as7.IJBoss7DeploymentResult; +import org.jboss.ide.eclipse.as.management.as7.IJBoss7ManagerService; +import org.jboss.ide.eclipse.as.management.as7.JBoss7DeploymentState; +import org.jboss.ide.eclipse.as.management.as7.JBoss7ServerState; /** * @author Rob Stryker Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/util/AS7ManagerUtil.java =================================================================== --- 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 13:05:14 UTC (rev 33763) +++ 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 13:15:56 UTC (rev 33764) @@ -30,10 +30,10 @@ 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; +import org.jboss.ide.eclipse.as.management.as7.JBoss7ManangerException; /** * Various utility methods to deal with the as7 management api. Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/IJBoss7DeploymentResult.java (from rev 33712, trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/IJBoss7DeploymentResult.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/IJBoss7DeploymentResult.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/IJBoss7DeploymentResult.java 2011-08-10 13:15:56 UTC (rev 33764) @@ -0,0 +1,19 @@ +/******************************************************************************* + * 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.core.runtime.IStatus; + +public interface IJBoss7DeploymentResult { + + public abstract IStatus getStatus() throws JBoss7ManangerException; + +} \ 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/management/as7/IJBoss7DeploymentResult.java ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/IJBoss7ManagerService.java (from rev 33712, trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBoss7ManagerService.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/IJBoss7ManagerService.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/IJBoss7ManagerService.java 2011-08-10 13:15:56 UTC (rev 33764) @@ -0,0 +1,157 @@ +/******************************************************************************* + * Copyright (c) 2007 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 java.io.File; + +import org.eclipse.core.runtime.IProgressMonitor; + +public interface IJBoss7ManagerService { + + public static final String AS_VERSION_PROPERTY = "as.version"; //$NON-NLS-1$ + + public static final String AS_VERSION_700 = "700"; //$NON-NLS-1$ + + public static final int MGMT_PORT = 9999; + + /** + * Asynchronously deploy a file to a server + * @param host + * + * The host + * @param port + * The port + * @param name + * The deployment's name + * @param file + * The file to be deployed + * @param monitor + * The progress monitor + * + * @return Not sure what to return yet + * @throws Exception + */ + public IJBoss7DeploymentResult deployAsync(String host, int port, + String deploymentName, File file, IProgressMonitor monitor) throws Exception; + + /** + * Synchronously deploy a file to a server + * + * @param host + * The host + * @param port + * The port + * @param name + * The deployment's name + * @param file + * The file to be deployed + * @param monitor + * The progress monitor + * + * @return Not sure what to return yet + * @throws Exception + */ + public IJBoss7DeploymentResult deploySync(String host, int port, + String deploymentName, File file, IProgressMonitor monitor) throws Exception; + + /** + * Asynchronously undeploy a file to a server + * + * @param host + * The host + * @param port + * The port + * @param name + * The deployment's name + * @param file + * The file to be deployed + * @param monitor + * The progress monitor + * + * @return Not sure what to return yet + * @throws Exception + */ + public IJBoss7DeploymentResult undeployAsync(String host, int port, + String deploymentName, boolean removeFile, IProgressMonitor monitor) throws Exception; + + /** + * Synchronously undeploy a file to a server + * + * @param host + * The host + * @param port + * The port + * @param name + * The deployment's name + * @param file + * The file to be deployed + * @param monitor + * The progress monitor + * + * @return Not sure what to return yet + * @throws Exception + */ + public IJBoss7DeploymentResult syncUndeploy(String host, int port, + String deploymentName, boolean removeFile, IProgressMonitor monitor) throws Exception; + + /** + * Returns the state for a given deployment name on a given host and port. + * + * @param host + * the host to query + * @param port + * the port to contact it on + * @param deploymentName + * the name of the deployment that shall be queried + * + * @return the state of the deployment + * @throws Exception + */ + public JBoss7DeploymentState getDeploymentState(String host, int port, String deploymentName) throws Exception; + + /** + * Returns the state of the server + * + * @param host the server to query + * @param port the port to communicate on + * @return the state of the server + * + * @throws Exception + */ + public JBoss7ServerState getServerState(String host, int port) throws Exception; + + /** + * Returns <code>true</code> if the server is running, <code>false</code> + * otherwise. + * + * @param host the server to to query + * @param port the port to communicate on + * @return true if it's running, false otherwise + * @throws Exception + */ + public boolean isRunning(String host, int port) throws Exception; + + @Deprecated + public JBoss7ServerState getServerState(String host) throws Exception; + + /** + * Stops the given server + * + * @throws JBoss7ManangerException + * @throws Exception + */ + public void stop(String host, int port) throws Exception; + + @Deprecated + public void stop(String host) throws Exception; + + public void dispose(); +} Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7DeploymentState.java (from rev 33712, trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7DeploymentState.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7DeploymentState.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7DeploymentState.java 2011-08-10 13:15:56 UTC (rev 33764) @@ -0,0 +1,22 @@ +/******************************************************************************* + * Copyright (c) 2007 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; + + +/** + * An enum that reflects the state of a deployment. + * + * @author André Dietisheim + */ +public enum JBoss7DeploymentState { + STARTED , + STOPPED; +} \ 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/management/as7/JBoss7DeploymentState.java ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ManagerServiceProxy.java (from rev 33758, trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServiceProxy.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ManagerServiceProxy.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ManagerServiceProxy.java 2011-08-10 13:15:56 UTC (rev 33764) @@ -0,0 +1,96 @@ +/******************************************************************************* + * Copyright (c) 2007 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 java.io.File; +import java.text.MessageFormat; + +import org.eclipse.core.runtime.IProgressMonitor; +import org.osgi.framework.BundleContext; +import org.osgi.framework.InvalidSyntaxException; +import org.osgi.util.tracker.ServiceTracker; + +/** + * @author André Dietisheim + */ +public class JBoss7ManagerServiceProxy extends ServiceTracker<IJBoss7ManagerService, IJBoss7ManagerService> + implements IJBoss7ManagerService { + + public JBoss7ManagerServiceProxy(BundleContext context, String asVersion) throws InvalidSyntaxException { + super( + context, + context.createFilter(MessageFormat + .format("(&(objectClass={0})(as.version={1}))", IJBoss7ManagerService.class.getCanonicalName(), asVersion)), null); //$NON-NLS-1$ + } + + public IJBoss7DeploymentResult deployAsync(String host, int port, String deploymentName, File file, + IProgressMonitor monitor) throws Exception { + return checkedGetService().deployAsync(host, port, deploymentName, file, monitor); + } + + public IJBoss7DeploymentResult deploySync(String host, int port, String deploymentName, File file, + IProgressMonitor monitor) throws Exception { + return checkedGetService().deployAsync(host, port, deploymentName, file, monitor); + } + + public IJBoss7DeploymentResult undeployAsync(String host, int port, String deploymentName, boolean removeFile, + IProgressMonitor monitor) throws Exception { + return checkedGetService().undeployAsync(host, port, deploymentName, removeFile, monitor); + } + + public IJBoss7DeploymentResult syncUndeploy(String host, int port, String deploymentName, boolean removeFile, + IProgressMonitor monitor) throws Exception { + return checkedGetService().syncUndeploy(host, port, deploymentName, removeFile, monitor); + } + + public JBoss7DeploymentState getDeploymentState(String host, int port, String deploymentName) throws Exception { + return checkedGetService().getDeploymentState(host, port, deploymentName); + } + + public JBoss7ServerState getServerState(String host, int port) throws Exception { + return checkedGetService().getServerState(host, port); + } + + public boolean isRunning(String host, int port) throws Exception { + try { + return checkedGetService().isRunning(host, port); + } catch (Exception e) { + return false; + } + } + + @Deprecated + public JBoss7ServerState getServerState(String host) throws Exception { + return checkedGetService().getServerState(host); + } + + public void stop(String host, int port) throws Exception { + checkedGetService().stop(host, port); + } + + @Deprecated + public void stop(String host) throws Exception { + checkedGetService().stop(host); + } + + private IJBoss7ManagerService checkedGetService() throws JBoss7ManangerException { + IJBoss7ManagerService service = getService(); + if (service == null) { + throw new JBoss7ManangerException("Could not acquire JBoss Management service"); //$NON-NLS-1$ + } + return service; + } + + public void dispose() { + close(); + } + +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ManagerServiceProxy.java ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ManagerUtil.java (from rev 33712, trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerUtil.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ManagerUtil.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ManagerUtil.java 2011-08-10 13:15:56 UTC (rev 33764) @@ -0,0 +1,60 @@ +/******************************************************************************* + * Copyright (c) 2007 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.wst.server.core.IServer; +import org.jboss.ide.eclipse.as.internal.management.as7.Activator; +import org.osgi.framework.BundleContext; + +public class JBoss7ManagerUtil { + + private static final String JBOSS7_RUNTIME = "org.jboss.ide.eclipse.as.runtime.70"; //$NON-NLS-1$ + + public static IJBoss7ManagerService getService(IServer server) throws Exception { + BundleContext context = Activator.getContext(); + JBoss7ManagerServiceProxy proxy = new JBoss7ManagerServiceProxy(context, getRequiredVersion(server)); + proxy.open(); + return proxy; + } + + private static String getRequiredVersion(IServer server) { + String id = server.getRuntime().getRuntimeType().getId(); + if (JBOSS7_RUNTIME.equals(id)) { + return IJBoss7ManagerService.AS_VERSION_700; + } + return null; + } + + public static void dispose(IJBoss7ManagerService service) { + if (service != null) { + service.dispose(); + } + } + + public static <RESULT> RESULT executeWithService(IServiceAware<RESULT> serviceAware, IServer server) throws Exception { + IJBoss7ManagerService service = null; + try { + service = JBoss7ManagerUtil.getService(server); + return serviceAware.execute(service); + } finally { + if (service != null) { + service.dispose(); + } + } + } + + public static interface IServiceAware<RESULT> { + + public RESULT execute(IJBoss7ManagerService service) throws Exception; + + } + +} Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ManangerConnectException.java (from rev 33712, trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManangerConnectException.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ManangerConnectException.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ManangerConnectException.java 2011-08-10 13:15:56 UTC (rev 33764) @@ -0,0 +1,24 @@ +/******************************************************************************* + * Copyright (c) 2010 Red Hat Inc.. + * All rights reserved. This program and the accompanying materials + * are 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 Incorporated - initial API and implementation + *******************************************************************************/ +package org.jboss.ide.eclipse.as.management.as7; + +/** + * @author André Dietisheim + */ +public class JBoss7ManangerConnectException extends JBoss7ManangerException { + + private static final long serialVersionUID = 1L; + + public JBoss7ManangerConnectException(Throwable cause) { + super(cause); + } + +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ManangerConnectException.java ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ManangerException.java (from rev 33712, trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManangerException.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ManangerException.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ManangerException.java 2011-08-10 13:15:56 UTC (rev 33764) @@ -0,0 +1,32 @@ +/******************************************************************************* + * Copyright (c) 2010 Red Hat Inc.. + * All rights reserved. This program and the accompanying materials + * are 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 Incorporated - initial API and implementation + *******************************************************************************/ +package org.jboss.ide.eclipse.as.management.as7; + +/** + * @author André Dietisheim + */ +public class JBoss7ManangerException extends Exception { + + private static final long serialVersionUID = 1L; + + public JBoss7ManangerException(String message, Throwable cause) { + super(message, cause); + } + + public JBoss7ManangerException(Throwable cause) { + super(cause); + } + + public JBoss7ManangerException(String message) { + super(message); + } + +} Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ServerState.java (from rev 33712, trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerState.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ServerState.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ServerState.java 2011-08-10 13:15:56 UTC (rev 33764) @@ -0,0 +1,41 @@ +/******************************************************************************* + * 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 java.text.MessageFormat; + +import org.jboss.ide.eclipse.as.internal.management.as7.AS7Messages; + +/** + * @author André Dietisheim + */ +public enum JBoss7ServerState { + STARTING, RUNNING, RESTART_REQUIRED; + + public static JBoss7ServerState valueOfIgnoreCase(String stateString) { + JBoss7ServerState matchingState = null; + if (stateString != null && stateString.length() > 0) { + for (JBoss7ServerState availableState : values()) { + if (stateString.equalsIgnoreCase(availableState.name())) { + matchingState = availableState; + break; + } + } + } + if (matchingState == null) { + throw new IllegalArgumentException(MessageFormat.format( + AS7Messages.JBoss7ServerState_noEnumForString, + stateString)); + } + + return matchingState; + } +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ServerState.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/META-INF/MANIFEST.MF 2011-08-10 13:05:14 UTC (rev 33763) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/META-INF/MANIFEST.MF 2011-08-10 13:15:56 UTC (rev 33764) @@ -28,3 +28,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: org.jboss.ide.eclipse.as.rse.core Bundle-Localization: plugin +Import-Package: org.jboss.ide.eclipse.as.management.as7 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java 2011-08-10 13:05:14 UTC (rev 33763) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java 2011-08-10 13:15:56 UTC (rev 33764) @@ -19,10 +19,10 @@ import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; import org.jboss.ide.eclipse.as.core.Messages; -import org.jboss.ide.eclipse.as.core.server.IJBoss7ManagerService; -import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ManagerUtil; import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7Server; import org.jboss.ide.eclipse.as.core.util.ServerConverter; +import org.jboss.ide.eclipse.as.management.as7.IJBoss7ManagerService; +import org.jboss.ide.eclipse.as.management.as7.JBoss7ManagerUtil; public class RSEJBoss7BehaviourDelegate extends RSEBehaviourDelegate { 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 13:05:14 UTC (rev 33763) +++ 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 13:15:56 UTC (rev 33764) @@ -23,11 +23,11 @@ import java.net.UnknownHostException; import java.util.concurrent.ExecutionException; -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.JBoss7DeploymentState; +import org.jboss.ide.eclipse.as.management.as7.JBoss7ManangerException; +import org.jboss.ide.eclipse.as.management.as7.JBoss7ServerState; 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/JBossManagementServiceTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/JBossManagementServiceTest.java 2011-08-10 13:05:14 UTC (rev 33763) +++ trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/JBossManagementServiceTest.java 2011-08-10 13:15:56 UTC (rev 33764) @@ -14,7 +14,7 @@ import java.net.UnknownHostException; -import org.jboss.ide.eclipse.as.core.server.IJBoss7ManagerService; +import org.jboss.ide.eclipse.as.management.as7.IJBoss7ManagerService; import org.junit.After; import org.junit.Before; import org.junit.Test; 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 13:05:14 UTC (rev 33763) +++ 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 13:15:56 UTC (rev 33764) @@ -25,9 +25,9 @@ import org.eclipse.core.runtime.FileLocator; 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.internal.management.as7.AS7Manager; +import org.jboss.ide.eclipse.as.management.as7.IJBoss7DeploymentResult; +import org.jboss.ide.eclipse.as.management.as7.JBoss7ManangerException; import org.osgi.framework.Bundle; /** Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/META-INF/MANIFEST.MF =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/META-INF/MANIFEST.MF 2011-08-10 13:05:14 UTC (rev 33763) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/META-INF/MANIFEST.MF 2011-08-10 13:15:56 UTC (rev 33764) @@ -56,3 +56,4 @@ org.jboss.ide.eclipse.as.test.util, org.jboss.ide.eclipse.as.test.util.jdt, org.jboss.ide.eclipse.as.test.util.wtp +Import-Package: org.jboss.ide.eclipse.as.management.as7 Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/JBossManagerTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/JBossManagerTest.java 2011-08-10 13:05:14 UTC (rev 33763) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/JBossManagerTest.java 2011-08-10 13:15:56 UTC (rev 33764) @@ -17,12 +17,12 @@ import java.util.Hashtable; 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.JBoss7ManagerServiceProxy; -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.IJBoss7DeploymentResult; +import org.jboss.ide.eclipse.as.management.as7.IJBoss7ManagerService; +import org.jboss.ide.eclipse.as.management.as7.JBoss7DeploymentState; +import org.jboss.ide.eclipse.as.management.as7.JBoss7ManagerServiceProxy; +import org.jboss.ide.eclipse.as.management.as7.JBoss7ManangerException; +import org.jboss.ide.eclipse.as.management.as7.JBoss7ServerState; import org.jboss.ide.eclipse.as.test.ASTest; import org.junit.Test; import org.osgi.framework.BundleContext;