[jbosstools-commits] JBoss Tools SVN: r31365 - in trunk/as: plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server and 10 other directories.

Author: adietish Date: 2011-05-19 05:02:43 -0400 (Thu, 19 May 2011) New Revision: 31365 Added: 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/JBoss7ManangerConnectException.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7RuntimeLaunchConfigurator.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/JBoss7RuntimeClasspathUtil.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/JBossServerBehaviorUtils.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PollThreadUtils.java trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/DeployOnlyRSEPrefComposite.java trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/JBoss7RSEDeploymentPrefComposite.java trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/JBossRSEDeploymentPrefComposite.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBoss7LaunchConfigurationTabGroup.java Removed: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7RuntimeClasspathUtil.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBoss7ManagerService.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerAttributeHelper.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/TwiddleLaunchConfiguration.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServiceProxy.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerUtil.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7RuntimeLaunchConfigBuilder.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerStartupLaunchConfiguration.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7ServerRuntime.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBoss7ManagerService.java trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPageCallback.java trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBossLaunchConfigurationTabGroup.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerActionProvider.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerContentProvider.java trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/JBossManagerTest.java Log: [JBIDE-8959] moved code from workspace to TRUNK Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java 2011-05-19 00:46:30 UTC (rev 31364) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java 2011-05-19 09:02:43 UTC (rev 31365) @@ -41,7 +41,7 @@ t.start(); } - public void pollerRun() { + private void pollerRun() { done = false; String url = getURL(getServer()); while(!canceled && !done) { @@ -53,7 +53,7 @@ } } - public static String getURL(IServer server) { + private static String getURL(IServer server) { String url = "http://"+server.getHost(); //$NON-NLS-1$ JBossServer jbs = ServerConverter.getJBossServer(server); int port = jbs.getJBossWebPort(); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBoss7ManagerService.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBoss7ManagerService.java 2011-05-19 00:46:30 UTC (rev 31364) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBoss7ManagerService.java 2011-05-19 09:02:43 UTC (rev 31365) @@ -26,8 +26,8 @@ /** * Asynchronously deploy a file to a server + * @param host * - * @param host * The host * @param port * The port @@ -130,6 +130,8 @@ */ public JBoss7ServerState getServerState(String host, int port) throws Exception; + public JBoss7ServerState getServerState(String host) throws Exception; + /** * Stops the given server * @@ -139,6 +141,6 @@ public void stop(String host, int port) throws Exception; public void stop(String host) throws Exception; - + public void dispose(); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2011-05-19 00:46:30 UTC (rev 31364) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2011-05-19 09:02:43 UTC (rev 31365) @@ -37,6 +37,7 @@ import org.jboss.ide.eclipse.as.core.server.IServerStatePoller; import org.jboss.ide.eclipse.as.core.server.internal.launch.StopLaunchConfiguration; import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants; +import org.jboss.ide.eclipse.as.core.util.PollThreadUtils; /** * @@ -161,10 +162,11 @@ } protected void pollServer(final boolean expectedState) { - if( this.pollThread != null ) { + if( pollThread != null ) { pollThread.cancel(); } - this.pollThread = new PollThread(Messages.ServerPollerThreadName, expectedState, getActualBehavior()); + IServerStatePoller poller = PollThreadUtils.getPoller(expectedState, getServer()); + this.pollThread = new PollThread(Messages.ServerPollerThreadName, expectedState, poller, getActualBehavior()); pollThread.start(); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2011-05-19 00:46:30 UTC (rev 31364) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2011-05-19 09:02:43 UTC (rev 31365) @@ -10,6 +10,26 @@ ******************************************************************************/ package org.jboss.ide.eclipse.as.core.server.internal; +import static org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants.DEFAULT_MEM_ARGS; +import static org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants.DEFAULT_MEM_ARGS_AS50; +import static org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants.ENDORSED_DIRS; +import static org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants.EQ; +import static org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants.JAVA_LIB_PATH; +import static org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants.JAVA_PREFER_IP4_ARG; +import static org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants.PROGRAM_NAME_ARG; +import static org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants.QUOTE; +import static org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants.SERVER_ARG; +import static org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants.SPACE; +import static org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants.STARTUP_ARG_CONFIG_LONG; +import static org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants.SUN_CLIENT_GC_ARG; +import static org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants.SUN_SERVER_GC_ARG; +import static org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants.SYSPROP; +import static org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants.BIN; +import static org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants.ENDORSED; +import static org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants.LIB; +import static org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants.NATIVE; +import static org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants.SERVER; + import java.util.HashMap; import org.eclipse.core.runtime.IPath; @@ -23,15 +43,14 @@ import org.eclipse.wst.server.core.IRuntimeType; import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; import org.jboss.ide.eclipse.as.core.Messages; -import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; -import org.jboss.ide.eclipse.as.core.util.IConstants; +import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants; import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; public class LocalJBossServerRuntime extends AbstractLocalJBossServerRuntime implements IJBossServerRuntime { public void setDefaults(IProgressMonitor monitor) { super.setDefaults(monitor); - setAttribute(IJBossServerRuntime.PROPERTY_CONFIGURATION_NAME, IJBossServerConstants.DEFAULT_CONFIGURATION); + setAttribute(IJBossServerRuntime.PROPERTY_CONFIGURATION_NAME, IJBossRuntimeResourceConstants.DEFAULT_CONFIGURATION); } protected String getNextRuntimeName() { @@ -68,47 +87,46 @@ } public String getDefaultRunArgs() { - return IConstants.STARTUP_ARG_CONFIG_LONG + "=" + getJBossConfiguration() + IConstants.SPACE; //$NON-NLS-1$ + return STARTUP_ARG_CONFIG_LONG + "=" + getJBossConfiguration() + SPACE; //$NON-NLS-1$ } public String getDefaultRunVMArgs() { - IConstants c = new IConstants(){}; String name = getRuntime().getName(); - String ret = c.QUOTE + c.SYSPROP + c.PROGRAM_NAME_ARG + c.EQ + - "JBossTools: " + name + c.QUOTE + c.SPACE; //$NON-NLS-1$ + String ret = QUOTE + SYSPROP + PROGRAM_NAME_ARG + EQ + + "JBossTools: " + name + QUOTE + SPACE; //$NON-NLS-1$ if( Platform.getOS().equals(Platform.OS_MACOSX)) - ret += c.SERVER_ARG + c.SPACE; + ret += SERVER_ARG + SPACE; IRuntimeType type = getRuntime().getRuntimeType(); if (type != null && (IJBossToolingConstants.AS_50.equals(type.getId()) || IJBossToolingConstants.AS_51.equals(type.getId()) || IJBossToolingConstants.AS_60.equals(type.getId()) || IJBossToolingConstants.EAP_50.equals(type.getId())) ) { - ret += c.DEFAULT_MEM_ARGS_AS50; + ret += DEFAULT_MEM_ARGS_AS50; } else { - ret += c.DEFAULT_MEM_ARGS; + ret += DEFAULT_MEM_ARGS; } if( Platform.getOS().equals(Platform.OS_LINUX)) - ret += c.SYSPROP + c.JAVA_PREFER_IP4_ARG + c.EQ + true + c.SPACE; - ret += c.SYSPROP + c.SUN_CLIENT_GC_ARG + c.EQ + 3600000 + c.SPACE; - ret += c.SYSPROP + c.SUN_SERVER_GC_ARG + c.EQ + 3600000 + c.SPACE; - ret += c.QUOTE + c.SYSPROP + c.ENDORSED_DIRS + c.EQ + - (getRuntime().getLocation().append(c.LIB).append(c.ENDORSED)) + c.QUOTE + c.SPACE; - if( getRuntime().getLocation().append(c.BIN).append(c.NATIVE).toFile().exists() ) - ret += c.SYSPROP + c.JAVA_LIB_PATH + c.EQ + c.QUOTE + - getRuntime().getLocation().append(c.BIN).append(c.NATIVE) + c.QUOTE + c.SPACE; + ret += SYSPROP + JAVA_PREFER_IP4_ARG + EQ + true + SPACE; + ret += SYSPROP + SUN_CLIENT_GC_ARG + EQ + 3600000 + SPACE; + ret += SYSPROP + SUN_SERVER_GC_ARG + EQ + 3600000 + SPACE; + ret += QUOTE + SYSPROP + ENDORSED_DIRS + EQ + + (getRuntime().getLocation().append(LIB).append(ENDORSED)) + QUOTE + SPACE; + if( getRuntime().getLocation().append(BIN).append(NATIVE).toFile().exists() ) + ret += SYSPROP + JAVA_LIB_PATH + EQ + QUOTE + + getRuntime().getLocation().append(BIN).append(NATIVE) + QUOTE + SPACE; return ret; } public HashMap<String, String> getDefaultRunEnvVars(){ HashMap<String, String> envVars = new HashMap<String, String>(1); - envVars.put("Path", IConstants.NATIVE); //$NON-NLS-1$ + envVars.put("Path", NATIVE); //$NON-NLS-1$ return envVars; } public String getConfigLocation() { - return getAttribute(PROPERTY_CONFIG_LOCATION, IConstants.SERVER); + return getAttribute(PROPERTY_CONFIG_LOCATION, SERVER); } public void setConfigLocation(String configLocation) { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java 2011-05-19 00:46:30 UTC (rev 31364) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java 2011-05-19 09:02:43 UTC (rev 31365) @@ -21,12 +21,10 @@ import org.jboss.ide.eclipse.as.core.Messages; import org.jboss.ide.eclipse.as.core.extensions.events.IEventCodes; import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger; -import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants; import org.jboss.ide.eclipse.as.core.server.IPollerFailureHandler; import org.jboss.ide.eclipse.as.core.server.IServerStatePoller; import org.jboss.ide.eclipse.as.core.server.IServerStatePoller.PollingException; import org.jboss.ide.eclipse.as.core.server.IServerStatePoller.RequiresInfoException; -import org.jboss.ide.eclipse.as.core.util.ServerConverter; /** * @@ -56,35 +54,15 @@ private JBossServerBehavior behavior; private String pollerId; - public PollThread(String name, boolean expectedState, - JBossServerBehavior behavior) { + public PollThread(String name, boolean expectedState, IServerStatePoller poller, JBossServerBehavior behavior) { super(name); this.expectedState = expectedState; this.abort = false; this.abortMessage = null; this.behavior = behavior; - this.poller = discoverPoller(behavior, expectedState); + this.poller = poller; } - protected IServerStatePoller discoverPoller(JBossServerBehavior behavior, - boolean expectedState) { - JBossServer s = ServerConverter.getJBossServer(behavior.getServer()); - ServerAttributeHelper helper = s.getAttributeHelper(); - String key = expectedState == IServerStatePoller.SERVER_UP ? IJBossServerConstants.STARTUP_POLLER_KEY - : IJBossServerConstants.SHUTDOWN_POLLER_KEY; - String defaultPoller = expectedState == IServerStatePoller.SERVER_UP ? IJBossServerConstants.DEFAULT_STARTUP_POLLER - : IJBossServerConstants.DEFAULT_SHUTDOWN_POLLER; - pollerId = helper.getAttribute(key, defaultPoller); - ServerStatePollerType type = ExtensionManager.getDefault() - .getPollerType(pollerId); - if (type != null) { - IServerStatePoller tempPoller = type.createPoller(); - tempPoller.setPollerType(type); - return tempPoller; - } - return null; - } - public void cancel() { cancel(null); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerAttributeHelper.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerAttributeHelper.java 2011-05-19 00:46:30 UTC (rev 31364) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerAttributeHelper.java 2011-05-19 09:02:43 UTC (rev 31365) @@ -21,7 +21,6 @@ import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.IServerWorkingCopy; import org.eclipse.wst.server.core.internal.Server; -import org.eclipse.wst.server.core.internal.ServerWorkingCopy; import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; import org.jboss.ide.eclipse.as.core.Messages; @@ -43,10 +42,10 @@ return null; } - private ServerWorkingCopy wch; + private IServerWorkingCopy wch; private IServer server; public ServerAttributeHelper(IServer server, IServerWorkingCopy copy) { - this.wch = (ServerWorkingCopy)copy; + this.wch = copy; this.server = server; } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java 2011-05-19 00:46:30 UTC (rev 31364) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java 2011-05-19 09:02:43 UTC (rev 31365) @@ -17,14 +17,19 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.ILaunch; import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.ILaunchConfigurationType; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.debug.core.ILaunchManager; +import org.eclipse.osgi.util.NLS; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.ServerUtil; +import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; +import org.jboss.ide.eclipse.as.core.Messages; import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod; import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethodType; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; @@ -80,7 +85,11 @@ public String[] getJavaLibraryPath(ILaunchConfiguration configuration) throws CoreException { IServer server = ServerUtil.getServer(configuration); - JBossServer jbs = AbstractJBossLaunchConfigType.findJBossServer(server.getId()); + JBossServer jbs = ServerConverter.findJBossServer(server.getId()); + if (jbs == null) { + throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, + NLS.bind(Messages.ServerNotFound, server.getId()))); + } IJBossServerRuntime runtime = (IJBossServerRuntime) jbs.getServer().getRuntime().loadAdapter(IJBossServerRuntime.class, null); IPath nativeFolder = runtime.getRuntime().getLocation() Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java 2011-05-19 00:46:30 UTC (rev 31364) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java 2011-05-19 09:02:43 UTC (rev 31365) @@ -36,7 +36,6 @@ import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.ServerCore; -import org.eclipse.wst.server.core.ServerUtil; import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; import org.jboss.ide.eclipse.as.core.Messages; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; @@ -46,12 +45,14 @@ import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossBehaviorDelegate; import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration.IStartLaunchSetupParticipant; import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration.StartLaunchDelegate; -import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7RuntimeClasspathUtil; import org.jboss.ide.eclipse.as.core.util.ArgsUtil; import org.jboss.ide.eclipse.as.core.util.IConstants; import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants; import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants; import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; +import org.jboss.ide.eclipse.as.core.util.JBoss7RuntimeClasspathUtil; +import org.jboss.ide.eclipse.as.core.util.JBossServerBehaviorUtils; +import org.jboss.ide.eclipse.as.core.util.ServerConverter; public class LocalJBossServerStartupLaunchUtil implements StartLaunchDelegate, IStartLaunchSetupParticipant { @@ -67,11 +68,11 @@ } // Upgrade old launch configs - JBossServer jbs = AbstractJBossLaunchConfigType.findJBossServer(server.getId()); - if (jbs == null) + JBossServer jbs = ServerConverter.findJBossServer(server.getId()); + if (jbs == null) { throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, NLS.bind(Messages.CannotSetUpImproperServer, server.getName()))); - + } String cpProvider = workingCopy.getAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH_PROVIDER, (String) null); if (!DEFAULT_CP_PROVIDER_ID.equals(cpProvider)) { @@ -177,10 +178,11 @@ } protected static void forceDefaultsSet(ILaunchConfigurationWorkingCopy wc, IServer server) throws CoreException { - JBossServer jbs = AbstractJBossLaunchConfigType.findJBossServer(server.getId()); - if (jbs == null) + JBossServer jbs = ServerConverter.findJBossServer(server.getId()); + if (jbs == null) { throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, NLS.bind(Messages.CannotSetUpImproperServer, server.getName()))); + } String serverHome = AbstractJBossLaunchConfigType.getServerHome(jbs); if (serverHome == null) @@ -247,12 +249,6 @@ return null; } - public static JBossServerBehavior getServerBehavior(ILaunchConfiguration configuration) throws CoreException { - IServer server = ServerUtil.getServer(configuration); - JBossServerBehavior jbossServerBehavior = (JBossServerBehavior) server.getAdapter(JBossServerBehavior.class); - return jbossServerBehavior; - } - /* For "restore defaults" functionality */ private static final String DEFAULT_CP_PROVIDER_ID = "org.jboss.ide.eclipse.as.core.server.internal.launch.serverClasspathProvider"; //$NON-NLS-1$ @@ -305,7 +301,7 @@ public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException { - JBossServerBehavior jbsBehavior = getServerBehavior(configuration); + JBossServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration); if (!jbsBehavior.canStart(mode).isOK()) throw new CoreException(jbsBehavior.canStart(mode)); return true; @@ -314,7 +310,7 @@ public void preLaunch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException { try { - JBossServerBehavior jbsBehavior = getServerBehavior(configuration); + JBossServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration); jbsBehavior.setRunMode(mode); jbsBehavior.serverStarting(); } catch (CoreException ce) { @@ -326,7 +322,7 @@ ILaunch launch, IProgressMonitor monitor) throws CoreException { try { IProcess[] processes = launch.getProcesses(); - JBossServerBehavior jbsBehavior = getServerBehavior(configuration); + JBossServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration); ((LocalJBossBehaviorDelegate) (jbsBehavior.getDelegate())).setProcess(processes[0]); } catch (CoreException ce) { // report Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java 2011-05-19 00:46:30 UTC (rev 31364) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java 2011-05-19 09:02:43 UTC (rev 31365) @@ -100,23 +100,27 @@ } public static String getDefaultArgs(JBossServer jbs) { - IJBossRuntimeConstants c = new IJBossRuntimeConstants() {}; - IJBossToolingConstants tc = new IJBossToolingConstants() {}; String runtimeTypeId = jbs.getRuntime().getRuntime().getRuntimeType().getId(); String serverUrl; - if (runtimeTypeId.equals(tc.AS_60)){ + if (runtimeTypeId.equals(IJBossToolingConstants.AS_60)){ IJBoss6Server server6 = (IJBoss6Server)jbs.getServer().loadAdapter(IJBoss6Server.class, new NullProgressMonitor()); serverUrl = "service:jmx:rmi:///jndi/rmi://" + jbs.getHost() + ":" + server6.getJMXRMIPort() + "/jmxrmi"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } else { serverUrl = jbs.getHost() + ":" + jbs.getJNDIPort(); //$NON-NLS-1$ } - String args = c.SHUTDOWN_STOP_ARG + c.SPACE; - args += c.SHUTDOWN_SERVER_ARG + c.SPACE + serverUrl + c.SPACE; + String args = IJBossRuntimeConstants.SHUTDOWN_STOP_ARG + + IJBossRuntimeConstants.SPACE; + args += IJBossRuntimeConstants.SHUTDOWN_SERVER_ARG + + IJBossRuntimeConstants.SPACE + + serverUrl + + IJBossRuntimeConstants.SPACE; if( jbs.getUsername() != null && !jbs.getUsername().equals("")) //$NON-NLS-1$ - args += c.SHUTDOWN_USER_ARG + c.SPACE + jbs.getUsername() + c.SPACE; + args += IJBossRuntimeConstants.SHUTDOWN_USER_ARG + + IJBossRuntimeConstants.SPACE + jbs.getUsername() + IJBossRuntimeConstants.SPACE; if( jbs.getPassword() != null && !jbs.getPassword().equals("")) //$NON-NLS-1$ - args += c.SHUTDOWN_PASS_ARG + c.SPACE + jbs.getPassword() + c.SPACE; + args += IJBossRuntimeConstants.SHUTDOWN_PASS_ARG + + IJBossRuntimeConstants.SPACE + jbs.getPassword() + IJBossRuntimeConstants.SPACE; return args; } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/TwiddleLaunchConfiguration.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/TwiddleLaunchConfiguration.java 2011-05-19 00:46:30 UTC (rev 31364) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/TwiddleLaunchConfiguration.java 2011-05-19 09:02:43 UTC (rev 31365) @@ -10,22 +10,36 @@ ******************************************************************************/ package org.jboss.ide.eclipse.as.core.server.internal.launch; + +import static org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants.RMIAdaptor; +import static org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants.SHUTDOWN_ADAPTER_ARG; +import static org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants.SHUTDOWN_PASS_ARG; +import static org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants.SHUTDOWN_SERVER_ARG; +import static org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants.SHUTDOWN_USER_ARG; +import static org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants.SPACE; + import java.io.File; import java.util.ArrayList; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.Status; import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.ILaunchConfigurationType; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.debug.core.ILaunchManager; import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants; import org.eclipse.jdt.launching.IRuntimeClasspathEntry; +import org.eclipse.osgi.util.NLS; import org.eclipse.wst.server.core.IServer; +import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; +import org.jboss.ide.eclipse.as.core.Messages; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants; import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants; +import org.jboss.ide.eclipse.as.core.util.ServerConverter; public class TwiddleLaunchConfiguration extends AbstractJBossLaunchConfigType { @@ -40,7 +54,11 @@ } public static ILaunchConfigurationWorkingCopy createLaunchConfiguration(IServer server, String args) throws CoreException { - JBossServer jbs = findJBossServer(server.getId()); + JBossServer jbs = ServerConverter.findJBossServer(server.getId()); + if (jbs == null) { + throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, + NLS.bind(Messages.ServerNotFound, server.getName()))); + } IJBossServerRuntime jbrt = findJBossServerRuntime(server); String serverHome = getServerHome(jbs); @@ -71,16 +89,28 @@ } public static String getDefaultArgs(IServer server) throws CoreException { - IJBossRuntimeConstants c = new IJBossRuntimeConstants() { }; - JBossServer jbs = findJBossServer(server.getId()); - String twiddleArgs = c.SHUTDOWN_SERVER_ARG + c.SPACE + jbs.getHost() + ":" //$NON-NLS-1$ - + jbs.getJNDIPort() + c.SPACE + c.SHUTDOWN_ADAPTER_ARG - + c.SPACE + c.RMIAdaptor + c.SPACE; + JBossServer jbs = ServerConverter.findJBossServer(server.getId()); + if (jbs == null) { + throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, + NLS.bind(Messages.ServerNotFound, server.getName()))); + } + String twiddleArgs = SHUTDOWN_SERVER_ARG + + SPACE + + jbs.getHost() + ":" + jbs.getJNDIPort() //$NON-NLS-1$ + + SPACE + + SHUTDOWN_ADAPTER_ARG + + SPACE + + RMIAdaptor + + SPACE; if( jbs.getUsername() != null ) - twiddleArgs += c.SHUTDOWN_USER_ARG + c.SPACE + jbs.getUsername() + c.SPACE; + twiddleArgs += SHUTDOWN_USER_ARG + + SPACE + jbs.getUsername() + + SPACE; if( jbs.getPassword() != null ) - twiddleArgs += c.SHUTDOWN_PASS_ARG + c.SPACE + jbs.getPassword() + c.SPACE; + twiddleArgs += SHUTDOWN_PASS_ARG + + SPACE + + jbs.getPassword() + + SPACE; return twiddleArgs; } - } Added: 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 (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2011-05-19 09:02:43 UTC (rev 31365) @@ -0,0 +1,118 @@ +package org.jboss.ide.eclipse.as.core.server.internal.v7; + +import java.util.ArrayList; +import java.util.List; +import java.util.Properties; + +import org.eclipse.wst.server.core.IServer; +import org.jboss.ide.eclipse.as.core.server.IJBoss7ManagerService; +import org.jboss.ide.eclipse.as.core.server.IServerStatePoller; +import org.jboss.ide.eclipse.as.core.server.internal.PollThread; +import org.jboss.ide.eclipse.as.core.server.internal.ServerStatePollerType; + +public class JBoss7ManagerServicePoller implements IServerStatePoller { + + public static final String POLLER_ID = "org.jboss.ide.eclipse.as.core.server.JBoss7ManagerServicePoller"; //$NON-NLS-1$ + private IServer server; + private ServerStatePollerType type; + private boolean expectedState; + + public void beginPolling(IServer server, boolean expectedState, PollThread pollTread) { + this.server = server; + this.expectedState = expectedState; + } + + public ServerStatePollerType getPollerType() { + return type; + } + + public void setPollerType(ServerStatePollerType type) { + this.type = type; + } + + public IServer getServer() { + return server; + } + + public boolean isComplete() throws PollingException, RequiresInfoException { + IJBoss7ManagerService service = null; + try { + service = JBoss7ManagerUtil.getService(server); + if (expectedState == SERVER_DOWN) { + return awaitShutdown(service); + } else { + return awaitRunning(service); + } + } catch (Exception e) { + throw new PollingException(e.getMessage()); + } finally { + disposeService(service); + } + } + + private Boolean awaitRunning(IJBoss7ManagerService service) { + try { + JBoss7ServerState serverState = null; + do { + serverState = service.getServerState(getServer().getHost()); + System.err.println("state = " + serverState); //$NON-NLS-1$ + } while (serverState == JBoss7ServerState.STARTING); + return serverState == JBoss7ServerState.RUNNING; + } catch (Exception e) { + return false; + } + } + + private Boolean awaitShutdown(IJBoss7ManagerService service) { + try { + JBoss7ServerState serverState = null; + do { + serverState = service.getServerState(getServer().getHost()); + System.err.println("state = " + serverState); //$NON-NLS-1$ + } while (serverState == JBoss7ServerState.RUNNING); + return false; + } catch (JBoss7ManangerConnectException e) { + System.err.println("connection closed!"); //$NON-NLS-1$ + return true; + } catch (Exception e) { + return false; + } + } + + private void disposeService(IJBoss7ManagerService service) { + if (service != null) { + service.dispose(); + } + } + + public boolean getState() throws PollingException, RequiresInfoException { + IJBoss7ManagerService service = null; + try { + service = JBoss7ManagerUtil.getService(getServer()); + JBoss7ServerState serverState = service.getServerState(getServer().getHost()); + return serverState == JBoss7ServerState.RUNNING + || serverState == JBoss7ServerState.RESTART_REQUIRED; + } catch (Exception e) { + throw new PollingException(e.getMessage()); + } finally { + disposeService(service); + } + } + + public void cleanup() { + } + + public List<String> getRequiredProperties() { + return new ArrayList<String>(); + } + + public void failureHandled(Properties properties) { + } + + public void cancel(int type) { + } + + public int getTimeoutBehavior() { + return TIMEOUT_BEHAVIOR_FAIL; + } +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServiceProxy.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServiceProxy.java 2011-05-19 00:46:30 UTC (rev 31364) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServiceProxy.java 2011-05-19 09:02:43 UTC (rev 31365) @@ -47,6 +47,10 @@ return checkedGetService().getServerState(host, port); } + public JBoss7ServerState getServerState(String host) throws Exception { + return checkedGetService().getServerState(host); + } + public void stop(String host, int port) throws Exception { checkedGetService().stop(host, port); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerUtil.java 2011-05-19 00:46:30 UTC (rev 31364) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerUtil.java 2011-05-19 09:02:43 UTC (rev 31365) @@ -17,8 +17,6 @@ public class JBoss7ManagerUtil { - public static final String SERVICE_VERSION_70 = "org.jboss.ide.eclipse.as.management.as7.service"; //$NON-NLS-1$ - public static IJBoss7ManagerService getService(IServer server) throws Exception { BundleContext context = JBossServerCorePlugin.getContext(); JBoss7ManagerServiceProxy proxy = new JBoss7ManagerServiceProxy(context, getRequiredVersion(server)); Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManangerConnectException.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManangerConnectException.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManangerConnectException.java 2011-05-19 09:02:43 UTC (rev 31365) @@ -0,0 +1,24 @@ +/******************************************************************************* + * Copyright (c) 2010 Red Hat Inc.. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat Incorporated - initial API and implementation + *******************************************************************************/ +package org.jboss.ide.eclipse.as.core.server.internal.v7; + +/** + * @author André Dietisheim + */ +public class JBoss7ManangerConnectException extends JBoss7ManangerException { + + private static final long serialVersionUID = 1L; + + public JBoss7ManangerConnectException(Throwable cause) { + super(cause); + } + +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManangerConnectException.java ___________________________________________________________________ Added: svn:mime-type + text/plain Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7RuntimeClasspathUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7RuntimeClasspathUtil.java 2011-05-19 00:46:30 UTC (rev 31364) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7RuntimeClasspathUtil.java 2011-05-19 09:02:43 UTC (rev 31365) @@ -1,40 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.ide.eclipse.as.core.server.internal.v7; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.jdt.launching.IRuntimeClasspathEntry; -import org.eclipse.jdt.launching.IVMInstall; -import org.eclipse.jdt.launching.JavaRuntime; -import org.eclipse.wst.server.core.IServer; -import org.jboss.ide.eclipse.as.core.server.internal.launch.AbstractJBossLaunchConfigType; -import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants; - -public class JBoss7RuntimeClasspathUtil { - - public static List<String> getClasspath(IServer server, IVMInstall vmInstall) throws CoreException { - List<IRuntimeClasspathEntry> classpath = new ArrayList<IRuntimeClasspathEntry>(); - classpath.add(getModulesClasspathEntry(server)); - AbstractJBossLaunchConfigType.addJREEntry(classpath, vmInstall); - List<String> runtimeClassPaths = AbstractJBossLaunchConfigType.convertClasspath(classpath); - return runtimeClassPaths; - } - - public static IRuntimeClasspathEntry getModulesClasspathEntry(IServer server) throws CoreException { - IPath runtimeLocation = server.getRuntime().getLocation(); - IPath modulesLocation = runtimeLocation.append(IJBossRuntimeResourceConstants.JBOSS_MODULES_JAR); - return JavaRuntime.newArchiveRuntimeClasspathEntry(modulesLocation); - } -} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7RuntimeLaunchConfigBuilder.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7RuntimeLaunchConfigBuilder.java 2011-05-19 00:46:30 UTC (rev 31364) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7RuntimeLaunchConfigBuilder.java 2011-05-19 09:02:43 UTC (rev 31365) @@ -22,6 +22,7 @@ import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; import org.jboss.ide.eclipse.as.core.server.internal.launch.AbstractJBossLaunchConfigType; import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants; +import org.jboss.ide.eclipse.as.core.util.JBoss7RuntimeClasspathUtil; public class JBoss7RuntimeLaunchConfigBuilder { Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7RuntimeLaunchConfigurator.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7RuntimeLaunchConfigurator.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7RuntimeLaunchConfigurator.java 2011-05-19 09:02:43 UTC (rev 31365) @@ -0,0 +1,113 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.ide.eclipse.as.core.server.internal.v7; + +import java.util.List; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; +import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants; +import org.eclipse.jdt.launching.IVMInstall; +import org.eclipse.jdt.launching.JavaRuntime; +import org.eclipse.wst.server.core.IRuntime; +import org.eclipse.wst.server.core.IServer; +import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; +import org.jboss.ide.eclipse.as.core.server.internal.launch.AbstractJBossLaunchConfigType; +import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants; +import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants; +import org.jboss.ide.eclipse.as.core.util.JBoss7RuntimeClasspathUtil; + +public class JBoss7RuntimeLaunchConfigurator { + + private static final String DEFAULTS_SET = "DEFAULTS_SET"; //$NON-NLS-1$ + private ILaunchConfigurationWorkingCopy launchConfig; + + public JBoss7RuntimeLaunchConfigurator(ILaunchConfigurationWorkingCopy launchConfig) { + this.launchConfig = launchConfig; + } + + public void apply(IServer server, IRuntime runtime, IJBossServerRuntime jbossRuntime) throws CoreException { + if (!areDefaultsSet()) { + setVmContainer(jbossRuntime) + .setClassPath(server, jbossRuntime) + .setDefaultArguments(jbossRuntime) + .setMainType(IJBossRuntimeConstants.START7_MAIN_TYPE) + .setWorkingDirectory(runtime) + .setServerId(server) + .setDefaultsSet(); + } + } + + private JBoss7RuntimeLaunchConfigurator setVmContainer(IJBossServerRuntime jbossRuntime) { + IVMInstall vmInstall = jbossRuntime.getVM(); + if (vmInstall != null) { + setVmContainer(JavaRuntime.newJREContainerPath(vmInstall).toPortableString()); + } + return this; + } + + private JBoss7RuntimeLaunchConfigurator setVmContainer(String vmPath) { + launchConfig.setAttribute( + IJavaLaunchConfigurationConstants.ATTR_JRE_CONTAINER_PATH, vmPath); + return this; + } + + private JBoss7RuntimeLaunchConfigurator setDefaultArguments(IJBossServerRuntime jbossRuntime) { + launchConfig.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, + jbossRuntime.getDefaultRunArgs()); + launchConfig.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, + jbossRuntime.getDefaultRunVMArgs()); + return this; + } + + private JBoss7RuntimeLaunchConfigurator setClassPath(IServer server, IJBossServerRuntime jbossRuntime) + throws CoreException { + return setClassPath(JBoss7RuntimeClasspathUtil.getClasspath(server, jbossRuntime.getVM())); + } + + private JBoss7RuntimeLaunchConfigurator setClassPath(List<String> entries) throws CoreException { + launchConfig.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH_PROVIDER, + JBoss7ServerBehavior.DEFAULT_CP_PROVIDER_ID); + launchConfig.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH, entries); + launchConfig.setAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, false); + return this; + } + + private JBoss7RuntimeLaunchConfigurator setMainType(String mainType) { + launchConfig.setAttribute( + IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, mainType); + return this; + } + + private JBoss7RuntimeLaunchConfigurator setWorkingDirectory(IRuntime runtime) { + setWorkingDirectory(runtime.getLocation().append(IJBossRuntimeResourceConstants.BIN).toString()); + return this; + } + + private JBoss7RuntimeLaunchConfigurator setWorkingDirectory(String directory) { + launchConfig.setAttribute( + IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, directory); + return this; + } + + private JBoss7RuntimeLaunchConfigurator setServerId(IServer server) { + launchConfig.setAttribute(AbstractJBossLaunchConfigType.SERVER_ID, server.getId()); + return this; + } + + private boolean areDefaultsSet() throws CoreException { + return launchConfig.hasAttribute(DEFAULTS_SET); + } + + private void setDefaultsSet() { + launchConfig.setAttribute(DEFAULTS_SET, true); + } +} \ No newline at end of file Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7RuntimeLaunchConfigurator.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-05-19 00:46:30 UTC (rev 31364) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-05-19 09:02:43 UTC (rev 31365) @@ -13,6 +13,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; +import java.util.List; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; @@ -20,25 +21,37 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.SubProgressMonitor; +import org.eclipse.debug.core.DebugEvent; +import org.eclipse.debug.core.DebugPlugin; +import org.eclipse.debug.core.IDebugEventSetListener; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; +import org.eclipse.debug.core.model.IProcess; import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; +import org.jboss.ide.eclipse.as.core.Messages; +import org.jboss.ide.eclipse.as.core.extensions.events.IEventCodes; +import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger; import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod; import org.jboss.ide.eclipse.as.core.server.IJBoss7ManagerService; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; +import org.jboss.ide.eclipse.as.core.server.IServerStatePoller; import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior; import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior; -import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants; +import org.jboss.ide.eclipse.as.core.server.internal.PollThread; +import org.jboss.ide.eclipse.as.core.util.PollThreadUtils; import org.jboss.ide.eclipse.as.core.util.ServerConverter; public class JBoss7ServerBehavior extends JBossServerBehavior { + private IProcess serverProcess; + private IJBoss7ManagerService service; + private IDebugEventSetListener serverProcessListener; + private PollThread pollThread; + public static final String DEFAULT_CP_PROVIDER_ID = "org.jboss.ide.eclipse.as.core.server.internal.launch.serverClasspathProvider"; //$NON-NLS-1$ - private IJBoss7ManagerService service; - private static HashMap<String, Class> delegateClassMap; static { delegateClassMap = new HashMap<String, Class>(); @@ -53,17 +66,6 @@ return delegateClassMap; } - public void stop(boolean force) { - try { - IJBoss7ManagerService service = getService(); - // TODO: for now only local, implement for remote afterwards - service.stop("localhost"); //$NON-NLS-1$ - setServerStopped(); - } catch (Exception e) { - e.printStackTrace(); - } - } - public boolean shouldSuspendScanner() { return false; } @@ -72,19 +74,46 @@ throws CoreException { IServer server = getServer(); IRuntime runtime = server.getRuntime(); - IJBossServerRuntime serverRuntime = - (IJBossServerRuntime) runtime.loadAdapter(LocalJBoss7ServerRuntime.class, null); - new JBoss7RuntimeLaunchConfigBuilder(launchConfig, serverRuntime) - .setVmContainer() - .setClassPath(server) - .setDefaultArguments() - .setMainType(IJBossRuntimeConstants.START7_MAIN_TYPE) - .setWorkingDirectory(runtime) - .setServerId(server); + IJBossServerRuntime serverRuntime = (IJBossServerRuntime) runtime.loadAdapter(IJBossServerRuntime.class, null); + new JBoss7RuntimeLaunchConfigurator(launchConfig).apply(server, runtime, serverRuntime); } + public void setProcess(IProcess process) { + this.serverProcess = process; + initDebugListener(process); + } + protected void pollServer(final boolean expectedState) { + if( pollThread != null ) { + pollThread.cancel(); + } + IServerStatePoller poller = PollThreadUtils.getPoller(JBoss7ManagerServicePoller.POLLER_ID, expectedState, getServer()); + this.pollThread = new PollThread(Messages.ServerPollerThreadName, expectedState, poller, this); + pollThread.start(); + } + @Override + public void serverStarting() { + super.serverStarting(); + pollServer(IServerStatePoller.SERVER_UP); + } + + @Override + public void serverStopping() { + super.serverStopping(); + pollServer(IServerStatePoller.SERVER_DOWN); + } + + private void initDebugListener(IProcess process) { + DebugPlugin.getDefault().addDebugEventListener(serverProcessListener = new JBossServerLifecycleListener()); + } + + private void disposeServerProcessListener() { + DebugPlugin.getDefault().removeDebugEventListener(serverProcessListener); + serverProcess = null; + } + + @Override protected void publishModule(int kind, int deltaKind, IModule[] module, IProgressMonitor monitor) throws CoreException { if (method == null) @@ -101,7 +130,7 @@ DeployableServerBehavior beh = ServerConverter.getDeployableServerBehavior(getServer()); Object o = beh.getPublishData(JBoss7JSTPublisher.MARK_DO_DEPLOY); if (o != null && (o instanceof ArrayList<?>)) { - ArrayList<IPath> l = (ArrayList<IPath>) o; + List<IPath> l = (List<IPath>) o; int size = l.size(); monitor.beginTask("Completing Publishes", size + 1); //$NON-NLS-1$ Iterator<IPath> i = l.iterator(); @@ -115,13 +144,45 @@ super.publishFinish(monitor); } - private IJBoss7ManagerService getService() throws Exception { + protected IJBoss7ManagerService getService() throws Exception { if (service == null) { service = JBoss7ManagerUtil.getService(getServer()); } return service; } + private boolean isServerRunning(String host) throws Exception { + try { + return getService().getServerState(host) == JBoss7ServerState.RUNNING; + } catch (JBoss7ManangerConnectException e) { + return false; + } + } + + public void stop(boolean force) { + + try { + if (force) { + serverProcess.terminate(); + } else { + serverStopping(); + // TODO: for now only local, implement for remote afterwards + if (isServerRunning(getServer().getHost())) { + // The service and Poller will make sure the server is down + getService().stop(getServer().getHost()); + return; + } else { + if( serverProcess != null && !serverProcess.isTerminated()) { + serverProcess.terminate(); + } + } + } + } catch (Exception e) { + e.printStackTrace(); + } + setServerStopped(); + } + @Override public void dispose() { super.dispose(); @@ -129,4 +190,31 @@ service.dispose(); } } + + @Override + public void setServerStopped() { + disposeServerProcessListener(); + logServerStopped(); + super.setServerStopped(); + } + + private void logServerStopped() { + IStatus status = new Status(IStatus.INFO, + JBossServerCorePlugin.PLUGIN_ID, IEventCodes.BEHAVIOR_PROCESS_TERMINATED, + Messages.TERMINATED, null); + ServerLogger.getDefault().log(getServer(), status); + } + + private class JBossServerLifecycleListener implements IDebugEventSetListener { + + public void handleDebugEvents(DebugEvent[] events) { + for (DebugEvent event : events) { + if (serverProcess != null && serverProcess.equals(event.getSource()) + && event.getKind() == DebugEvent.TERMINATE) { + setServerStopped(); + break; + } + } + } + } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerStartupLaunchConfiguration.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerStartupLaunchConfiguration.java 2011-05-19 00:46:30 UTC (rev 31364) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerStartupLaunchConfiguration.java 2011-05-19 09:02:43 UTC (rev 31365) @@ -15,9 +15,10 @@ import org.eclipse.debug.core.ILaunch; import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.model.ILaunchConfigurationDelegate; +import org.eclipse.debug.core.model.IProcess; import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior; import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration; -import org.jboss.ide.eclipse.as.core.server.internal.launch.LocalJBossServerStartupLaunchUtil; +import org.jboss.ide.eclipse.as.core.util.JBossServerBehaviorUtils; /** * @author Rob Stryker @@ -29,22 +30,15 @@ return new String[] {}; } - public void actualLaunch(ILaunchConfiguration configuration, - String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException { - super.actualLaunch(configuration, mode, launch, monitor); - } - public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException { - // return super.preLaunchCheck(configuration, mode, monitor); return true; } - public void preLaunch(ILaunchConfiguration configuration, - String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException { - // super.preLaunch(configuration, mode, launch, monitor); + public void preLaunch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) + throws CoreException { try { - JBossServerBehavior jbsBehavior = LocalJBossServerStartupLaunchUtil.getServerBehavior(configuration); + JBossServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration); jbsBehavior.setRunMode(mode); jbsBehavior.serverStarting(); } catch (CoreException ce) { @@ -52,13 +46,16 @@ } } - public void postLaunch(ILaunchConfiguration configuration, String mode, - ILaunch launch, IProgressMonitor monitor) throws CoreException { - // super.postLaunch(configuration, mode, launch, monitor); + public void postLaunch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) + throws CoreException { try { - JBossServerBehavior jbsBehavior = LocalJBossServerStartupLaunchUtil.getServerBehavior(configuration); - jbsBehavior.setRunMode(mode); - jbsBehavior.setServerStarted(); + JBoss7ServerBehavior behavior = JBossServerBehaviorUtils.getJBoss7ServerBehavior(configuration); + IProcess[] processes = launch.getProcesses(); + if (processes != null && processes.length >= 1) { + behavior.setProcess(processes[0]); + } + behavior.setRunMode(mode); + behavior.setServerStarted(); } catch (CoreException ce) { // report it } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7ServerRuntime.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7ServerRuntime.java 2011-05-19 00:46:30 UTC (rev 31364) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7ServerRuntime.java 2011-05-19 09:02:43 UTC (rev 31365) @@ -31,9 +31,9 @@ @Override public String getDefaultRunArgs() { IPath loc = getRuntime().getLocation(); - return "-mp " //$NON-NLS-1$ + return "-mp \"" //$NON-NLS-1$ + loc.append("modules").toString() //$NON-NLS-1$ - + " -logmodule org.jboss.logmanager -jaxpmodule javax.xml.jaxp-provider org.jboss.as.standalone"; //$NON-NLS-1$ + + "\" -logmodule org.jboss.logmanager -jaxpmodule javax.xml.jaxp-provider org.jboss.as.standalone"; //$NON-NLS-1$ } @Override @@ -44,8 +44,8 @@ return "-server -Xms64m -Xmx512m -XX:MaxPermSize=256m " //$NON-NLS-1$ + "-Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 " //$NON-NLS-1$ + "-Dsun.rmi.dgc.server.gcInterval=3600000 " //$NON-NLS-1$ - + "-Dorg.jboss.boot.log.file=" + bootLog.toString() //$NON-NLS-1$ - + " -Dlogging.configuration=file:" + logConfig.toString() //$NON-NLS-1$ - + " -Djboss.home.dir=" + loc.toString(); //$NON-NLS-1$" + + "\"-Dorg.jboss.boot.log.file=" + bootLog.toString() //$NON-NLS-1$ + + "\" \"-Dlogging.configuration=file:" + logConfig.toString() //$NON-NLS-1$ + + "\" \"-Djboss.home.dir=" + loc.toString() + "\""; //$NON-NLS-1$ //$NON-NLS-2$" } } Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/JBoss7RuntimeClasspathUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/JBoss7RuntimeClasspathUtil.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/JBoss7RuntimeClasspathUtil.java 2011-05-19 09:02:43 UTC (rev 31365) @@ -0,0 +1,39 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.ide.eclipse.as.core.util; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.jdt.launching.IRuntimeClasspathEntry; +import org.eclipse.jdt.launching.IVMInstall; +import org.eclipse.jdt.launching.JavaRuntime; +import org.eclipse.wst.server.core.IServer; +import org.jboss.ide.eclipse.as.core.server.internal.launch.AbstractJBossLaunchConfigType; + +public class JBoss7RuntimeClasspathUtil { + + public static List<String> getClasspath(IServer server, IVMInstall vmInstall) throws CoreException { + List<IRuntimeClasspathEntry> classpath = new ArrayList<IRuntimeClasspathEntry>(); + classpath.add(getModulesClasspathEntry(server)); + AbstractJBossLaunchConfigType.addJREEntry(classpath, vmInstall); + List<String> runtimeClassPaths = AbstractJBossLaunchConfigType.convertClasspath(classpath); + return runtimeClassPaths; + } + + public static IRuntimeClasspathEntry getModulesClasspathEntry(IServer server) throws CoreException { + IPath runtimeLocation = server.getRuntime().getLocation(); + IPath modulesLocation = runtimeLocation.append(IJBossRuntimeResourceConstants.JBOSS_MODULES_JAR); + return JavaRuntime.newArchiveRuntimeClasspathEntry(modulesLocation); + } +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/JBoss7RuntimeClasspathUtil.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/JBossServerBehaviorUtils.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/JBossServerBehaviorUtils.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/JBossServerBehaviorUtils.java 2011-05-19 09:02:43 UTC (rev 31365) @@ -0,0 +1,21 @@ +package org.jboss.ide.eclipse.as.core.util; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.debug.core.ILaunchConfiguration; +import org.eclipse.wst.server.core.IServer; +import org.eclipse.wst.server.core.ServerUtil; +import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior; +import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ServerBehavior; + +public class JBossServerBehaviorUtils { + + public static JBossServerBehavior getServerBehavior(ILaunchConfiguration configuration) throws CoreException { + IServer server = ServerUtil.getServer(configuration); + return (JBossServerBehavior) server.getAdapter(JBossServerBehavior.class); + } + + public static JBoss7ServerBehavior getJBoss7ServerBehavior(ILaunchConfiguration configuration) throws CoreException { + IServer server = ServerUtil.getServer(configuration); + return (JBoss7ServerBehavior) server.getAdapter(JBoss7ServerBehavior.class); + } +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/JBossServerBehaviorUtils.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PollThreadUtils.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PollThreadUtils.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PollThreadUtils.java 2011-05-19 09:02:43 UTC (rev 31365) @@ -0,0 +1,38 @@ +package org.jboss.ide.eclipse.as.core.util; + +import org.eclipse.wst.server.core.IServer; +import org.jboss.ide.eclipse.as.core.ExtensionManager; +import org.jboss.ide.eclipse.as.core.server.IServerStatePoller; +import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; +import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper; +import org.jboss.ide.eclipse.as.core.server.internal.ServerStatePollerType; + +public class PollThreadUtils { + + public static String getPollerId(boolean expectedState, IServer server) { + JBossServer s = ServerConverter.getJBossServer(server); + ServerAttributeHelper helper = s.getAttributeHelper(); + String key = expectedState == IServerStatePoller.SERVER_UP ? + IJBossToolingConstants.STARTUP_POLLER_KEY + : IJBossToolingConstants.SHUTDOWN_POLLER_KEY; + String defaultPoller = expectedState == IServerStatePoller.SERVER_UP ? + IJBossToolingConstants.DEFAULT_STARTUP_POLLER + : IJBossToolingConstants.DEFAULT_SHUTDOWN_POLLER; + String pollerId = helper.getAttribute(key, defaultPoller); + return pollerId; + } + + public static IServerStatePoller getPoller(boolean expectedState, IServer server) { + return getPoller(getPollerId(expectedState, server), expectedState, server); + } + + public static IServerStatePoller getPoller(String pollerId, boolean expectedState, IServer server) { + ServerStatePollerType type = ExtensionManager.getDefault().getPollerType(pollerId); + if (type != null) { + IServerStatePoller tempPoller = type.createPoller(); + tempPoller.setPollerType(type); + return tempPoller; + } + return null; + } +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PollThreadUtils.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java 2011-05-19 00:46:30 UTC (rev 31364) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java 2011-05-19 09:02:43 UTC (rev 31365) @@ -12,6 +12,7 @@ import java.util.ArrayList; +import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.IServer; @@ -28,6 +29,17 @@ * @author rob.stryker(a)jboss.com */ public class ServerConverter { + + public static JBossServer findJBossServer(String serverId) throws CoreException { + if (serverId == null) + return null; + + IServer s = ServerCore.findServer(serverId); + if (s == null) + return null; + return ServerConverter.getJBossServer(s); + } + public static JBossServer getJBossServer(IServer server) { JBossServer jbServer = (JBossServer)server.getAdapter(JBossServer.class); if (jbServer == null) { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBoss7ManagerService.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBoss7ManagerService.java 2011-05-19 00:46:30 UTC (rev 31364) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBoss7ManagerService.java 2011-05-19 09:02:43 UTC (rev 31365) @@ -57,6 +57,10 @@ return manager.getServerState(); } + public JBoss7ServerState getServerState(String host) throws Exception { + return new AS7Manager(host).getServerState(); + } + public void stop(String host) throws Exception { new AS7Manager(host).stopServer(); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java 2011-05-19 00:46:30 UTC (rev 31364) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java 2011-05-19 09:02:43 UTC (rev 31365) @@ -16,6 +16,7 @@ import org.jboss.ide.eclipse.as.core.server.IServerStatePoller; import org.jboss.ide.eclipse.as.core.server.internal.AbstractJBossBehaviourDelegate; import org.jboss.ide.eclipse.as.core.server.internal.PollThread; +import org.jboss.ide.eclipse.as.core.util.PollThreadUtils; public class RSEBehaviourDelegate extends AbstractJBossBehaviourDelegate { private PollThread pollThread = null; @@ -45,7 +46,8 @@ if( this.pollThread != null ) { pollThread.cancel(); } - this.pollThread = new PollThread(Messages.ServerPollerThreadName, expectedState, getActualBehavior()); + IServerStatePoller poller = PollThreadUtils.getPoller(expectedState, getServer()); + this.pollThread = new PollThread(Messages.ServerPollerThreadName, expectedState, poller, getActualBehavior()); pollThread.start(); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java 2011-05-19 00:46:30 UTC (rev 31364) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java 2011-05-19 09:02:43 UTC (rev 31365) @@ -22,6 +22,7 @@ import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants; +import org.eclipse.osgi.util.NLS; import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; import org.eclipse.rse.services.shells.IHostOutput; @@ -29,6 +30,8 @@ import org.eclipse.rse.services.shells.IHostShellChangeEvent; import org.eclipse.rse.services.shells.IHostShellOutputListener; import org.eclipse.wst.server.core.IServer; +import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; +import org.jboss.ide.eclipse.as.core.Messages; import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger; import org.jboss.ide.eclipse.as.core.extensions.polling.WebPortPoller; import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior; @@ -43,6 +46,7 @@ import org.jboss.ide.eclipse.as.core.util.ArgsUtil; import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants; import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants; +import org.jboss.ide.eclipse.as.core.util.JBossServerBehaviorUtils; import org.jboss.ide.eclipse.as.core.util.ServerConverter; import org.jboss.ide.eclipse.as.rse.core.RSEHostShellModel.ServerShellModel; @@ -58,7 +62,7 @@ JBossServerStartupLaunchConfiguration launchConfig, ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException { - JBossServerBehavior beh = LocalJBossServerStartupLaunchUtil.getServerBehavior(configuration); + JBossServerBehavior beh = JBossServerBehaviorUtils.getServerBehavior(configuration); beh.setServerStarting(); String command = configuration.getAttribute(RSE_STARTUP_COMMAND, (String)null); try { @@ -128,8 +132,8 @@ public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException { // ping if up - final JBossServerBehavior beh = LocalJBossServerStartupLaunchUtil.getServerBehavior(configuration); - boolean started = new WebPortPoller().onePing(beh.getServer()); + final JBossServerBehavior beh = JBossServerBehaviorUtils.getServerBehavior(configuration); + boolean started = WebPortPoller.onePing(beh.getServer()); if( started ) { beh.setServerStarting(); beh.setServerStarted(); @@ -205,7 +209,11 @@ public static IServer findServer(ILaunchConfiguration config) throws CoreException { String serverId = config.getAttribute("server-id", (String)null); - JBossServer jbs = AbstractJBossLaunchConfigType.findJBossServer(serverId); + JBossServer jbs = ServerConverter.findJBossServer(serverId); + if (jbs == null) { + throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, + NLS.bind(Messages.ServerNotFound, serverId))); + } return jbs.getServer(); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java 2011-05-19 00:46:30 UTC (rev 31364) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java 2011-05-19 09:02:43 UTC (rev 31365) @@ -27,6 +27,7 @@ import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; import org.jboss.ide.eclipse.as.core.util.IConstants; +import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; import org.jboss.ide.eclipse.as.core.util.ServerConverter; @@ -74,11 +75,19 @@ type = JBossServer.DEPLOY_SERVER; } if( type.equals(JBossServer.DEPLOY_SERVER)) { - String loc = IConstants.SERVER; - String config = getRSEConfigName(server); - IPath p = new Path(loc).append(config) - .append(IJBossServerConstants.DEPLOY); - return makeGlobal(server, p).toString(); + // TODO !!!! Need API (nmaybe in JBossServer?) so servers can override this behavior + // Cannot move this code to JBossServer because this requires an RSE-specific key!! Damn! + + if( server.getServerType().getId().equals(IJBossToolingConstants.SERVER_AS_70)) { + IPath p = new Path("standalone/deployments/"); + return makeGlobal(server, p).toString(); + } else { + String loc = IConstants.SERVER; + String config = getRSEConfigName(server); + IPath p = new Path(loc).append(config) + .append(IJBossServerConstants.DEPLOY); + return makeGlobal(server, p).toString(); + } } return null; } Added: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/DeployOnlyRSEPrefComposite.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/DeployOnlyRSEPrefComposite.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/DeployOnlyRSEPrefComposite.java 2011-05-19 09:02:43 UTC (rev 31365) @@ -0,0 +1,160 @@ +/******************************************************************************* + * 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.rse.ui; + +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.ModifyEvent; +import org.eclipse.swt.events.ModifyListener; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.SelectionListener; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Text; +import org.eclipse.wst.server.ui.internal.command.ServerCommand; +import org.jboss.ide.eclipse.as.core.server.IDeployableServer; +import org.jboss.ide.eclipse.as.rse.ui.RSEDeploymentPreferenceUI.RSEDeploymentPreferenceComposite; +import org.jboss.ide.eclipse.as.ui.Messages; +import org.jboss.ide.eclipse.as.ui.UIUtil; +import org.jboss.ide.eclipse.as.ui.editor.IDeploymentTypeUI.IServerModeUICallback; + +public class DeployOnlyRSEPrefComposite extends + RSEDeploymentPreferenceComposite { + public DeployOnlyRSEPrefComposite(Composite parent, int style, IServerModeUICallback callback) { + super(parent, style, callback); + } + + protected void createRSEWidgets(Composite child) { + handleDeployOnlyServer(child); + } + + private Text deployText, tempDeployText; + private Button deployButton, tempDeployButton; + private ModifyListener deployListener, tempDeployListener; + + + private void handleDeployOnlyServer(Composite composite) { + Label label = new Label(this, SWT.NONE); + label.setText(Messages.swf_DeployDirectory); + deployText = new Text(this, SWT.BORDER); + deployText.setText(getServer().getDeployFolder()); + deployListener = new ModifyListener() { + public void modifyText(ModifyEvent e) { + callback.execute(new SetDeployDirCommand()); + } + }; + deployText.addModifyListener(deployListener); + + deployButton = new Button(this, SWT.PUSH); + deployButton.setText(Messages.browse); + label.setLayoutData(UIUtil.createFormData2(composite, 7, null, 0, 0, 10, null, 0)); + deployButton.setLayoutData(UIUtil.createFormData2(composite, 5, null, 0, null, 0, 100, -5)); + deployText.setLayoutData(UIUtil.createFormData2(composite, 5, null, 0, label, 5, deployButton, -5)); + + deployButton.addSelectionListener(new SelectionListener() { + public void widgetDefaultSelected(SelectionEvent e) { + } + + public void widgetSelected(SelectionEvent e) { + } + }); + + Label tempDeployLabel = new Label(this, SWT.NONE); + tempDeployLabel.setText(Messages.swf_TempDeployDirectory); + tempDeployText = new Text(this, SWT.BORDER); + tempDeployText.setText(getServer().getTempDeployFolder()); + tempDeployListener = new ModifyListener() { + public void modifyText(ModifyEvent e) { + callback.execute(new SetTempDeployDirCommand()); + } + }; + tempDeployText.addModifyListener(tempDeployListener); + + tempDeployButton = new Button(this, SWT.PUSH); + tempDeployButton.setText(Messages.browse); + + tempDeployLabel.setLayoutData(UIUtil.createFormData2(deployText, 7, null, 0, 0, 10, null, 0)); + tempDeployButton.setLayoutData(UIUtil.createFormData2(deployText, 5, null, 0, null, 0, 100, -5)); + tempDeployText.setLayoutData(UIUtil.createFormData2(deployText, 5, null, 0, tempDeployLabel, 5, deployButton, -5)); + + tempDeployButton.addSelectionListener(new SelectionListener() { + public void widgetDefaultSelected(SelectionEvent e) { + } + + public void widgetSelected(SelectionEvent e) { + } + }); + } + + private void updateDeployOnlyWidgets() { + String newDir = callback.getServer().getAttribute(IDeployableServer.DEPLOY_DIRECTORY, ""); + String newTemp = callback.getServer().getAttribute(IDeployableServer.TEMP_DEPLOY_DIRECTORY, ""); + deployText.removeModifyListener(deployListener); + deployText.setText(newDir); + deployText.addModifyListener(deployListener); + tempDeployText.removeModifyListener(tempDeployListener); + tempDeployText.setText(newTemp); + tempDeployText.addModifyListener(tempDeployListener); + } + public class SetDeployDirCommand extends ServerCommand { + private String oldDir; + private String newDir; + private Text text; + private ModifyListener listener; + + public SetDeployDirCommand() { + super(callback.getServer(), Messages.EditorSetDeployLabel); + this.text = deployText; + this.newDir = deployText.getText(); + this.listener = deployListener; + this.oldDir = callback.getServer().getAttribute( + IDeployableServer.DEPLOY_DIRECTORY, ""); //$NON-NLS-1$ + } + + public void execute() { + callback.getServer().setAttribute( + IDeployableServer.DEPLOY_DIRECTORY, newDir); + updateDeployOnlyWidgets(); + } + + public void undo() { + callback.getServer().setAttribute( + IDeployableServer.DEPLOY_DIRECTORY, oldDir); + updateDeployOnlyWidgets(); + } + } + + public class SetTempDeployDirCommand extends ServerCommand { + private String oldDir; + private String newDir; + private Text text; + private ModifyListener listener; + + public SetTempDeployDirCommand() { + super(callback.getServer(), Messages.EditorSetTempDeployLabel); + text = tempDeployText; + newDir = tempDeployText.getText(); + listener = tempDeployListener; + oldDir = callback.getServer().getAttribute( + IDeployableServer.TEMP_DEPLOY_DIRECTORY, ""); //$NON-NLS-1$ + } + + public void execute() { + callback.getServer().setAttribute( + IDeployableServer.TEMP_DEPLOY_DIRECTORY, newDir); + } + + public void undo() { + callback.getServer().setAttribute( + IDeployableServer.TEMP_DEPLOY_DIRECTORY, oldDir); + } + } +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/DeployOnlyRSEPrefComposite.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/JBoss7RSEDeploymentPrefComposite.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/JBoss7RSEDeploymentPrefComposite.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/JBoss7RSEDeploymentPrefComposite.java 2011-05-19 09:02:43 UTC (rev 31365) @@ -0,0 +1,84 @@ +/******************************************************************************* + * 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.rse.ui; + +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.ModifyEvent; +import org.eclipse.swt.events.ModifyListener; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.SelectionListener; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Text; +import org.jboss.ide.eclipse.as.rse.core.RSEUtils; +import org.jboss.ide.eclipse.as.rse.ui.RSEDeploymentPreferenceUI.RSEDeploymentPreferenceComposite; +import org.jboss.ide.eclipse.as.ui.UIUtil; +import org.jboss.ide.eclipse.as.ui.editor.IDeploymentTypeUI.IServerModeUICallback; +import org.jboss.ide.eclipse.as.ui.editor.ServerModeSectionComposite.ChangeServerPropertyCommand; + +public class JBoss7RSEDeploymentPrefComposite extends + RSEDeploymentPreferenceComposite { + + private Text rseServerHome; + private Button rseBrowse; + + public JBoss7RSEDeploymentPrefComposite(Composite parent, int style, + IServerModeUICallback callback) { + super(parent, style, callback); + } + + protected void createRSEWidgets(Composite child) { + Label serverHomeLabel = new Label(this, SWT.NONE); + serverHomeLabel.setText("Remote Server Home: "); + rseBrowse = new Button(this, SWT.NONE); + rseBrowse.setText("Browse..."); + rseBrowse.setLayoutData(UIUtil.createFormData2(child, 5, null, + 0, null, 0, 100, -5)); + rseBrowse.addSelectionListener(new SelectionListener() { + public void widgetSelected(SelectionEvent e) { + browseClicked2(); + } + + public void widgetDefaultSelected(SelectionEvent e) { + browseClicked2(); + } + }); + rseServerHome = new Text(this, SWT.SINGLE | SWT.BORDER); + serverHomeLabel.setLayoutData(UIUtil.createFormData2(child, 7, + null, 0, 0, 10, null, 0)); + rseServerHome.setLayoutData(UIUtil.createFormData2(child, 5, + null, 0, serverHomeLabel, 5, rseBrowse, -5)); + rseServerHome.setText(callback.getServer().getAttribute( + RSEUtils.RSE_SERVER_HOME_DIR, RSEUIMessages.UNSET_REMOTE_SERVER_HOME)); + rseServerHome.addModifyListener(new ModifyListener() { + public void modifyText(ModifyEvent e) { + serverHomeChanged(); + } + }); + } + protected void serverHomeChanged() { + if( !isUpdatingFromModelChange()) { + String safeString = callback.getRuntime() != null ? callback.getRuntime().getLocation() != null ? + callback.getRuntime().getLocation().toString() : "" : ""; + callback.execute(new ChangeServerPropertyCommand( + callback.getServer(), RSEUtils.RSE_SERVER_HOME_DIR, rseServerHome.getText(), + safeString, RSEUIMessages.CHANGE_REMOTE_SERVER_HOME)); + } + } + protected void browseClicked2() { + String browseVal = browseClicked3(rseServerHome.getShell()); + if (browseVal != null) { + rseServerHome.setText(browseVal); + serverHomeChanged(); + } + } +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/JBoss7RSEDeploymentPrefComposite.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/JBossRSEDeploymentPrefComposite.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/JBossRSEDeploymentPrefComposite.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/JBossRSEDeploymentPrefComposite.java 2011-05-19 09:02:43 UTC (rev 31365) @@ -0,0 +1,250 @@ +/******************************************************************************* + * 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.rse.ui; + +import java.beans.PropertyChangeEvent; +import java.lang.reflect.InvocationTargetException; + +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.Status; +import org.eclipse.jface.operation.IRunnableWithProgress; +import org.eclipse.osgi.util.NLS; +import org.eclipse.rse.core.model.IHost; +import org.eclipse.rse.services.clientserver.messages.SystemMessageException; +import org.eclipse.rse.services.files.IFileService; +import org.eclipse.rse.services.files.IHostFile; +import org.eclipse.rse.subsystems.files.core.servicesubsystem.IFileServiceSubSystem; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.ModifyEvent; +import org.eclipse.swt.events.ModifyListener; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.SelectionListener; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Text; +import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.progress.IProgressService; +import org.jboss.ide.eclipse.as.core.util.IConstants; +import org.jboss.ide.eclipse.as.rse.core.RSEPublishMethod; +import org.jboss.ide.eclipse.as.rse.core.RSEUtils; +import org.jboss.ide.eclipse.as.rse.ui.RSEDeploymentPreferenceUI.RSEDeploymentPreferenceComposite; +import org.jboss.ide.eclipse.as.ui.UIUtil; +import org.jboss.ide.eclipse.as.ui.editor.IDeploymentTypeUI.IServerModeUICallback; +import org.jboss.ide.eclipse.as.ui.editor.ServerModeSectionComposite.ChangeServerPropertyCommand; + +public class JBossRSEDeploymentPrefComposite extends + RSEDeploymentPreferenceComposite { + + private Text rseServerHome,rseServerConfig; + private Button rseBrowse, rseTest; + + public JBossRSEDeploymentPrefComposite(Composite parent, int style, IServerModeUICallback callback) { + super(parent, style, callback); + } + + protected void createRSEWidgets(Composite child) { + handleJBossServer(child); + } + + private void handleJBossServer(Composite composite) { + Label serverHomeLabel = new Label(this, SWT.NONE); + serverHomeLabel.setText("Remote Server Home: "); + rseBrowse = new Button(this, SWT.NONE); + rseBrowse.setText("Browse..."); + rseBrowse.setLayoutData(UIUtil.createFormData2(composite, 5, null, + 0, null, 0, 100, -5)); + rseBrowse.addSelectionListener(new SelectionListener() { + public void widgetSelected(SelectionEvent e) { + browseClicked2(); + } + + public void widgetDefaultSelected(SelectionEvent e) { + browseClicked2(); + } + }); + rseServerHome = new Text(this, SWT.SINGLE | SWT.BORDER); + serverHomeLabel.setLayoutData(UIUtil.createFormData2(composite, 7, + null, 0, 0, 10, null, 0)); + rseServerHome.setLayoutData(UIUtil.createFormData2(composite, 5, + null, 0, serverHomeLabel, 5, rseBrowse, -5)); + rseServerHome.setText(callback.getServer().getAttribute( + RSEUtils.RSE_SERVER_HOME_DIR, RSEUIMessages.UNSET_REMOTE_SERVER_HOME)); + rseServerHome.addModifyListener(new ModifyListener() { + public void modifyText(ModifyEvent e) { + serverHomeChanged(); + } + }); + + Label serverConfigLabel = new Label(this, SWT.NONE); + serverConfigLabel.setText(RSEUIMessages.REMOTE_SERVER_CONFIG); + rseServerConfig = new Text(this, SWT.SINGLE | SWT.BORDER); + serverConfigLabel.setLayoutData(UIUtil.createFormData2( + rseServerHome, 7, null, 0, 0, 10, null, 0)); + rseServerConfig.setText(callback.getServer().getAttribute( + RSEUtils.RSE_SERVER_CONFIG, + getRuntime() == null ? "" : getRuntime() + .getJBossConfiguration())); + rseServerConfig.addModifyListener(new ModifyListener() { + public void modifyText(ModifyEvent e) { + serverConfigChanged(); + } + }); + callback.getServer().addPropertyChangeListener(this); + + rseTest = new Button(this, SWT.NONE); + rseTest.setText(RSEUIMessages.TEST); + rseTest.setLayoutData(UIUtil.createFormData2(rseServerHome, 5, + null, 0, null, 0, 100, -5)); + rseServerConfig.setLayoutData(UIUtil.createFormData2(rseServerHome, + 5, null, 0, serverConfigLabel, 5, rseTest, -5)); + rseTest.addSelectionListener(new SelectionListener() { + public void widgetSelected(SelectionEvent e) { + testPressed(); + } + public void widgetDefaultSelected(SelectionEvent e) { + } + }); + } + + private void testPressed(){ + rseTest.setEnabled(false); + IWorkbench wb = PlatformUI.getWorkbench(); + IProgressService ps = wb.getProgressService(); + final IStatus[] s = new IStatus[1]; + Throwable e = null; + final String home = rseServerHome.getText(); + final String config = rseServerConfig.getText(); + try { + ps.busyCursorWhile(new IRunnableWithProgress() { + public void run(IProgressMonitor pm) { + s[0] = testPressed(home, config, pm); + } + }); + } catch(InvocationTargetException ite) { + e = ite; + } catch(InterruptedException ie) { + e = ie; + } + if( s[0] == null && e != null ) { + s[0] = new Status(IStatus.ERROR, org.jboss.ide.eclipse.as.rse.core.RSECorePlugin.PLUGIN_ID, e.getMessage(), e); + } + rseTest.setEnabled(true); + IStatus s2 = s[0]; + if( s2.isOK() ) + s2 = new Status(IStatus.INFO, org.jboss.ide.eclipse.as.rse.core.RSECorePlugin.PLUGIN_ID, + RSEUIMessages.REMOTE_SERVER_TEST_SUCCESS); + showMessageDialog(RSEUIMessages.REMOTE_SERVER_TEST, s2, rseServerHome.getShell()); + } + + private IStatus testPressed(String home, String config, IProgressMonitor pm) { + pm.beginTask(RSEUIMessages.VALIDATING_REMOTE_CONFIG, 1200); + IHost host = combo.getHost(); + if( host == null ) { + pm.done(); + return getTestFailStatus(RSEUIMessages.EMPTY_HOST); + } + pm.worked(100); + + IFileServiceSubSystem fileSubSystem = RSEPublishMethod.findFileTransferSubSystem(host); + if( fileSubSystem == null ) { + pm.done(); + return getTestFailStatus(NLS.bind(RSEUIMessages.FILE_SUBSYSTEM_NOT_FOUND, host.getName())); + } + pm.worked(100); + + if(!fileSubSystem.isConnected()) { + try { + fileSubSystem.connect(new NullProgressMonitor(), false); + } catch (Exception e) { + pm.done(); + return getTestFailStatus(NLS.bind(RSEUIMessages.REMOTE_FILESYSTEM_CONNECT_FAILED, e.getLocalizedMessage())); + } + } + pm.worked(300); + + IFileService service = fileSubSystem.getFileService(); + if( service == null ) { + pm.done(); + return getTestFailStatus(NLS.bind(RSEUIMessages.FILESERVICE_NOT_FOUND, host.getName())); + } + pm.worked(100); + + String root = home; + IPath root2 = new Path(root); + try { + IHostFile file = service.getFile(root2.removeLastSegments(1).toPortableString(), root2.lastSegment(), new NullProgressMonitor()); + if( file == null || !file.exists()) { + pm.done(); + return getTestFailStatus(NLS.bind(RSEUIMessages.REMOTE_HOME_NOT_FOUND, + new Object[]{root2, service.getName(), host.getName()})); + + } + pm.worked(300); + + root2 = root2.append(IConstants.SERVER).append(config); + file = service.getFile(root2.removeLastSegments(1).toPortableString(), root2.lastSegment(), new NullProgressMonitor()); + if( file == null || !file.exists()) { + pm.done(); + return getTestFailStatus(NLS.bind(RSEUIMessages.REMOTE_CONFIG_NOT_FOUND, root2)); + } + pm.worked(300); + } catch(SystemMessageException sme) { + pm.done(); + return getTestFailStatus(RSEUIMessages.ERROR_CHECKING_REMOTE_SYSTEM + sme.getLocalizedMessage()); + } + pm.done(); + return Status.OK_STATUS; + } + + private IStatus getTestFailStatus(String string) { + return new Status(IStatus.ERROR, org.jboss.ide.eclipse.as.rse.core.RSECorePlugin.PLUGIN_ID, string); + } + + protected void browseClicked2() { + String browseVal = browseClicked3(rseServerHome.getShell()); + if (browseVal != null) { + rseServerHome.setText(browseVal); + serverHomeChanged(); + } + } + protected void propertyChangeBody(PropertyChangeEvent evt) { + super.propertyChangeBody(evt); + if( evt.getPropertyName().equals(RSEUtils.RSE_SERVER_HOME_DIR)) { + updateTextIfChanges(rseServerHome, evt.getNewValue().toString()); + } else if( evt.getPropertyName().equals(RSEUtils.RSE_SERVER_CONFIG)) { + updateTextIfChanges(rseServerConfig, evt.getNewValue().toString()); + } + } + protected void serverConfigChanged() { + if( !isUpdatingFromModelChange() ) { + callback.execute(new ChangeServerPropertyCommand( + callback.getServer(), RSEUtils.RSE_SERVER_CONFIG, rseServerConfig.getText(), + getRuntime() == null ? "" : getRuntime().getJBossConfiguration(), + RSEUIMessages.CHANGE_REMOTE_SERVER_CONFIG)); + } + } + protected void serverHomeChanged() { + if( !isUpdatingFromModelChange()) { + String safeString = callback.getRuntime() != null ? callback.getRuntime().getLocation() != null ? + callback.getRuntime().getLocation().toString() : "" : ""; + callback.execute(new ChangeServerPropertyCommand( + callback.getServer(), RSEUtils.RSE_SERVER_HOME_DIR, rseServerHome.getText(), + safeString, RSEUIMessages.CHANGE_REMOTE_SERVER_HOME)); + } + } + +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/JBossRSEDeploymentPrefComposite.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPageCallback.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPageCallback.java 2011-05-19 00:46:30 UTC (rev 31364) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPageCallback.java 2011-05-19 09:02:43 UTC (rev 31365) @@ -1,3 +1,13 @@ +/******************************************************************************* + * 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.rse.ui; import java.beans.PropertyChangeEvent; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java 2011-05-19 00:46:30 UTC (rev 31364) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java 2011-05-19 09:02:43 UTC (rev 31365) @@ -12,28 +12,17 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.lang.reflect.InvocationTargetException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Status; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.ErrorDialog; -import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.osgi.util.NLS; import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.events.ISystemModelChangeEvent; import org.eclipse.rse.core.events.ISystemModelChangeListener; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.files.ui.dialogs.SystemRemoteFileDialog; -import org.eclipse.rse.services.clientserver.messages.SystemMessageException; -import org.eclipse.rse.services.files.IFileService; -import org.eclipse.rse.services.files.IHostFile; -import org.eclipse.rse.subsystems.files.core.servicesubsystem.IFileServiceSubSystem; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; import org.eclipse.rse.ui.wizards.newconnection.RSEMainNewConnectionWizard; import org.eclipse.swt.SWT; @@ -50,22 +39,16 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; -import org.eclipse.ui.IWorkbench; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.progress.IProgressService; import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.IServerWorkingCopy; -import org.eclipse.wst.server.ui.internal.command.ServerCommand; import org.jboss.ide.eclipse.as.core.server.IDeployableServer; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; -import org.jboss.ide.eclipse.as.core.util.IConstants; import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; import org.jboss.ide.eclipse.as.core.util.ServerConverter; -import org.jboss.ide.eclipse.as.rse.core.RSEPublishMethod; import org.jboss.ide.eclipse.as.rse.core.RSEUtils; -import org.jboss.ide.eclipse.as.ui.Messages; import org.jboss.ide.eclipse.as.ui.UIUtil; import org.jboss.ide.eclipse.as.ui.editor.IDeploymentTypeUI; import org.jboss.ide.eclipse.as.ui.editor.ServerModeSection; @@ -84,15 +67,28 @@ @Override public void fillComposite(Composite parent, IServerModeUICallback callback) { parent.setLayout(new FillLayout()); - new RSEDeploymentPreferenceComposite(parent, SWT.NONE, callback); + RSEDeploymentPreferenceComposite composite = null; + + IServerWorkingCopy cServer = callback.getServer(); + JBossServer jbs = cServer.getOriginal() == null ? + ServerConverter.getJBossServer(cServer) : + ServerConverter.getJBossServer(cServer.getOriginal()); + if( jbs != null && !cServer.getServerType().getId().equals(IJBossToolingConstants.SERVER_AS_70) ) { + composite = new JBossRSEDeploymentPrefComposite(parent, SWT.NONE, callback); + } else if( cServer.getServerType().getId().equals(IJBossToolingConstants.SERVER_AS_70) ){ + composite = new JBoss7RSEDeploymentPrefComposite(parent, SWT.NONE, callback); + // TODO add for jboss 7 + } else { + composite = new DeployOnlyRSEPrefComposite(parent, SWT.NONE, callback); + } + //return composite; } - public static class RSEDeploymentPreferenceComposite extends Composite implements PropertyChangeListener { - private IServerModeUICallback callback; - private CustomSystemHostCombo combo; - private Text rseServerHome,rseServerConfig; - private Button rseBrowse, rseTest; - private ModifyListener comboMListener; + public static abstract class RSEDeploymentPreferenceComposite extends Composite implements PropertyChangeListener { + protected IServerModeUICallback callback; + protected CustomSystemHostCombo combo; + protected ModifyListener comboMListener; + private boolean updatingFromModelChange = false; public RSEDeploymentPreferenceComposite(Composite parent, int style, IServerModeUICallback callback) { super(parent, style); this.callback = callback; @@ -109,250 +105,44 @@ }; combo.getCombo().addModifyListener(comboMListener); - IServerWorkingCopy cServer = callback.getServer(); - JBossServer jbs = cServer.getOriginal() == null ? - ServerConverter.getJBossServer(cServer) : - ServerConverter.getJBossServer(cServer.getOriginal()); - if( jbs != null && !cServer.getServerType().getId().equals(IJBossToolingConstants.SERVER_AS_70) ) { - handleJBossServer(child); - } else { - handleDeployOnlyServer(child); - } + createRSEWidgets(child); } - private IDeployableServer getServer() { + + protected abstract void createRSEWidgets(Composite child); + + protected IDeployableServer getServer() { return (IDeployableServer) callback.getServer().loadAdapter( IDeployableServer.class, new NullProgressMonitor()); } - private Text deployText, tempDeployText; - private Button deployButton, tempDeployButton; - private ModifyListener deployListener, tempDeployListener; - - private void handleJBossServer(Composite composite) { - Label serverHomeLabel = new Label(this, SWT.NONE); - serverHomeLabel.setText("Remote Server Home: "); - rseBrowse = new Button(this, SWT.NONE); - rseBrowse.setText("Browse..."); - rseBrowse.setLayoutData(UIUtil.createFormData2(composite, 5, null, - 0, null, 0, 100, -5)); - rseBrowse.addSelectionListener(new SelectionListener() { - public void widgetSelected(SelectionEvent e) { - browseClicked2(); + protected String browseClicked3(Shell shell) { + SystemRemoteFileDialog d = new SystemRemoteFileDialog( + shell, RSEUIMessages.BROWSE_REMOTE_SYSTEM, combo.getHost()); + if( d.open() == Dialog.OK) { + Object o = d.getOutputObject(); + if( o instanceof IRemoteFile ) { + String path = ((IRemoteFile)o).getAbsolutePath(); + return path; } - - public void widgetDefaultSelected(SelectionEvent e) { - browseClicked2(); - } - }); - rseServerHome = new Text(this, SWT.SINGLE | SWT.BORDER); - serverHomeLabel.setLayoutData(UIUtil.createFormData2(composite, 7, - null, 0, 0, 10, null, 0)); - rseServerHome.setLayoutData(UIUtil.createFormData2(composite, 5, - null, 0, serverHomeLabel, 5, rseBrowse, -5)); - rseServerHome.setText(callback.getServer().getAttribute( - RSEUtils.RSE_SERVER_HOME_DIR, RSEUIMessages.UNSET_REMOTE_SERVER_HOME)); - rseServerHome.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - serverHomeChanged(); - } - }); - - Label serverConfigLabel = new Label(this, SWT.NONE); - serverConfigLabel.setText(RSEUIMessages.REMOTE_SERVER_CONFIG); - rseServerConfig = new Text(this, SWT.SINGLE | SWT.BORDER); - serverConfigLabel.setLayoutData(UIUtil.createFormData2( - rseServerHome, 7, null, 0, 0, 10, null, 0)); - rseServerConfig.setText(callback.getServer().getAttribute( - RSEUtils.RSE_SERVER_CONFIG, - getRuntime() == null ? "" : getRuntime() - .getJBossConfiguration())); - rseServerConfig.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - serverConfigChanged(); - } - }); - callback.getServer().addPropertyChangeListener(this); - - rseTest = new Button(this, SWT.NONE); - rseTest.setText(RSEUIMessages.TEST); - rseTest.setLayoutData(UIUtil.createFormData2(rseServerHome, 5, - null, 0, null, 0, 100, -5)); - rseServerConfig.setLayoutData(UIUtil.createFormData2(rseServerHome, - 5, null, 0, serverConfigLabel, 5, rseTest, -5)); - rseTest.addSelectionListener(new SelectionListener() { - public void widgetSelected(SelectionEvent e) { - testPressed(); - } - public void widgetDefaultSelected(SelectionEvent e) { - } - }); + } + return null; } - - - - private void handleDeployOnlyServer(Composite composite) { - Label label = new Label(this, SWT.NONE); - label.setText(Messages.swf_DeployDirectory); - deployText = new Text(this, SWT.BORDER); - deployText.setText(getServer().getDeployFolder()); - deployListener = new ModifyListener() { - public void modifyText(ModifyEvent e) { - callback.execute(new SetDeployDirCommand()); - } - }; - deployText.addModifyListener(deployListener); - - deployButton = new Button(this, SWT.PUSH); - deployButton.setText(Messages.browse); - label.setLayoutData(UIUtil.createFormData2(composite, 7, null, 0, 0, 10, null, 0)); - deployButton.setLayoutData(UIUtil.createFormData2(composite, 5, null, 0, null, 0, 100, -5)); - deployText.setLayoutData(UIUtil.createFormData2(composite, 5, null, 0, label, 5, deployButton, -5)); - - deployButton.addSelectionListener(new SelectionListener() { - public void widgetDefaultSelected(SelectionEvent e) { - } - - public void widgetSelected(SelectionEvent e) { - } - }); - - Label tempDeployLabel = new Label(this, SWT.NONE); - tempDeployLabel.setText(Messages.swf_TempDeployDirectory); - tempDeployText = new Text(this, SWT.BORDER); - tempDeployText.setText(getServer().getTempDeployFolder()); - tempDeployListener = new ModifyListener() { - public void modifyText(ModifyEvent e) { - callback.execute(new SetTempDeployDirCommand()); - } - }; - tempDeployText.addModifyListener(tempDeployListener); - - tempDeployButton = new Button(this, SWT.PUSH); - tempDeployButton.setText(Messages.browse); - - tempDeployLabel.setLayoutData(UIUtil.createFormData2(deployText, 7, null, 0, 0, 10, null, 0)); - tempDeployButton.setLayoutData(UIUtil.createFormData2(deployText, 5, null, 0, null, 0, 100, -5)); - tempDeployText.setLayoutData(UIUtil.createFormData2(deployText, 5, null, 0, tempDeployLabel, 5, deployButton, -5)); - - tempDeployButton.addSelectionListener(new SelectionListener() { - public void widgetDefaultSelected(SelectionEvent e) { - } - - public void widgetSelected(SelectionEvent e) { - } - }); - } - private void updateDeployOnlyWidgets() { - String newDir = callback.getServer().getAttribute(IDeployableServer.DEPLOY_DIRECTORY, ""); - String newTemp = callback.getServer().getAttribute(IDeployableServer.TEMP_DEPLOY_DIRECTORY, ""); - deployText.removeModifyListener(deployListener); - deployText.setText(newDir); - deployText.addModifyListener(deployListener); - tempDeployText.removeModifyListener(tempDeployListener); - tempDeployText.setText(newTemp); - tempDeployText.addModifyListener(tempDeployListener); + protected IJBossServerRuntime getRuntime() { + IRuntime rt = callback.getRuntime(); + if( rt == null ) return null; + return (IJBossServerRuntime)rt.loadAdapter(IJBossServerRuntime.class, null); } + - private void testPressed(){ - rseTest.setEnabled(false); - IWorkbench wb = PlatformUI.getWorkbench(); - IProgressService ps = wb.getProgressService(); - final IStatus[] s = new IStatus[1]; - Throwable e = null; - final String home = rseServerHome.getText(); - final String config = rseServerConfig.getText(); - try { - ps.busyCursorWhile(new IRunnableWithProgress() { - public void run(IProgressMonitor pm) { - s[0] = testPressed(home, config, pm); - } - }); - } catch(InvocationTargetException ite) { - e = ite; - } catch(InterruptedException ie) { - e = ie; - } - if( s[0] == null && e != null ) { - s[0] = new Status(IStatus.ERROR, org.jboss.ide.eclipse.as.rse.core.RSECorePlugin.PLUGIN_ID, e.getMessage(), e); - } - rseTest.setEnabled(true); - showMessageDialog(RSEUIMessages.REMOTE_SERVER_TEST, s[0]); - } - private void showMessageDialog(String title, IStatus s) { - if( s.isOK() ) - s = new Status(IStatus.INFO, org.jboss.ide.eclipse.as.rse.core.RSECorePlugin.PLUGIN_ID, - RSEUIMessages.REMOTE_SERVER_TEST_SUCCESS); - ErrorDialog d = new ErrorDialog(rseServerHome.getShell(), title, null, s, IStatus.INFO | IStatus.ERROR); + protected void showMessageDialog(String title, IStatus s, Shell shell) { + ErrorDialog d = new ErrorDialog(shell, title, null, s, IStatus.INFO | IStatus.ERROR); d.open(); } - private IStatus testPressed(String home, String config, IProgressMonitor pm) { - pm.beginTask(RSEUIMessages.VALIDATING_REMOTE_CONFIG, 1200); - IHost host = combo.getHost(); - if( host == null ) { - pm.done(); - return getTestFailStatus(RSEUIMessages.EMPTY_HOST); - } - pm.worked(100); - - IFileServiceSubSystem fileSubSystem = RSEPublishMethod.findFileTransferSubSystem(host); - if( fileSubSystem == null ) { - pm.done(); - return getTestFailStatus(NLS.bind(RSEUIMessages.FILE_SUBSYSTEM_NOT_FOUND, host.getName())); - } - pm.worked(100); - - if(!fileSubSystem.isConnected()) { - try { - fileSubSystem.connect(new NullProgressMonitor(), false); - } catch (Exception e) { - pm.done(); - return getTestFailStatus(NLS.bind(RSEUIMessages.REMOTE_FILESYSTEM_CONNECT_FAILED, e.getLocalizedMessage())); - } - } - pm.worked(300); - - IFileService service = fileSubSystem.getFileService(); - if( service == null ) { - pm.done(); - return getTestFailStatus(NLS.bind(RSEUIMessages.FILESERVICE_NOT_FOUND, host.getName())); - } - pm.worked(100); - - String root = home; - IPath root2 = new Path(root); - try { - IHostFile file = service.getFile(root2.removeLastSegments(1).toPortableString(), root2.lastSegment(), new NullProgressMonitor()); - if( file == null || !file.exists()) { - pm.done(); - return getTestFailStatus(NLS.bind(RSEUIMessages.REMOTE_HOME_NOT_FOUND, - new Object[]{root2, service.getName(), host.getName()})); - - } - pm.worked(300); - - root2 = root2.append(IConstants.SERVER).append(config); - file = service.getFile(root2.removeLastSegments(1).toPortableString(), root2.lastSegment(), new NullProgressMonitor()); - if( file == null || !file.exists()) { - pm.done(); - return getTestFailStatus(NLS.bind(RSEUIMessages.REMOTE_CONFIG_NOT_FOUND, root2)); - } - pm.worked(300); - } catch(SystemMessageException sme) { - pm.done(); - return getTestFailStatus(RSEUIMessages.ERROR_CHECKING_REMOTE_SYSTEM + sme.getLocalizedMessage()); - } - pm.done(); - return Status.OK_STATUS; - } - private IStatus getTestFailStatus(String string) { - return new Status(IStatus.ERROR, org.jboss.ide.eclipse.as.rse.core.RSECorePlugin.PLUGIN_ID, string); - } - - private String discoverCurrentHost(IServerModeUICallback callback) { + protected String discoverCurrentHost(IServerModeUICallback callback) { String current = callback.getServer().getAttribute(RSEUtils.RSE_SERVER_HOST, (String)null); if( current == null ) { String serverHost = callback.getServer().getHost().toLowerCase(); @@ -376,52 +166,29 @@ callback.getServer().removePropertyChangeListener(this); } - private boolean updatingFromModelChange = false; public void propertyChange(PropertyChangeEvent evt) { updatingFromModelChange = true; - if( evt.getPropertyName().equals(RSEUtils.RSE_SERVER_HOME_DIR)) { - updateTextIfChanges(rseServerHome, evt.getNewValue().toString()); - } else if( evt.getPropertyName().equals(RSEUtils.RSE_SERVER_CONFIG)) { - updateTextIfChanges(rseServerConfig, evt.getNewValue().toString()); - } else if( evt.getPropertyName().equals(RSEUtils.RSE_SERVER_HOST)) { - combo.setHostName(evt.getNewValue().toString()); - } + propertyChangeBody(evt); updatingFromModelChange = false; } - private void updateTextIfChanges(Text control, String newValue) { - if(!control.getText().equals(newValue)) { - control.setText(newValue); - } + protected boolean isUpdatingFromModelChange() { + return updatingFromModelChange; } - - protected void browseClicked2() { - String browseVal = browseClicked3(); - if (browseVal != null) { - rseServerHome.setText(browseVal); - serverHomeChanged(); + + protected void propertyChangeBody(PropertyChangeEvent evt) { + if( evt.getPropertyName().equals(RSEUtils.RSE_SERVER_HOST)) { + combo.setHostName(evt.getNewValue().toString()); } } - - protected String browseClicked3() { - SystemRemoteFileDialog d = new SystemRemoteFileDialog( - rseBrowse.getShell(), RSEUIMessages.BROWSE_REMOTE_SYSTEM, combo.getHost()); - if( d.open() == Dialog.OK) { - Object o = d.getOutputObject(); - if( o instanceof IRemoteFile ) { - String path = ((IRemoteFile)o).getAbsolutePath(); - return path; - } + + protected void updateTextIfChanges(Text control, String newValue) { + if(!control.getText().equals(newValue)) { + control.setText(newValue); } - return null; } + - protected IJBossServerRuntime getRuntime() { - IRuntime rt = callback.getRuntime(); - if( rt == null ) return null; - return (IJBossServerRuntime)rt.loadAdapter(IJBossServerRuntime.class, null); - } - protected void rseHostChanged() { if( !updatingFromModelChange ) { String hostName = combo.getHost() == null ? null : combo.getHost().getAliasName(); @@ -436,26 +203,7 @@ } } } - - protected void serverHomeChanged() { - if( !updatingFromModelChange) { - String safeString = callback.getRuntime() != null ? callback.getRuntime().getLocation() != null ? - callback.getRuntime().getLocation().toString() : "" : ""; - callback.execute(new ChangeServerPropertyCommand( - callback.getServer(), RSEUtils.RSE_SERVER_HOME_DIR, rseServerHome.getText(), - safeString, RSEUIMessages.CHANGE_REMOTE_SERVER_HOME)); - } - } - protected void serverConfigChanged() { - if( !updatingFromModelChange ) { - callback.execute(new ChangeServerPropertyCommand( - callback.getServer(), RSEUtils.RSE_SERVER_CONFIG, rseServerConfig.getText(), - getRuntime() == null ? "" : getRuntime().getJBossConfiguration(), - RSEUIMessages.CHANGE_REMOTE_SERVER_CONFIG)); - } - } - public class CustomSystemHostCombo extends Composite implements ModifyListener, ISystemModelChangeListener { private String fileSubSystem; private Combo combo; @@ -598,59 +346,5 @@ RSECorePlugin.getTheSystemRegistry().removeSystemModelChangeListener(this); } } - - public class SetDeployDirCommand extends ServerCommand { - private String oldDir; - private String newDir; - private Text text; - private ModifyListener listener; - - public SetDeployDirCommand() { - super(callback.getServer(), Messages.EditorSetDeployLabel); - this.text = deployText; - this.newDir = deployText.getText(); - this.listener = deployListener; - this.oldDir = callback.getServer().getAttribute( - IDeployableServer.DEPLOY_DIRECTORY, ""); //$NON-NLS-1$ - } - - public void execute() { - callback.getServer().setAttribute( - IDeployableServer.DEPLOY_DIRECTORY, newDir); - updateDeployOnlyWidgets(); - } - - public void undo() { - callback.getServer().setAttribute( - IDeployableServer.DEPLOY_DIRECTORY, oldDir); - updateDeployOnlyWidgets(); - } - } - - public class SetTempDeployDirCommand extends ServerCommand { - private String oldDir; - private String newDir; - private Text text; - private ModifyListener listener; - - public SetTempDeployDirCommand() { - super(callback.getServer(), Messages.EditorSetTempDeployLabel); - text = tempDeployText; - newDir = tempDeployText.getText(); - listener = tempDeployListener; - oldDir = callback.getServer().getAttribute( - IDeployableServer.TEMP_DEPLOY_DIRECTORY, ""); //$NON-NLS-1$ - } - - public void execute() { - callback.getServer().setAttribute( - IDeployableServer.TEMP_DEPLOY_DIRECTORY, newDir); - } - - public void undo() { - callback.getServer().setAttribute( - IDeployableServer.TEMP_DEPLOY_DIRECTORY, oldDir); - } - } } } Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBoss7LaunchConfigurationTabGroup.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBoss7LaunchConfigurationTabGroup.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBoss7LaunchConfigurationTabGroup.java 2011-05-19 09:02:43 UTC (rev 31365) @@ -0,0 +1,66 @@ +/** + * JBoss by Red Hat + * Copyright 2006-2009, Red Hat Middleware, LLC, and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * +* This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ide.eclipse.as.ui.launch; + +import java.util.ArrayList; + +import org.eclipse.debug.ui.CommonTab; +import org.eclipse.debug.ui.EnvironmentTab; +import org.eclipse.debug.ui.ILaunchConfigurationTab; +import org.eclipse.debug.ui.sourcelookup.SourceLookupTab; +import org.eclipse.jdt.debug.ui.launchConfigurations.JavaArgumentsTab; +import org.eclipse.jdt.debug.ui.launchConfigurations.JavaClasspathTab; + +/** + * + * @author Rob Stryker <rob.stryker(a)redhat.com&gt; + * + */ +public class JBoss7LaunchConfigurationTabGroup extends JBossLaunchConfigurationTabGroup { + + public static ArrayList<IJBossLaunchTabProvider> providers7 = + new ArrayList<IJBossLaunchTabProvider>(); + static { + providers7.add(new JBoss7StandardTabProvider()); + } + public static void addTabProvider(IJBossLaunchTabProvider provider) { + providers7.add(provider); + } + + public static class JBoss7StandardTabProvider implements IJBossLaunchTabProvider { + public ILaunchConfigurationTab[] createTabs() { + ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[] { + new JavaArgumentsTab(), + new JavaMainTabExtension(), + new JavaClasspathTab(), + new SourceLookupTab(), + new EnvironmentTab(), + new CommonTab() + }; + return tabs; + } + } + + public ArrayList<IJBossLaunchTabProvider> getProviderList() { + return providers7; + } +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBoss7LaunchConfigurationTabGroup.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBossLaunchConfigurationTabGroup.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBossLaunchConfigurationTabGroup.java 2011-05-19 00:46:30 UTC (rev 31364) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBossLaunchConfigurationTabGroup.java 2011-05-19 09:02:43 UTC (rev 31365) @@ -91,8 +91,12 @@ } } + public ArrayList<IJBossLaunchTabProvider> getProviderList() { + return providers; + } + public void createTabs(ILaunchConfigurationDialog dialog, String mode) { - Iterator<IJBossLaunchTabProvider> i = providers.iterator(); + Iterator<IJBossLaunchTabProvider> i = getProviderList().iterator(); ArrayList<ILaunchConfigurationTab> tabs = new ArrayList<ILaunchConfigurationTab>(); while(i.hasNext()) { ILaunchConfigurationTab[] tabs2 = i.next().createTabs(); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerActionProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerActionProvider.java 2011-05-19 00:46:30 UTC (rev 31364) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerActionProvider.java 2011-05-19 09:02:43 UTC (rev 31365) @@ -127,7 +127,7 @@ IServer server = (IServer) data; ServerUIPlugin.editServer(server); } catch (Exception e) { - Trace.trace(Trace.STRING_SEVERE, org.jboss.ide.eclipse.as.ui.Messages.ServerActionProvider_CouldNotOpenServerError, e); + //Trace.trace(Trace.SEVERE, org.jboss.ide.eclipse.as.ui.Messages.ServerActionProvider_CouldNotOpenServerError, e); } } }); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerContentProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerContentProvider.java 2011-05-19 00:46:30 UTC (rev 31364) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerContentProvider.java 2011-05-19 09:02:43 UTC (rev 31365) @@ -349,7 +349,7 @@ } } } catch (Exception e) { - Trace.trace(Trace.STRING_FINEST, Messages.ServerContentProvider_ErrorInServersViewAnimation, e); + //Trace.trace(Trace.FINEST, Messages.ServerContentProvider_ErrorInServersViewAnimation, e); } display.timerExec(SLEEP, animator[0]); } Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/JBossManagerTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/JBossManagerTest.java 2011-05-19 00:46:30 UTC (rev 31364) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/JBossManagerTest.java 2011-05-19 09:02:43 UTC (rev 31365) @@ -91,6 +91,10 @@ throw new UnsupportedOperationException(); } + public JBoss7ServerState getServerState(String host) throws Exception { + throw new UnsupportedOperationException(); + } + public void stop(String host, int port) throws JBoss7ManangerException { }