Author: rob.stryker(a)jboss.com Date: 2012-01-06 05:50:26 -0500 (Fri, 06 Jan 2012) New Revision: 37674 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/ trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/.classpath trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/.project trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/.settings/ trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/.settings/org.eclipse.jdt.core.prefs trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/META-INF/ trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/build.properties trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/pom.xml trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/ trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/ trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/ trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/ trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/ trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/ trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/ trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/AS7ManagementActivator.java trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/IAS7ManagementDetails.java trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/IJBoss7DeploymentResult.java trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/IJBoss7ManagerService.java trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/JBoss7DeploymentState.java trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/JBoss7ManagerServiceProxy.java trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/JBoss7ManagerUtil.java trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/JBoss7ManangerConnectException.java trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/JBoss7ManangerException.java trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/JBoss7ServerState.java trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/ trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/classes/ trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/classes/org/ trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/classes/org/jboss/ trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/classes/org/jboss/ide/ trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/classes/org/jboss/ide/eclipse/ trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/classes/org/jboss/ide/eclipse/as/ trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/classes/org/jboss/ide/eclipse/as/management/ trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/classes/org/jboss/ide/eclipse/as/management/core/ trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/classes/org/jboss/ide/eclipse/as/management/core/AS7ManagementActivator.class trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/classes/org/jboss/ide/eclipse/as/management/core/IAS7ManagementDetails.class trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/classes/org/jboss/ide/eclipse/as/management/core/IJBoss7DeploymentResult.class trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/classes/org/jboss/ide/eclipse/as/management/core/IJBoss7ManagerService.class trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/classes/org/jboss/ide/eclipse/as/management/core/JBoss7DeploymentState.class trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/classes/org/jboss/ide/eclipse/as/management/core/JBoss7ManagerServiceProxy.class trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/classes/org/jboss/ide/eclipse/as/management/core/JBoss7ManagerUtil$IServiceAware.class trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/classes/org/jboss/ide/eclipse/as/management/core/JBoss7ManagerUtil.class trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/classes/org/jboss/ide/eclipse/as/management/core/JBoss7ManangerConnectException.class trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/classes/org/jboss/ide/eclipse/as/management/core/JBoss7ManangerException.class trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/classes/org/jboss/ide/eclipse/as/management/core/JBoss7ServerState.class trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/local-artifacts.properties trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/maven-archiver/ trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/maven-archiver/pom.properties trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/org.jboss.ide.eclipse.as.management.core-2.3.0-SNAPSHOT-sources.jar trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/org.jboss.ide.eclipse.as.management.core-2.3.0-SNAPSHOT.jar trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/p2artifacts.xml trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/p2content.xml Removed: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/IJBoss7DeploymentResult.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/IJBoss7ManagerService.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7DeploymentState.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerServiceProxy.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerUtil.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManangerConnectException.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManangerException.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ServerState.java Modified: trunk/as/features/org.jboss.ide.eclipse.as.serverAdapter.wtp.feature/feature.xml 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/JBossServerCorePlugin.java 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.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/AS7ManagementDetails.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/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.management.as71/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/META-INF/jboss-management-service.xml trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/AS71Manager.java trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/DeploymentOperationResult.java trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/JBoss71ManagerService.java trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/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/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBTWebLaunchableClient.java trunk/as/plugins/pom.xml trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/META-INF/MANIFEST.MF 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-10344 - reorg Modified: trunk/as/features/org.jboss.ide.eclipse.as.serverAdapter.wtp.feature/feature.xml =================================================================== --- trunk/as/features/org.jboss.ide.eclipse.as.serverAdapter.wtp.feature/feature.xml 2012-01-06 10:22:29 UTC (rev 37673) +++ trunk/as/features/org.jboss.ide.eclipse.as.serverAdapter.wtp.feature/feature.xml 2012-01-06 10:50:26 UTC (rev 37674) @@ -83,6 +83,7 @@ </requires> <plugin id="org.jboss.ide.eclipse.as.core" download-size="0" install-size="0" version="0.0.0" unpack="false" /> + <plugin id="org.jboss.ide.eclipse.as.management.core" download-size="0" install-size="0" version="0.0.0" unpack="false" /> <plugin id="org.jboss.ide.eclipse.as.management.as7" download-size="0" install-size="0" version="0.0.0" unpack="false" /> <plugin id="org.jboss.ide.eclipse.as.management.as71" download-size="0" install-size="0" version="0.0.0" unpack="false" /> <plugin id="org.jboss.ide.eclipse.as.ui" download-size="0" install-size="0" version="0.0.0" unpack="false" /> 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 2012-01-06 10:22:29 UTC (rev 37673) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF 2012-01-06 10:50:26 UTC (rev 37674) @@ -23,7 +23,8 @@ org.eclipse.jst.jee;bundle-version="1.0.401", org.eclipse.core.commands;bundle-version="3.6.0", org.eclipse.pde.core;bundle-version="3.7.0", - org.eclipse.jst.j2ee.web;bundle-version="1.1.500" + org.eclipse.jst.j2ee.web;bundle-version="1.1.500", + org.jboss.ide.eclipse.as.management.core Bundle-ActivationPolicy: lazy Export-Package: org.jboss.ide.eclipse.as.core, org.jboss.ide.eclipse.as.core.extensions.descriptors, Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/JBossServerCorePlugin.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/JBossServerCorePlugin.java 2012-01-06 10:22:29 UTC (rev 37673) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/JBossServerCorePlugin.java 2012-01-06 10:50:26 UTC (rev 37674) @@ -70,13 +70,6 @@ Job job = new Job("Adding JBoss4xEarFacetInstallListener") { //$NON-NLS-1$ @Override protected IStatus run(IProgressMonitor monitor) { - while (Platform.getInstanceLocation() == null || !Platform.getInstanceLocation().isSet()) { - try { - Thread.sleep(500); - } catch (InterruptedException e) { - // ignore - } - } // Start the array of models that need to be started UnitedServerListenerManager.getDefault(); UnitedServerListenerManager.getDefault().addListener(XPathModel.getDefault()); 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 2012-01-06 10:22:29 UTC (rev 37673) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2012-01-06 10:50:26 UTC (rev 37674) @@ -27,11 +27,10 @@ import org.jboss.ide.eclipse.as.core.server.IServerStatePoller2; import org.jboss.ide.eclipse.as.core.server.internal.ServerStatePollerType; import org.jboss.ide.eclipse.as.core.server.v7.management.AS7ManagementDetails; -import org.jboss.ide.eclipse.as.core.server.v7.management.IJBoss7ManagerService; -import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ManagerUtil; -import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ManagerUtil.IServiceAware; -import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ManangerConnectException; -import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ServerState; +import org.jboss.ide.eclipse.as.management.core.IJBoss7ManagerService; +import org.jboss.ide.eclipse.as.management.core.JBoss7ManagerUtil; +import org.jboss.ide.eclipse.as.management.core.JBoss7ManangerConnectException; +import org.jboss.ide.eclipse.as.management.core.JBoss7ServerState; import org.osgi.framework.InvalidSyntaxException; /** @@ -198,7 +197,7 @@ private boolean callbacksCalled = false; public IStatus getCurrentStateSynchronous(final IServer server) { try { - Boolean result = JBoss7ManagerUtil.executeWithService(new IServiceAware<Boolean>() { + Boolean result = JBoss7ManagerUtil.executeWithService(new JBoss7ManagerUtil.IServiceAware<Boolean>() { @Override public Boolean execute(IJBoss7ManagerService service) throws Exception { try { 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 2012-01-06 10:22:29 UTC (rev 37673) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java 2012-01-06 10:50:26 UTC (rev 37674) @@ -20,10 +20,9 @@ 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.server.v7.management.AS7ManagementDetails; -import org.jboss.ide.eclipse.as.core.server.v7.management.IJBoss7ManagerService; -import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ManagerUtil; 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.core.IJBoss7ManagerService; +import org.jboss.ide.eclipse.as.management.core.JBoss7ManagerUtil; import org.osgi.framework.InvalidSyntaxException; public class LocalJBoss7BehaviorDelegate extends LocalJBossBehaviorDelegate { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/AS7ManagementDetails.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/AS7ManagementDetails.java 2012-01-06 10:22:29 UTC (rev 37673) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/AS7ManagementDetails.java 2012-01-06 10:50:26 UTC (rev 37674) @@ -21,8 +21,10 @@ import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7Server; 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.core.IAS7ManagementDetails; +import org.jboss.ide.eclipse.as.management.core.IJBoss7ManagerService; -public class AS7ManagementDetails implements IServerProvider { +public class AS7ManagementDetails implements IServerProvider, IAS7ManagementDetails { private IServer server; public AS7ManagementDetails(IServer server) { this.server = server; Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/IJBoss7DeploymentResult.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/IJBoss7DeploymentResult.java 2012-01-06 10:22:29 UTC (rev 37673) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/IJBoss7DeploymentResult.java 2012-01-06 10:50:26 UTC (rev 37674) @@ -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.v7.management; - -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/v7/management/IJBoss7ManagerService.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/IJBoss7ManagerService.java 2012-01-06 10:22:29 UTC (rev 37673) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/IJBoss7ManagerService.java 2012-01-06 10:50:26 UTC (rev 37674) @@ -1,129 +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.v7.management; - -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 String AS_VERSION_710_Beta = "710.beta1"; //$NON-NLS-1$ - public static final int MGMT_PORT = 9999; - - public void init() throws Exception; - - /** - * 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(AS7ManagementDetails details, - 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(AS7ManagementDetails details, - 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(AS7ManagementDetails details, - 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(AS7ManagementDetails details, - 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(AS7ManagementDetails details, 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(AS7ManagementDetails details) 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(AS7ManagementDetails details) throws Exception; - - /** - * Stops the given server - * - * @throws JBoss7ManangerException - * @throws Exception - */ - public void stop(AS7ManagementDetails details) throws Exception; - - public void dispose(); -} Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7DeploymentState.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7DeploymentState.java 2012-01-06 10:22:29 UTC (rev 37673) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7DeploymentState.java 2012-01-06 10:50:26 UTC (rev 37674) @@ -1,23 +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.v7.management; - - -/** - * An enum that reflects the state of a deployment. - * - * @author André Dietisheim - */ -public enum JBoss7DeploymentState { - STARTED , - STOPPED, - NOT_FOUND; -} \ No newline at end of file Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerServiceProxy.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerServiceProxy.java 2012-01-06 10:22:29 UTC (rev 37673) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerServiceProxy.java 2012-01-06 10:50:26 UTC (rev 37674) @@ -1,90 +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.v7.management; - -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 void init() throws Exception { - checkedGetService().init(); - } - - public IJBoss7DeploymentResult deployAsync(AS7ManagementDetails details, String deploymentName, File file, - IProgressMonitor monitor) throws Exception { - return checkedGetService().deployAsync(details, deploymentName, file, monitor); - } - - public IJBoss7DeploymentResult deploySync(AS7ManagementDetails details, String deploymentName, File file, - IProgressMonitor monitor) throws Exception { - return checkedGetService().deployAsync(details, deploymentName, file, monitor); - } - - public IJBoss7DeploymentResult undeployAsync(AS7ManagementDetails details, String deploymentName, boolean removeFile, - IProgressMonitor monitor) throws Exception { - return checkedGetService().undeployAsync(details, deploymentName, removeFile, monitor); - } - - public IJBoss7DeploymentResult syncUndeploy(AS7ManagementDetails details, String deploymentName, boolean removeFile, - IProgressMonitor monitor) throws Exception { - return checkedGetService().syncUndeploy(details, deploymentName, removeFile, monitor); - } - - public JBoss7DeploymentState getDeploymentState(AS7ManagementDetails details, String deploymentName) throws Exception { - return checkedGetService().getDeploymentState(details, deploymentName); - } - - public JBoss7ServerState getServerState(AS7ManagementDetails details) throws Exception { - return checkedGetService().getServerState(details); - } - - public boolean isRunning(AS7ManagementDetails details) throws Exception { - try { - return checkedGetService().isRunning(details); - } catch (Exception e) { - return false; - } - } - - public void stop(AS7ManagementDetails details) throws Exception { - checkedGetService().stop(details); - } - - 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/v7/management/JBoss7ManagerUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerUtil.java 2012-01-06 10:22:29 UTC (rev 37673) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerUtil.java 2012-01-06 10:50:26 UTC (rev 37674) @@ -1,66 +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.v7.management; - -import org.eclipse.wst.server.core.IServer; -import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; -import org.osgi.framework.BundleContext; -import org.osgi.framework.InvalidSyntaxException; - -public class JBoss7ManagerUtil { - - private static final String JBOSS7_RUNTIME = "org.jboss.ide.eclipse.as.runtime.70"; //$NON-NLS-1$ - private static final String JBOSS71_RUNTIME = "org.jboss.ide.eclipse.as.runtime.71"; //$NON-NLS-1$ - private static final String EAP6_RUNTIME = "org.jboss.ide.eclipse.as.runtime.eap.60"; //$NON-NLS-1$ - - - public static IJBoss7ManagerService getService(IServer server) throws InvalidSyntaxException { - 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) - || EAP6_RUNTIME.equals(id)) { - // This is the proper fix for now. See JBIDE-10293 - return IJBoss7ManagerService.AS_VERSION_710_Beta; - } - if( JBOSS71_RUNTIME.equals(id)) - return IJBoss7ManagerService.AS_VERSION_710_Beta; - 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/v7/management/JBoss7ManangerConnectException.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManangerConnectException.java 2012-01-06 10:22:29 UTC (rev 37673) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManangerConnectException.java 2012-01-06 10:50:26 UTC (rev 37674) @@ -1,24 +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.v7.management; - -/** - * @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/v7/management/JBoss7ManangerException.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManangerException.java 2012-01-06 10:22:29 UTC (rev 37673) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManangerException.java 2012-01-06 10:50:26 UTC (rev 37674) @@ -1,32 +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.v7.management; - -/** - * @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/v7/management/JBoss7ServerState.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ServerState.java 2012-01-06 10:22:29 UTC (rev 37673) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ServerState.java 2012-01-06 10:50:26 UTC (rev 37674) @@ -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.v7.management; - -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.management.as7/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/MANIFEST.MF 2012-01-06 10:22:29 UTC (rev 37673) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/MANIFEST.MF 2012-01-06 10:50:26 UTC (rev 37674) @@ -6,7 +6,8 @@ Bundle-Activator: org.jboss.ide.eclipse.as.internal.management.as7.AS7ManagementActivator Require-Bundle: org.jboss.ide.eclipse.as.core;bundle-version="2.3.0", org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)", - org.eclipse.wst.server.core;bundle-version="1.1.302" + org.eclipse.wst.server.core;bundle-version="1.1.302", + org.jboss.ide.eclipse.as.management.core;bundle-version="1.0.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ClassPath: ., 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 2012-01-06 10:22:29 UTC (rev 37673) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/jboss-management-service.xml 2012-01-06 10:50:26 UTC (rev 37674) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="org.jboss.ide.eclipse.as.management.as7.service"> +<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" enabled="false" immediate="true" 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.v7.management.IJBoss7ManagerService"/> + <provide interface="org.jboss.ide.eclipse.as.management.core.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 2012-01-06 10:22:29 UTC (rev 37673) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7Manager.java 2012-01-06 10:50:26 UTC (rev 37674) @@ -42,12 +42,12 @@ 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.v7.management.AS7ManagementDetails; -import org.jboss.ide.eclipse.as.core.server.v7.management.IJBoss7DeploymentResult; -import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7DeploymentState; -import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ManangerException; -import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ServerState; import org.jboss.ide.eclipse.as.internal.management.as7.util.AS7ManagerUtil; +import org.jboss.ide.eclipse.as.management.core.IAS7ManagementDetails; +import org.jboss.ide.eclipse.as.management.core.IJBoss7DeploymentResult; +import org.jboss.ide.eclipse.as.management.core.JBoss7DeploymentState; +import org.jboss.ide.eclipse.as.management.core.JBoss7ManangerException; +import org.jboss.ide.eclipse.as.management.core.JBoss7ServerState; /** * @author André Dietisheim @@ -58,9 +58,9 @@ private ModelControllerClient client; private ServerDeploymentManager manager; - private AS7ManagementDetails details; + private IAS7ManagementDetails details; - public AS7Manager(AS7ManagementDetails details) throws UnknownHostException { + public AS7Manager(IAS7ManagementDetails details) throws UnknownHostException { this.details = details; this.client = ModelControllerClient.Factory.create(details.getHost(), details.getManagementPort()); this.manager = ServerDeploymentManager.Factory.create(client); 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 2012-01-06 10:22:29 UTC (rev 37673) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/DeploymentOperationResult.java 2012-01-06 10:50:26 UTC (rev 37674) @@ -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.v7.management.IJBoss7DeploymentResult; -import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ManangerException; +import org.jboss.ide.eclipse.as.management.core.IJBoss7DeploymentResult; +import org.jboss.ide.eclipse.as.management.core.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 2012-01-06 10:22:29 UTC (rev 37673) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/JBoss7ManagerService.java 2012-01-06 10:50:26 UTC (rev 37674) @@ -13,12 +13,11 @@ import java.io.File; import org.eclipse.core.runtime.IProgressMonitor; -import org.jboss.ide.eclipse.as.core.server.v7.management.AS7ManagementDetails; -import org.jboss.ide.eclipse.as.core.server.v7.management.IJBoss7DeploymentResult; -import org.jboss.ide.eclipse.as.core.server.v7.management.IJBoss7ManagerService; -import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7DeploymentState; -import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ServerState; -import org.jboss.ide.eclipse.as.internal.management.as7.AS7Manager; +import org.jboss.ide.eclipse.as.management.core.IAS7ManagementDetails; +import org.jboss.ide.eclipse.as.management.core.IJBoss7DeploymentResult; +import org.jboss.ide.eclipse.as.management.core.IJBoss7ManagerService; +import org.jboss.ide.eclipse.as.management.core.JBoss7DeploymentState; +import org.jboss.ide.eclipse.as.management.core.JBoss7ServerState; /** * @author Rob Stryker @@ -27,7 +26,7 @@ public void init() throws Exception { } - public IJBoss7DeploymentResult deployAsync(AS7ManagementDetails details, String deploymentName, + public IJBoss7DeploymentResult deployAsync(IAS7ManagementDetails details, String deploymentName, File file, IProgressMonitor monitor) throws Exception { AS7Manager manager = new AS7Manager(details); try { @@ -38,7 +37,7 @@ } } - public IJBoss7DeploymentResult deploySync(AS7ManagementDetails details, String deploymentName, + public IJBoss7DeploymentResult deploySync(IAS7ManagementDetails details, String deploymentName, File file, IProgressMonitor monitor) throws Exception { AS7Manager manager = new AS7Manager(details); try { @@ -49,7 +48,7 @@ } } - public IJBoss7DeploymentResult undeployAsync(AS7ManagementDetails details, String deploymentName, + public IJBoss7DeploymentResult undeployAsync(IAS7ManagementDetails details, String deploymentName, boolean removeFile, IProgressMonitor monitor) throws Exception { AS7Manager manager = new AS7Manager(details); try { @@ -60,7 +59,7 @@ } } - public IJBoss7DeploymentResult syncUndeploy(AS7ManagementDetails details, String deploymentName, + public IJBoss7DeploymentResult syncUndeploy(IAS7ManagementDetails details, String deploymentName, boolean removeFile, IProgressMonitor monitor) throws Exception { AS7Manager manager = new AS7Manager(details); try { @@ -71,7 +70,7 @@ } } - public JBoss7DeploymentState getDeploymentState(AS7ManagementDetails details, String deploymentName) throws Exception { + public JBoss7DeploymentState getDeploymentState(IAS7ManagementDetails details, String deploymentName) throws Exception { AS7Manager manager = new AS7Manager(details); try { JBoss7DeploymentState result = manager.getDeploymentStateSafe(deploymentName); @@ -81,7 +80,7 @@ } } - public JBoss7ServerState getServerState(AS7ManagementDetails details) throws Exception { + public JBoss7ServerState getServerState(IAS7ManagementDetails details) throws Exception { AS7Manager manager = new AS7Manager(details); try { JBoss7ServerState state = manager.getServerState(); @@ -91,7 +90,7 @@ } } - public boolean isRunning(AS7ManagementDetails details) throws Exception { + public boolean isRunning(IAS7ManagementDetails details) throws Exception { AS7Manager manager = new AS7Manager(details); try { boolean ret = manager.isRunning(); @@ -101,7 +100,7 @@ } } - public void stop(AS7ManagementDetails details) throws Exception { + public void stop(IAS7ManagementDetails details) throws Exception { AS7Manager manager = new AS7Manager(details); try { manager.stopServer(); 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 2012-01-06 10:22:29 UTC (rev 37673) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/util/AS7ManagerUtil.java 2012-01-06 10:50:26 UTC (rev 37674) @@ -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.v7.management.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.core.JBoss7ManangerException; /** * Various utility methods to deal with the as7 management api. Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/META-INF/MANIFEST.MF 2012-01-06 10:22:29 UTC (rev 37673) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/META-INF/MANIFEST.MF 2012-01-06 10:50:26 UTC (rev 37674) @@ -6,7 +6,8 @@ Bundle-Activator: org.jboss.ide.eclipse.as.internal.management.as71.AS71ManagementActivator Require-Bundle: org.jboss.ide.eclipse.as.core;bundle-version="2.3.0", org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)", - org.eclipse.wst.server.core;bundle-version="1.1.302" + org.eclipse.wst.server.core;bundle-version="1.1.302", + org.jboss.ide.eclipse.as.management.core;bundle-version="1.0.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ClassPath: ., Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/META-INF/jboss-management-service.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/META-INF/jboss-management-service.xml 2012-01-06 10:22:29 UTC (rev 37673) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/META-INF/jboss-management-service.xml 2012-01-06 10:50:26 UTC (rev 37674) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="org.jboss.ide.eclipse.as.management.as71.service"> +<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" enabled="true" immediate="false" name="org.jboss.ide.eclipse.as.management.as71.service"> <implementation class="org.jboss.ide.eclipse.as.internal.management.as71.JBoss71ManagerService"/> <service> - <provide interface="org.jboss.ide.eclipse.as.core.server.v7.management.IJBoss7ManagerService"/> + <provide interface="org.jboss.ide.eclipse.as.management.core.IJBoss7ManagerService"/> </service> <property name="as.version" type="String" value="710.beta1"/> </scr:component> Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/AS71Manager.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/AS71Manager.java 2012-01-06 10:22:29 UTC (rev 37673) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/AS71Manager.java 2012-01-06 10:50:26 UTC (rev 37674) @@ -39,7 +39,6 @@ import javax.security.auth.callback.PasswordCallback; import javax.security.auth.callback.UnsupportedCallbackException; import javax.security.sasl.RealmCallback; -import javax.security.sasl.RealmChoiceCallback; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osgi.util.NLS; @@ -50,12 +49,12 @@ import org.jboss.as.controller.client.helpers.standalone.ServerDeploymentPlanResult; import org.jboss.as.protocol.StreamUtils; import org.jboss.dmr.ModelNode; -import org.jboss.ide.eclipse.as.core.server.v7.management.AS7ManagementDetails; -import org.jboss.ide.eclipse.as.core.server.v7.management.IJBoss7DeploymentResult; -import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7DeploymentState; -import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ManangerException; -import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ServerState; import org.jboss.ide.eclipse.as.internal.management.as71.util.AS7ManagerUtil; +import org.jboss.ide.eclipse.as.management.core.IAS7ManagementDetails; +import org.jboss.ide.eclipse.as.management.core.IJBoss7DeploymentResult; +import org.jboss.ide.eclipse.as.management.core.JBoss7DeploymentState; +import org.jboss.ide.eclipse.as.management.core.JBoss7ManangerException; +import org.jboss.ide.eclipse.as.management.core.JBoss7ServerState; /** * @author André Dietisheim @@ -66,9 +65,9 @@ private ModelControllerClient client; private ServerDeploymentManager manager; - private AS7ManagementDetails details; + private IAS7ManagementDetails details; - public AS71Manager(AS7ManagementDetails details) throws UnknownHostException { + public AS71Manager(IAS7ManagementDetails details) throws UnknownHostException { this.details = details; this.client = ModelControllerClient.Factory.create(details.getHost(), details.getManagementPort(), getCallbackHandler()); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/DeploymentOperationResult.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/DeploymentOperationResult.java 2012-01-06 10:22:29 UTC (rev 37673) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/DeploymentOperationResult.java 2012-01-06 10:50:26 UTC (rev 37674) @@ -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.v7.management.IJBoss7DeploymentResult; -import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ManangerException; +import org.jboss.ide.eclipse.as.management.core.IJBoss7DeploymentResult; +import org.jboss.ide.eclipse.as.management.core.JBoss7ManangerException; /** * A class that holds the status of a deployment operation. Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/JBoss71ManagerService.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/JBoss71ManagerService.java 2012-01-06 10:22:29 UTC (rev 37673) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/JBoss71ManagerService.java 2012-01-06 10:50:26 UTC (rev 37674) @@ -11,15 +11,13 @@ package org.jboss.ide.eclipse.as.internal.management.as71; import java.io.File; -import java.security.Security; import org.eclipse.core.runtime.IProgressMonitor; -import org.jboss.ide.eclipse.as.core.server.v7.management.AS7ManagementDetails; -import org.jboss.ide.eclipse.as.core.server.v7.management.IJBoss7DeploymentResult; -import org.jboss.ide.eclipse.as.core.server.v7.management.IJBoss7ManagerService; -import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7DeploymentState; -import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ServerState; -import org.jboss.sasl.JBossSaslProvider; +import org.jboss.ide.eclipse.as.management.core.IAS7ManagementDetails; +import org.jboss.ide.eclipse.as.management.core.IJBoss7DeploymentResult; +import org.jboss.ide.eclipse.as.management.core.IJBoss7ManagerService; +import org.jboss.ide.eclipse.as.management.core.JBoss7DeploymentState; +import org.jboss.ide.eclipse.as.management.core.JBoss7ServerState; /** * @author Rob Stryker @@ -29,7 +27,7 @@ public void init() throws Exception { } - public IJBoss7DeploymentResult deployAsync(AS7ManagementDetails details, String deploymentName, + public IJBoss7DeploymentResult deployAsync(IAS7ManagementDetails details, String deploymentName, File file, IProgressMonitor monitor) throws Exception { AS71Manager manager = new AS71Manager(details); try { @@ -40,7 +38,7 @@ } } - public IJBoss7DeploymentResult deploySync(AS7ManagementDetails details, String deploymentName, + public IJBoss7DeploymentResult deploySync(IAS7ManagementDetails details, String deploymentName, File file, IProgressMonitor monitor) throws Exception { AS71Manager manager = new AS71Manager(details); try { @@ -51,7 +49,7 @@ } } - public IJBoss7DeploymentResult undeployAsync(AS7ManagementDetails details, String deploymentName, + public IJBoss7DeploymentResult undeployAsync(IAS7ManagementDetails details, String deploymentName, boolean removeFile, IProgressMonitor monitor) throws Exception { AS71Manager manager = new AS71Manager(details); try { @@ -62,7 +60,7 @@ } } - public IJBoss7DeploymentResult syncUndeploy(AS7ManagementDetails details, String deploymentName, + public IJBoss7DeploymentResult syncUndeploy(IAS7ManagementDetails details, String deploymentName, boolean removeFile, IProgressMonitor monitor) throws Exception { AS71Manager manager = new AS71Manager(details); try { @@ -73,7 +71,7 @@ } } - public JBoss7DeploymentState getDeploymentState(AS7ManagementDetails details, String deploymentName) throws Exception { + public JBoss7DeploymentState getDeploymentState(IAS7ManagementDetails details, String deploymentName) throws Exception { AS71Manager manager = new AS71Manager(details); try { JBoss7DeploymentState result = manager.getDeploymentStateSafe(deploymentName); @@ -83,7 +81,7 @@ } } - public JBoss7ServerState getServerState(AS7ManagementDetails details) throws Exception { + public JBoss7ServerState getServerState(IAS7ManagementDetails details) throws Exception { AS71Manager manager = new AS71Manager(details); try { JBoss7ServerState state = manager.getServerState(); @@ -93,7 +91,7 @@ } } - public boolean isRunning(AS7ManagementDetails details) throws Exception { + public boolean isRunning(IAS7ManagementDetails details) throws Exception { AS71Manager manager = new AS71Manager(details); try { boolean ret = manager.isRunning(); @@ -103,7 +101,7 @@ } } - public void stop(AS7ManagementDetails details) throws Exception { + public void stop(IAS7ManagementDetails details) throws Exception { AS71Manager manager = new AS71Manager(details); try { manager.stopServer(); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/util/AS7ManagerUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/util/AS7ManagerUtil.java 2012-01-06 10:22:29 UTC (rev 37673) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/util/AS7ManagerUtil.java 2012-01-06 10:50:26 UTC (rev 37674) @@ -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.v7.management.JBoss7ManangerException; import org.jboss.ide.eclipse.as.internal.management.as71.AS7Messages; import org.jboss.ide.eclipse.as.internal.management.as71.DefaultOperationRequestBuilder; import org.jboss.ide.eclipse.as.internal.management.as71.OperationFormatException; +import org.jboss.ide.eclipse.as.management.core.JBoss7ManangerException; /** * Various utility methods to deal with the as7 management api. Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/.classpath =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/.classpath (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/.classpath 2012-01-06 10:50:26 UTC (rev 37674) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="output" path="bin"/> +</classpath> Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/.project =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/.project (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/.project 2012-01-06 10:50:26 UTC (rev 37674) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.jboss.ide.eclipse.as.management.core</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/.settings/org.eclipse.jdt.core.prefs 2012-01-06 10:50:26 UTC (rev 37674) @@ -0,0 +1,8 @@ +#Fri Jan 06 13:06:05 CST 2012 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/META-INF/MANIFEST.MF (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/META-INF/MANIFEST.MF 2012-01-06 10:50:26 UTC (rev 37674) @@ -0,0 +1,12 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Application Server Interface Core Plugin +Bundle-SymbolicName: org.jboss.ide.eclipse.as.management.core +Bundle-Version: 2.3.0.qualifier +Bundle-Activator: org.jboss.ide.eclipse.as.management.core.AS7ManagementActivator +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime, + org.eclipse.wst.server.core +Bundle-ActivationPolicy: lazy +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Export-Package: org.jboss.ide.eclipse.as.management.core Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/build.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/build.properties (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/build.properties 2012-01-06 10:50:26 UTC (rev 37674) @@ -0,0 +1,5 @@ +source.. = src/ +output.. = bin/ +bin.includes = plugin.xml,\ + META-INF/,\ + . Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/pom.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/pom.xml (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/pom.xml 2012-01-06 10:50:26 UTC (rev 37674) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.jboss.tools.as</groupId> + <artifactId>plugins</artifactId> + <version>2.3.0-SNAPSHOT</version> + </parent> + <groupId>org.jboss.tools.as.plugins</groupId> + <artifactId>org.jboss.ide.eclipse.as.management.core</artifactId> + <packaging>eclipse-plugin</packaging> +</project> Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/AS7ManagementActivator.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/AS7ManagementActivator.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/AS7ManagementActivator.java 2012-01-06 10:50:26 UTC (rev 37674) @@ -0,0 +1,71 @@ +package org.jboss.ide.eclipse.as.management.core; + +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class AS7ManagementActivator extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.jboss.ide.eclipse.as.management.core"; //$NON-NLS-1$ + + // The shared instance + private static AS7ManagementActivator plugin; + + /** + * The constructor + */ + public AS7ManagementActivator() { + } + + /* + * (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 AS7ManagementActivator getDefault() { + return plugin; + } + + /** + * Get the bundle context for this plugin + * + * @return + */ + public static BundleContext getContext() { + return plugin.getBundle().getBundleContext(); + } + + + /** + * Returns an image descriptor for the image file at the given + * plug-in relative path + * + * @param path the path + * @return the image descriptor + */ + public static ImageDescriptor getImageDescriptor(String path) { + return imageDescriptorFromPlugin(PLUGIN_ID, path); + } +} Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/IAS7ManagementDetails.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/IAS7ManagementDetails.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/IAS7ManagementDetails.java 2012-01-06 10:50:26 UTC (rev 37674) @@ -0,0 +1,12 @@ +package org.jboss.ide.eclipse.as.management.core; + +import org.eclipse.wst.server.core.IServer; + +public interface IAS7ManagementDetails { + public String getHost(); + public int getManagementPort(); + public String getManagementUsername(); + public String getManagementPassword(); + public String[] handleCallbacks(String[] prompts) throws UnsupportedOperationException; + public IServer getServer(); +} Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/IJBoss7DeploymentResult.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/IJBoss7DeploymentResult.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/IJBoss7DeploymentResult.java 2012-01-06 10:50:26 UTC (rev 37674) @@ -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.core; + +import org.eclipse.core.runtime.IStatus; + +public interface IJBoss7DeploymentResult { + + public abstract IStatus getStatus() throws JBoss7ManangerException; + +} \ No newline at end of file Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/IJBoss7ManagerService.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/IJBoss7ManagerService.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/IJBoss7ManagerService.java 2012-01-06 10:50:26 UTC (rev 37674) @@ -0,0 +1,129 @@ +/******************************************************************************* + * 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.core; + +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 String AS_VERSION_710_Beta = "710.beta1"; //$NON-NLS-1$ + public static final int MGMT_PORT = 9999; + + public void init() throws Exception; + + /** + * 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(IAS7ManagementDetails details, + 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(IAS7ManagementDetails details, + 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(IAS7ManagementDetails details, + 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(IAS7ManagementDetails details, + 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(IAS7ManagementDetails details, 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(IAS7ManagementDetails details) 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(IAS7ManagementDetails details) throws Exception; + + /** + * Stops the given server + * + * @throws JBoss7ManangerException + * @throws Exception + */ + public void stop(IAS7ManagementDetails details) throws Exception; + + public void dispose(); +} Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/JBoss7DeploymentState.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/JBoss7DeploymentState.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/JBoss7DeploymentState.java 2012-01-06 10:50:26 UTC (rev 37674) @@ -0,0 +1,23 @@ +/******************************************************************************* + * 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.core; + + +/** + * An enum that reflects the state of a deployment. + * + * @author André Dietisheim + */ +public enum JBoss7DeploymentState { + STARTED , + STOPPED, + NOT_FOUND; +} \ No newline at end of file Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/JBoss7ManagerServiceProxy.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/JBoss7ManagerServiceProxy.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/JBoss7ManagerServiceProxy.java 2012-01-06 10:50:26 UTC (rev 37674) @@ -0,0 +1,90 @@ +/******************************************************************************* + * 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.core; + +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 void init() throws Exception { + checkedGetService().init(); + } + + public IJBoss7DeploymentResult deployAsync(IAS7ManagementDetails details, String deploymentName, File file, + IProgressMonitor monitor) throws Exception { + return checkedGetService().deployAsync(details, deploymentName, file, monitor); + } + + public IJBoss7DeploymentResult deploySync(IAS7ManagementDetails details, String deploymentName, File file, + IProgressMonitor monitor) throws Exception { + return checkedGetService().deployAsync(details, deploymentName, file, monitor); + } + + public IJBoss7DeploymentResult undeployAsync(IAS7ManagementDetails details, String deploymentName, boolean removeFile, + IProgressMonitor monitor) throws Exception { + return checkedGetService().undeployAsync(details, deploymentName, removeFile, monitor); + } + + public IJBoss7DeploymentResult syncUndeploy(IAS7ManagementDetails details, String deploymentName, boolean removeFile, + IProgressMonitor monitor) throws Exception { + return checkedGetService().syncUndeploy(details, deploymentName, removeFile, monitor); + } + + public JBoss7DeploymentState getDeploymentState(IAS7ManagementDetails details, String deploymentName) throws Exception { + return checkedGetService().getDeploymentState(details, deploymentName); + } + + public JBoss7ServerState getServerState(IAS7ManagementDetails details) throws Exception { + return checkedGetService().getServerState(details); + } + + public boolean isRunning(IAS7ManagementDetails details) throws Exception { + try { + return checkedGetService().isRunning(details); + } catch (Exception e) { + return false; + } + } + + public void stop(IAS7ManagementDetails details) throws Exception { + checkedGetService().stop(details); + } + + 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(); + } + +} Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/JBoss7ManagerUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/JBoss7ManagerUtil.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/JBoss7ManagerUtil.java 2012-01-06 10:50:26 UTC (rev 37674) @@ -0,0 +1,65 @@ +/******************************************************************************* + * Copyright (c) 2012 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.core; + +import org.eclipse.wst.server.core.IServer; +import org.osgi.framework.BundleContext; +import org.osgi.framework.InvalidSyntaxException; + +public class JBoss7ManagerUtil { + + private static final String JBOSS7_RUNTIME = "org.jboss.ide.eclipse.as.runtime.70"; //$NON-NLS-1$ + private static final String JBOSS71_RUNTIME = "org.jboss.ide.eclipse.as.runtime.71"; //$NON-NLS-1$ + private static final String EAP6_RUNTIME = "org.jboss.ide.eclipse.as.runtime.eap.60"; //$NON-NLS-1$ + + + public static IJBoss7ManagerService getService(IServer server) throws InvalidSyntaxException { + BundleContext context = AS7ManagementActivator.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) + || EAP6_RUNTIME.equals(id)) { + // This is the proper fix for now. See JBIDE-10293 + return IJBoss7ManagerService.AS_VERSION_710_Beta; + } + if( JBOSS71_RUNTIME.equals(id)) + return IJBoss7ManagerService.AS_VERSION_710_Beta; + 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; + } + +} Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/JBoss7ManangerConnectException.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/JBoss7ManangerConnectException.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/JBoss7ManangerConnectException.java 2012-01-06 10:50:26 UTC (rev 37674) @@ -0,0 +1,24 @@ +/******************************************************************************* + * 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.core; + +/** + * @author André Dietisheim + */ +public class JBoss7ManangerConnectException extends JBoss7ManangerException { + + private static final long serialVersionUID = 1L; + + public JBoss7ManangerConnectException(Throwable cause) { + super(cause); + } + +} Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/JBoss7ManangerException.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/JBoss7ManangerException.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/JBoss7ManangerException.java 2012-01-06 10:50:26 UTC (rev 37674) @@ -0,0 +1,32 @@ +/******************************************************************************* + * 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.core; + +/** + * @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); + } + +} Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/JBoss7ServerState.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/JBoss7ServerState.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/src/org/jboss/ide/eclipse/as/management/core/JBoss7ServerState.java 2012-01-06 10:50:26 UTC (rev 37674) @@ -0,0 +1,39 @@ +/******************************************************************************* + * 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.core; + +import java.text.MessageFormat; + +/** + * @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( + "No JBoss7ServerState enum for string {0}", + stateString)); + } + + return matchingState; + } +} Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/MANIFEST.MF (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/MANIFEST.MF 2012-01-06 10:50:26 UTC (rev 37674) @@ -0,0 +1,13 @@ +Manifest-Version: 1.0 +Export-Package: org.jboss.ide.eclipse.as.management.core +Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,org.eclipse.ws + t.server.core +Bundle-ActivationPolicy: lazy +Bundle-Version: 2.3.0.v20120106-0956-Beta1 +Bundle-Name: Application Server Interface Core Plugin +Bundle-Activator: org.jboss.ide.eclipse.as.management.core.AS7Manageme + ntActivator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.jboss.ide.eclipse.as.management.core +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 + Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/classes/org/jboss/ide/eclipse/as/management/core/AS7ManagementActivator.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/classes/org/jboss/ide/eclipse/as/management/core/AS7ManagementActivator.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/classes/org/jboss/ide/eclipse/as/management/core/IAS7ManagementDetails.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/classes/org/jboss/ide/eclipse/as/management/core/IAS7ManagementDetails.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/classes/org/jboss/ide/eclipse/as/management/core/IJBoss7DeploymentResult.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/classes/org/jboss/ide/eclipse/as/management/core/IJBoss7DeploymentResult.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/classes/org/jboss/ide/eclipse/as/management/core/IJBoss7ManagerService.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/classes/org/jboss/ide/eclipse/as/management/core/IJBoss7ManagerService.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/classes/org/jboss/ide/eclipse/as/management/core/JBoss7DeploymentState.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/classes/org/jboss/ide/eclipse/as/management/core/JBoss7DeploymentState.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/classes/org/jboss/ide/eclipse/as/management/core/JBoss7ManagerServiceProxy.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/classes/org/jboss/ide/eclipse/as/management/core/JBoss7ManagerServiceProxy.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/classes/org/jboss/ide/eclipse/as/management/core/JBoss7ManagerUtil$IServiceAware.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/classes/org/jboss/ide/eclipse/as/management/core/JBoss7ManagerUtil$IServiceAware.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/classes/org/jboss/ide/eclipse/as/management/core/JBoss7ManagerUtil.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/classes/org/jboss/ide/eclipse/as/management/core/JBoss7ManagerUtil.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/classes/org/jboss/ide/eclipse/as/management/core/JBoss7ManangerConnectException.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/classes/org/jboss/ide/eclipse/as/management/core/JBoss7ManangerConnectException.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/classes/org/jboss/ide/eclipse/as/management/core/JBoss7ManangerException.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/classes/org/jboss/ide/eclipse/as/management/core/JBoss7ManangerException.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/classes/org/jboss/ide/eclipse/as/management/core/JBoss7ServerState.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/classes/org/jboss/ide/eclipse/as/management/core/JBoss7ServerState.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/local-artifacts.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/local-artifacts.properties (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/local-artifacts.properties 2012-01-06 10:50:26 UTC (rev 37674) @@ -0,0 +1,5 @@ +#Fri Jan 06 17:57:59 CST 2012 +artifact.attached.p2metadata=/home/rob/code/jbtools/jbosstools/trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/p2content.xml +artifact.main=/home/rob/code/jbtools/jbosstools/trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/org.jboss.ide.eclipse.as.management.core-2.3.0-SNAPSHOT.jar +artifact.attached.sources=/home/rob/code/jbtools/jbosstools/trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/org.jboss.ide.eclipse.as.management.core-2.3.0-SNAPSHOT-sources.jar +artifact.attached.p2artifacts=/home/rob/code/jbtools/jbosstools/trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/p2artifacts.xml Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/maven-archiver/pom.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/maven-archiver/pom.properties (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/maven-archiver/pom.properties 2012-01-06 10:50:26 UTC (rev 37674) @@ -0,0 +1,5 @@ +#Generated by Maven +#Fri Jan 06 17:57:59 CST 2012 +version=2.3.0-SNAPSHOT +groupId=org.jboss.tools.as.plugins +artifactId=org.jboss.ide.eclipse.as.management.core Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/org.jboss.ide.eclipse.as.management.core-2.3.0-SNAPSHOT-sources.jar =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/org.jboss.ide.eclipse.as.management.core-2.3.0-SNAPSHOT-sources.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/org.jboss.ide.eclipse.as.management.core-2.3.0-SNAPSHOT.jar =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/org.jboss.ide.eclipse.as.management.core-2.3.0-SNAPSHOT.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/p2artifacts.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/p2artifacts.xml (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/p2artifacts.xml 2012-01-06 10:50:26 UTC (rev 37674) @@ -0,0 +1,25 @@ +<?xml version='1.0' encoding='UTF-8'?> +<?artifactRepository version='1.1.0'?> +<artifacts size='2'> + <artifact classifier='osgi.bundle' id='org.jboss.ide.eclipse.as.management.core' version='2.3.0.v20120106-0956-Beta1'> + <properties size='6'> + <property name='artifact.size' value='12356'/> + <property name='download.size' value='12356'/> + <property name='download.md5' value='67f73f0fbbcc7291704f207edffa6d5f'/> + <property name='maven-groupId' value='org.jboss.tools.as.plugins'/> + <property name='maven-artifactId' value='org.jboss.ide.eclipse.as.management.core'/> + <property name='maven-version' value='2.3.0-SNAPSHOT'/> + </properties> + </artifact> + <artifact classifier='osgi.bundle' id='org.jboss.ide.eclipse.as.management.core.source' version='2.3.0.v20120106-0956-Beta1'> + <properties size='7'> + <property name='artifact.size' value='9222'/> + <property name='download.size' value='9222'/> + <property name='download.md5' value='eea4c47a320a7c969197689afa8428b5'/> + <property name='maven-groupId' value='org.jboss.tools.as.plugins'/> + <property name='maven-artifactId' value='org.jboss.ide.eclipse.as.management.core'/> + <property name='maven-version' value='2.3.0-SNAPSHOT'/> + <property name='maven-classifier' value='sources'/> + </properties> + </artifact> +</artifacts> Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/p2content.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/p2content.xml (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/target/p2content.xml 2012-01-06 10:50:26 UTC (rev 37674) @@ -0,0 +1,59 @@ +<?xml version='1.0' encoding='UTF-8'?> +<units size='2'> + <unit id='org.jboss.ide.eclipse.as.management.core' version='2.3.0.v20120106-0956-Beta1' singleton='false'> + <update id='org.jboss.ide.eclipse.as.management.core' range='[0.0.0,2.3.0.v20120106-0956-Beta1)' severity='0'/> + <properties size='4'> + <property name='org.eclipse.equinox.p2.name' value='Application Server Interface Core Plugin'/> + <property name='maven-groupId' value='org.jboss.tools.as.plugins'/> + <property name='maven-artifactId' value='org.jboss.ide.eclipse.as.management.core'/> + <property name='maven-version' value='2.3.0-SNAPSHOT'/> + </properties> + <provides size='4'> + <provided namespace='org.eclipse.equinox.p2.iu' name='org.jboss.ide.eclipse.as.management.core' version='2.3.0.v20120106-0956-Beta1'/> + <provided namespace='osgi.bundle' name='org.jboss.ide.eclipse.as.management.core' version='2.3.0.v20120106-0956-Beta1'/> + <provided namespace='java.package' name='org.jboss.ide.eclipse.as.management.core' version='0.0.0'/> + <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/> + </provides> + <requires size='3'> + <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/> + <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/> + <required namespace='osgi.bundle' name='org.eclipse.wst.server.core' range='0.0.0'/> + </requires> + <artifacts size='1'> + <artifact classifier='osgi.bundle' id='org.jboss.ide.eclipse.as.management.core' version='2.3.0.v20120106-0956-Beta1'/> + </artifacts> + <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/> + <touchpointData size='1'> + <instructions size='1'> + <instruction key='manifest'> + Bundle-SymbolicName: org.jboss.ide.eclipse.as.management.core&#xA;Bundle-Version: 2.3.0.v20120106-0956-Beta1&#xA; + </instruction> + </instructions> + </touchpointData> + </unit> + <unit id='org.jboss.ide.eclipse.as.management.core.source' version='2.3.0.v20120106-0956-Beta1' singleton='false'> + <update id='org.jboss.ide.eclipse.as.management.core.source' range='[0.0.0,2.3.0.v20120106-0956-Beta1)' severity='0'/> + <properties size='4'> + <property name='maven-groupId' value='org.jboss.tools.as.plugins'/> + <property name='maven-artifactId' value='org.jboss.ide.eclipse.as.management.core'/> + <property name='maven-version' value='2.3.0-SNAPSHOT'/> + <property name='maven-classifier' value='sources'/> + </properties> + <provides size='3'> + <provided namespace='org.eclipse.equinox.p2.iu' name='org.jboss.ide.eclipse.as.management.core.source' version='2.3.0.v20120106-0956-Beta1'/> + <provided namespace='osgi.bundle' name='org.jboss.ide.eclipse.as.management.core.source' version='2.3.0.v20120106-0956-Beta1'/> + <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='source' version='1.0.0'/> + </provides> + <artifacts size='1'> + <artifact classifier='osgi.bundle' id='org.jboss.ide.eclipse.as.management.core.source' version='2.3.0.v20120106-0956-Beta1'/> + </artifacts> + <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/> + <touchpointData size='1'> + <instructions size='1'> + <instruction key='manifest'> + Bundle-SymbolicName: org.jboss.ide.eclipse.as.management.core.source&#xA;Bundle-Version: 2.3.0.v20120106-0956-Beta1&#xA; + </instruction> + </instructions> + </touchpointData> + </unit> +</units> 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 2012-01-06 10:22:29 UTC (rev 37673) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/META-INF/MANIFEST.MF 2012-01-06 10:50:26 UTC (rev 37674) @@ -23,7 +23,8 @@ org.eclipse.jem.util;bundle-version="2.1.2", org.jboss.ide.eclipse.archives.webtools, org.eclipse.debug.core;bundle-version="3.7.0", - org.eclipse.jdt.launching;bundle-version="3.6.0" + org.eclipse.jdt.launching;bundle-version="3.6.0", + org.jboss.ide.eclipse.as.management.core;bundle-version="1.0.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: org.jboss.ide.eclipse.as.rse.core, 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 2012-01-06 10:22:29 UTC (rev 37673) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java 2012-01-06 10:50:26 UTC (rev 37674) @@ -23,9 +23,8 @@ import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; import org.jboss.ide.eclipse.as.core.Messages; import org.jboss.ide.eclipse.as.core.server.v7.management.AS7ManagementDetails; -import org.jboss.ide.eclipse.as.core.server.v7.management.IJBoss7ManagerService; -import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ManagerUtil; -import org.jboss.ide.eclipse.as.core.util.ServerUtil; +import org.jboss.ide.eclipse.as.management.core.IJBoss7ManagerService; +import org.jboss.ide.eclipse.as.management.core.JBoss7ManagerUtil; public class RSEJBoss7BehaviourDelegate extends RSEBehaviourDelegate { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF 2012-01-06 10:22:29 UTC (rev 37673) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF 2012-01-06 10:50:26 UTC (rev 37674) @@ -55,7 +55,8 @@ org.eclipse.wst.common.project.facet.ui;bundle-version="1.4.200", org.jboss.ide.eclipse.as.wtp.core;bundle-version="2.3.0", org.eclipse.jst.common.project.facet.core;bundle-version="1.4.200", - org.eclipse.wst.common.emfworkbench.integration;bundle-version="1.2.100" + org.eclipse.wst.common.emfworkbench.integration;bundle-version="1.2.100", + org.jboss.ide.eclipse.as.management.core;bundle-version="1.0.0" Bundle-ActivationPolicy: lazy Export-Package: org.jboss.ide.eclipse.as.ui, org.jboss.ide.eclipse.as.ui.console, Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBTWebLaunchableClient.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBTWebLaunchableClient.java 2012-01-06 10:22:29 UTC (rev 37673) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBTWebLaunchableClient.java 2012-01-06 10:50:26 UTC (rev 37674) @@ -51,11 +51,11 @@ import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7Server; import org.jboss.ide.eclipse.as.core.server.v7.management.AS7ManagementDetails; -import org.jboss.ide.eclipse.as.core.server.v7.management.IJBoss7ManagerService; -import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7DeploymentState; -import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ManagerUtil; import org.jboss.ide.eclipse.as.core.util.ServerConverter; import org.jboss.ide.eclipse.as.core.util.ServerUtil; +import org.jboss.ide.eclipse.as.management.core.IJBoss7ManagerService; +import org.jboss.ide.eclipse.as.management.core.JBoss7DeploymentState; +import org.jboss.ide.eclipse.as.management.core.JBoss7ManagerUtil; import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin; public class JBTWebLaunchableClient extends ClientDelegate { Modified: trunk/as/plugins/pom.xml =================================================================== --- trunk/as/plugins/pom.xml 2012-01-06 10:22:29 UTC (rev 37673) +++ trunk/as/plugins/pom.xml 2012-01-06 10:50:26 UTC (rev 37674) @@ -23,6 +23,7 @@ <module>org.jboss.ide.eclipse.as.rse.core</module> <module>org.jboss.ide.eclipse.as.rse.ui</module> <module>org.jboss.ide.eclipse.as.jmx.integration</module> + <module>org.jboss.ide.eclipse.as.management.core</module> <module>org.jboss.ide.eclipse.as.management.as7</module> <module>org.jboss.ide.eclipse.as.management.as71</module> </modules> Modified: trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/META-INF/MANIFEST.MF =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/META-INF/MANIFEST.MF 2012-01-06 10:22:29 UTC (rev 37673) +++ trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/META-INF/MANIFEST.MF 2012-01-06 10:50:26 UTC (rev 37674) @@ -9,7 +9,8 @@ org.junit;bundle-version="[4.8.1,5.0.0)", org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)", org.hamcrest;bundle-version="[1.1.0,2.0.0)", - org.jboss.ide.eclipse.as.test + org.jboss.ide.eclipse.as.test, + org.jboss.ide.eclipse.as.management.core;bundle-version="1.0.0" Bundle-ClassPath: ., wars/ Bundle-ActivationPolicy: lazy 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 2012-01-06 10:22:29 UTC (rev 37673) +++ trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/AS7ManagerIntegrationTest.java 2012-01-06 10:50:26 UTC (rev 37674) @@ -23,11 +23,11 @@ import java.net.UnknownHostException; import java.util.concurrent.ExecutionException; -import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7DeploymentState; -import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ManangerException; -import org.jboss.ide.eclipse.as.core.server.v7.management.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.core.JBoss7DeploymentState; +import org.jboss.ide.eclipse.as.management.core.JBoss7ManangerException; +import org.jboss.ide.eclipse.as.management.core.JBoss7ServerState; import org.jboss.ide.eclipse.as.test.server.JBossManagerTest.MockAS7ManagementDetails; import org.junit.After; import org.junit.Before; 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 2012-01-06 10:22:29 UTC (rev 37673) +++ trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/JBossManagementServiceTest.java 2012-01-06 10:50:26 UTC (rev 37674) @@ -14,7 +14,7 @@ import java.net.UnknownHostException; -import org.jboss.ide.eclipse.as.core.server.v7.management.IJBoss7ManagerService; +import org.jboss.ide.eclipse.as.management.core.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 2012-01-06 10:22:29 UTC (rev 37673) +++ trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/utils/AS7ManagerTestUtils.java 2012-01-06 10:50:26 UTC (rev 37674) @@ -25,9 +25,9 @@ import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Platform; -import org.jboss.ide.eclipse.as.core.server.v7.management.IJBoss7DeploymentResult; -import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ManangerException; import org.jboss.ide.eclipse.as.internal.management.as7.AS7Manager; +import org.jboss.ide.eclipse.as.management.core.IJBoss7DeploymentResult; +import org.jboss.ide.eclipse.as.management.core.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 2012-01-06 10:22:29 UTC (rev 37673) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/META-INF/MANIFEST.MF 2012-01-06 10:50:26 UTC (rev 37674) @@ -41,7 +41,8 @@ org.jboss.ide.eclipse.as.wtp.core, org.jboss.ide.eclipse.as.wtp.ui, org.eclipse.jst.jsf.core, - org.eclipse.jpt.jpa.core + org.eclipse.jpt.jpa.core, + org.jboss.ide.eclipse.as.management.core;bundle-version="1.0.0" Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin 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 2012-01-06 10:22:29 UTC (rev 37673) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/JBossManagerTest.java 2012-01-06 10:50:26 UTC (rev 37674) @@ -18,12 +18,13 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.jboss.ide.eclipse.as.core.server.v7.management.AS7ManagementDetails; -import org.jboss.ide.eclipse.as.core.server.v7.management.IJBoss7DeploymentResult; -import org.jboss.ide.eclipse.as.core.server.v7.management.IJBoss7ManagerService; -import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7DeploymentState; -import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ManagerServiceProxy; -import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ManangerException; -import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ServerState; +import org.jboss.ide.eclipse.as.management.core.IAS7ManagementDetails; +import org.jboss.ide.eclipse.as.management.core.IJBoss7DeploymentResult; +import org.jboss.ide.eclipse.as.management.core.IJBoss7ManagerService; +import org.jboss.ide.eclipse.as.management.core.JBoss7DeploymentState; +import org.jboss.ide.eclipse.as.management.core.JBoss7ManagerServiceProxy; +import org.jboss.ide.eclipse.as.management.core.JBoss7ManangerException; +import org.jboss.ide.eclipse.as.management.core.JBoss7ServerState; import org.jboss.ide.eclipse.as.test.ASTest; import org.junit.Test; import org.osgi.framework.BundleContext; @@ -73,40 +74,40 @@ private static class JBoss71Manager implements IJBoss7ManagerService { - public IJBoss7DeploymentResult deployAsync(AS7ManagementDetails details, String deploymentName, File file, + public IJBoss7DeploymentResult deployAsync(IAS7ManagementDetails details, String deploymentName, File file, IProgressMonitor monitor) throws JBoss7ManangerException { throw new UnsupportedOperationException(); } - public IJBoss7DeploymentResult deploySync(AS7ManagementDetails details, String deploymentName, File file, + public IJBoss7DeploymentResult deploySync(IAS7ManagementDetails details, String deploymentName, File file, IProgressMonitor monitor) throws JBoss7ManangerException { throw new UnsupportedOperationException(); } - public IJBoss7DeploymentResult undeployAsync(AS7ManagementDetails details, String deploymentName, boolean removeFile, + public IJBoss7DeploymentResult undeployAsync(IAS7ManagementDetails details, String deploymentName, boolean removeFile, IProgressMonitor monitor) throws JBoss7ManangerException { throw new UnsupportedOperationException(); } - public IJBoss7DeploymentResult syncUndeploy(AS7ManagementDetails details, String deploymentName, boolean removeFile, + public IJBoss7DeploymentResult syncUndeploy(IAS7ManagementDetails details, String deploymentName, boolean removeFile, IProgressMonitor monitor) throws JBoss7ManangerException { throw new UnsupportedOperationException(); } - public JBoss7DeploymentState getDeploymentState(AS7ManagementDetails details, String deploymentName) + public JBoss7DeploymentState getDeploymentState(IAS7ManagementDetails details, String deploymentName) throws JBoss7ManangerException { throw new UnsupportedOperationException(); } - public JBoss7ServerState getServerState(AS7ManagementDetails details) throws Exception { + public JBoss7ServerState getServerState(IAS7ManagementDetails details) throws Exception { throw new UnsupportedOperationException(); } - public boolean isRunning(AS7ManagementDetails details) { + public boolean isRunning(IAS7ManagementDetails details) { throw new UnsupportedOperationException(); } - public void stop(AS7ManagementDetails details) throws JBoss7ManangerException { + public void stop(IAS7ManagementDetails details) throws JBoss7ManangerException { } public void dispose() {