JBoss Tools SVN: r32770 - in trunk/as/plugins: org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-08 11:41:23 -0400 (Fri, 08 Jul 2011)
New Revision: 32770
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7StartLaunchDelegate.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DelegatingJBoss7ServerBehavior.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DelegatingJBoss7StartLaunchConfiguration.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartLaunchDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSECorePlugin.java
Log:
[JBIDE-9215] added remote launching (not functional yet, need further investigation what's wrong. But infrastructure's here)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DelegatingJBoss7ServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DelegatingJBoss7ServerBehavior.java 2011-07-08 15:34:37 UTC (rev 32769)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DelegatingJBoss7ServerBehavior.java 2011-07-08 15:41:23 UTC (rev 32770)
@@ -81,7 +81,7 @@
public void setupLaunchConfiguration(ILaunchConfigurationWorkingCopy launchConfig, IProgressMonitor monitor)
throws CoreException {
// TODO: implement setup for RSE launch delegate too
- new LocalJBoss7StartupConfigurator(getServer()).configure(launchConfig);
+ DelegatingJBoss7StartLaunchConfiguration.setupLaunchConfiguration(launchConfig, getServer());
}
public void setProcess(IProcess process) {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DelegatingJBoss7StartLaunchConfiguration.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DelegatingJBoss7StartLaunchConfiguration.java 2011-07-08 15:34:37 UTC (rev 32769)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DelegatingJBoss7StartLaunchConfiguration.java 2011-07-08 15:41:23 UTC (rev 32770)
@@ -20,11 +20,16 @@
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.ServerUtil;
+import org.eclipse.wst.server.core.internal.IStartup;
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.internal.DeployableServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.launch.DelegatingStartLaunchConfiguration;
import org.jboss.ide.eclipse.as.core.server.internal.launch.IStartLaunchDelegate;
import org.jboss.ide.eclipse.as.core.server.internal.launch.IStartLaunchSetupParticipant;
import org.jboss.ide.eclipse.as.core.server.internal.launch.LocalJBossStartLaunchDelegate;
+import org.jboss.ide.eclipse.as.core.util.ServerConverter;
/**
* @author Rob Stryker
@@ -54,20 +59,16 @@
// unless their operation mode (local / rse / etc) is in use
public static void setupLaunchConfiguration(ILaunchConfigurationWorkingCopy workingCopy, IServer server) throws CoreException {
for( Iterator<IStartLaunchSetupParticipant> i = setupParticipants.iterator(); i.hasNext(); ) {
- i.next().setupLaunchConfiguration(workingCopy, server);
+ IStartLaunchSetupParticipant setupParticipant = i.next();
+ setupParticipant.setupLaunchConfiguration(workingCopy, server);
}
}
protected IStartLaunchDelegate getDelegate(ILaunchConfiguration configuration) throws CoreException {
-// TODO: choose delegate upon setting (server editor)
-// IServer server = ServerUtil.getServer(configuration);
-// DeployableServerBehavior beh = ServerConverter.getDeployableServerBehavior(server);
-// IJBossServerPublishMethodType type = beh.createPublishMethod().getPublishMethodType();
-// return launchDelegates.get(type.getId());
-
-// always return local launch delegate until all parts were implemented
- return new LocalJBoss7StartLaunchDelegate();
-
+ IServer server = ServerUtil.getServer(configuration);
+ DeployableServerBehavior beh = ServerConverter.getDeployableServerBehavior(server);
+ IJBossServerPublishMethodType type = beh.createPublishMethod().getPublishMethodType();
+ return launchDelegates.get(type.getId());
}
public void actualLaunch(ILaunchConfiguration configuration,
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartLaunchDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartLaunchDelegate.java 2011-07-08 15:34:37 UTC (rev 32769)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartLaunchDelegate.java 2011-07-08 15:41:23 UTC (rev 32770)
@@ -14,7 +14,9 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.debug.core.ILaunch;
import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.debug.core.model.IProcess;
+import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.extensions.polling.WebPortPoller;
import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossBehaviorDelegate;
@@ -77,4 +79,11 @@
// report it
}
}
+
+ @Override
+ public void setupLaunchConfiguration(
+ ILaunchConfigurationWorkingCopy workingCopy, IServer server) throws CoreException {
+ new LocalJBoss7StartupConfigurator(server).configure(workingCopy);
+ }
+
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSECorePlugin.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSECorePlugin.java 2011-07-08 15:34:37 UTC (rev 32769)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSECorePlugin.java 2011-07-08 15:41:23 UTC (rev 32770)
@@ -14,6 +14,8 @@
import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.launch.DelegatingStartLaunchConfiguration;
+import org.jboss.ide.eclipse.as.core.server.internal.v7.DelegatingJBoss7ServerBehavior;
+import org.jboss.ide.eclipse.as.core.server.internal.v7.DelegatingJBoss7StartLaunchConfiguration;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
@@ -35,6 +37,11 @@
DelegatingServerBehavior.addDelegateMapping(RSEPublishMethod.RSE_ID, RSEBehaviourDelegate.class);
DelegatingStartLaunchConfiguration.addLaunchDelegateMapping(RSEPublishMethod.RSE_ID, new RSEJBossStartLaunchDelegate());
DelegatingStartLaunchConfiguration.addSetupLaunchParticipant(new RSEJBossStartLaunchDelegate());
+
+ DelegatingJBoss7ServerBehavior.addDelegateMapping(RSEPublishMethod.RSE_ID, RSEJBoss7BehaviourDelegate.class);
+ DelegatingJBoss7StartLaunchConfiguration.addLaunchDelegateMapping(RSEPublishMethod.RSE_ID, new RSEJBoss7StartLaunchDelegate());
+ DelegatingJBoss7StartLaunchConfiguration.addSetupLaunchParticipant(new RSEJBossStartLaunchDelegate());
+
}
/*
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java 2011-07-08 15:41:23 UTC (rev 32770)
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * 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
+ *
+ * TODO: Logging and Progress Monitors
+ ******************************************************************************/
+package org.jboss.ide.eclipse.as.rse.core;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.wst.server.core.IServer;
+import org.jboss.ide.eclipse.as.core.server.IServerStatePoller;
+import org.jboss.ide.eclipse.as.core.util.ServerUtil;
+
+public class RSEJBoss7BehaviourDelegate extends AbstractRSEBehaviourDelegate {
+
+ @Override
+ protected String getShutdownCommand(IServer server) throws CoreException {
+ String defaultCommand = ServerUtil.checkedGetBehaviorDelegate(server).getDefaultStopArguments();
+ ILaunchConfiguration config = getServer().getLaunchConfiguration(false, new NullProgressMonitor());
+ return RSELaunchConfigProperties.getShutdownCommand(config, defaultCommand);
+ }
+
+ @Override
+ public void serverIsStarting() {
+ pollServer(IServerStatePoller.SERVER_UP);
+ }
+
+ @Override
+ public void serverIsStopping() {
+ pollServer(IServerStatePoller.SERVER_DOWN);
+ }
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7StartLaunchDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7StartLaunchDelegate.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7StartLaunchDelegate.java 2011-07-08 15:41:23 UTC (rev 32770)
@@ -0,0 +1,140 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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
+ *
+ * TODO: Logging and Progress Monitors
+ ******************************************************************************/
+package org.jboss.ide.eclipse.as.rse.core;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.debug.core.ILaunch;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
+import org.eclipse.wst.server.core.IServer;
+import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
+import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
+import org.jboss.ide.eclipse.as.core.server.internal.IJBossBehaviourDelegate;
+import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
+import org.jboss.ide.eclipse.as.core.server.internal.launch.DelegatingStartLaunchConfiguration;
+import org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties;
+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.LaunchCommandPreferences;
+import org.jboss.ide.eclipse.as.core.util.ServerConverter;
+import org.jboss.ide.eclipse.as.core.util.ServerUtil;
+import org.jboss.ide.eclipse.as.core.util.ThreadUtils;
+
+public class RSEJBoss7StartLaunchDelegate extends AbstractRSELaunchDelegate {
+ public void actualLaunch(DelegatingStartLaunchConfiguration launchConfig,
+ ILaunchConfiguration configuration, String mode, ILaunch launch,
+ IProgressMonitor monitor) throws CoreException {
+ DelegatingServerBehavior beh = JBossServerBehaviorUtils.getServerBehavior(configuration);
+ beh.setServerStarting();
+ if (LaunchCommandPreferences.isIgnoreLaunchCommand(beh.getServer())) {
+ beh.setServerStarted();
+ return;
+ }
+ String command = RSELaunchConfigProperties.getStartupCommand(configuration);
+ executeRemoteCommand(command, beh);
+ launchPingThread(beh);
+ }
+
+ private void launchPingThread(DeployableServerBehavior beh) {
+ // TODO do it properly here
+ ThreadUtils.sleepFor(30000);
+ beh.setServerStarted();
+ }
+
+ public void preLaunch(ILaunchConfiguration configuration, String mode,
+ ILaunch launch, IProgressMonitor monitor) throws CoreException {
+ }
+
+ public void postLaunch(ILaunchConfiguration configuration, String mode,
+ ILaunch launch, IProgressMonitor monitor) throws CoreException {
+ }
+
+ public void setupLaunchConfiguration(ILaunchConfigurationWorkingCopy workingCopy, IServer server)
+ throws CoreException {
+ new RSELaunchConfigurator(getDefaultLaunchCommand(workingCopy), getDefaultStopCommand(server))
+ .configure(workingCopy);
+ /*
+ * /usr/lib/jvm/jre/bin/java -Dprogram.name=run.sh -server -Xms1530M
+ * -Xmx1530M -XX:PermSize=425M -XX:MaxPermSize=425M
+ * -Dorg.jboss.resolver.warning=true
+ * -Dsun.rmi.dgc.client.gcInterval=3600000
+ * -Dsun.rmi.dgc.server.gcInterval=3600000
+ * -Djboss.partition.udpGroup=228.1.2.3
+ * -Djboss.webpartition.mcast_port=45577
+ * -Djboss.hapartition.mcast_port=45566
+ * -Djboss.ejb3entitypartition.mcast_port=43333
+ * -Djboss.ejb3sfsbpartition.mcast_port=45551
+ * -Djboss.jvmRoute=node-10.209.183.100 -Djboss.gossip_port=12001
+ * -Djboss.gossip_refresh=5000 -Djava.awt.headless=true
+ * -Djava.net.preferIPv4Stack=true
+ * -Djava.endorsed.dirs=/opt/jboss-eap-5.1.0.Beta/jboss-as/lib/endorsed
+ * -classpath /opt/jboss-eap-5.1.0.Beta/jboss-as/bin/run.jar
+ * org.jboss.Main -c default -b 10.209.183.100
+ */
+ }
+
+ private String getDefaultStopCommand(IServer server) {
+ try {
+ return getDefaultStopCommand(server, false);
+ } catch (CoreException ce) {/* ignore, INTENTIONAL */
+ }
+ return null;
+ }
+
+ private String getDefaultStopCommand(IServer server, boolean errorOnFail) throws CoreException {
+ String rseHome = RSEUtils.getRSEHomeDir(server, errorOnFail);
+
+ String stop = new Path(rseHome)
+ .append(IJBossRuntimeResourceConstants.BIN)
+ .append(IJBossRuntimeResourceConstants.SHUTDOWN_SH).toString()
+ + IJBossRuntimeConstants.SPACE;
+
+ // Pull args from single utility method
+ // stop += StopLaunchConfiguration.getDefaultArgs(jbs);
+ IJBossBehaviourDelegate delegate = ServerUtil.checkedGetBehaviorDelegate(server);
+ stop += delegate.getDefaultStopArguments();
+ return stop;
+ }
+
+ private String getDefaultLaunchCommand(ILaunchConfiguration config) throws CoreException {
+ String serverId = JBossLaunchConfigProperties.getServerId(config);
+ JBossServer jbossServer = ServerConverter.checkedFindJBossServer(serverId);
+ String rseHome = jbossServer.getServer().getAttribute(RSEUtils.RSE_SERVER_HOME_DIR, "");
+ // initialize startup command to something reasonable
+ String currentArgs = config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, ""); //$NON-NLS-1$
+ String currentVMArgs = config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, ""); //$NON-NLS-1$
+
+ currentVMArgs = ArgsUtil.setArg(currentVMArgs, null,
+ IJBossRuntimeConstants.SYSPROP + IJBossRuntimeConstants.ENDORSED_DIRS,
+ new Path(rseHome).append(
+ IJBossRuntimeResourceConstants.LIB).append(
+ IJBossRuntimeResourceConstants.ENDORSED).toOSString(), true);
+
+ String libPath = new Path(rseHome).append(IJBossRuntimeResourceConstants.BIN)
+ .append(IJBossRuntimeResourceConstants.NATIVE).toOSString();
+ currentVMArgs = ArgsUtil.setArg(currentVMArgs, null,
+ IJBossRuntimeConstants.SYSPROP + IJBossRuntimeConstants.JAVA_LIB_PATH,
+ libPath, true);
+
+ String cmd = "java " + currentVMArgs + " -classpath " +
+ new Path(rseHome).append(IJBossRuntimeResourceConstants.BIN).append(
+ IJBossRuntimeResourceConstants.START_JAR).toString() + IJBossRuntimeConstants.SPACE +
+ IJBossRuntimeConstants.START_MAIN_TYPE + IJBossRuntimeConstants.SPACE + currentArgs + "&";
+ return cmd;
+ }
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7StartLaunchDelegate.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 9 months
JBoss Tools SVN: r32769 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-08 11:34:37 -0400 (Fri, 08 Jul 2011)
New Revision: 32769
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/IStartLaunchSetupParticipant.java
Log:
[JBIDE-9215] added copyright header
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/IStartLaunchSetupParticipant.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/IStartLaunchSetupParticipant.java 2011-07-08 15:20:36 UTC (rev 32768)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/IStartLaunchSetupParticipant.java 2011-07-08 15:34:37 UTC (rev 32769)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * 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.launch;
import org.eclipse.core.runtime.CoreException;
@@ -6,6 +16,7 @@
public interface IStartLaunchSetupParticipant {
- public void setupLaunchConfiguration(ILaunchConfigurationWorkingCopy workingCopy, IServer server) throws CoreException;
+ public void setupLaunchConfiguration(ILaunchConfigurationWorkingCopy workingCopy, IServer server)
+ throws CoreException;
}
\ No newline at end of file
14 years, 9 months
JBoss Tools SVN: r32768 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-08 11:20:36 -0400 (Fri, 08 Jul 2011)
New Revision: 32768
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DelegatingJBoss7ServerBehavior.java
Log:
[JBIDE-9215] added @Override
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DelegatingJBoss7ServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DelegatingJBoss7ServerBehavior.java 2011-07-08 14:48:24 UTC (rev 32767)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DelegatingJBoss7ServerBehavior.java 2011-07-08 15:20:36 UTC (rev 32768)
@@ -72,10 +72,12 @@
return delegateClassMap;
}
+ @Override
public boolean shouldSuspendScanner() {
return false;
}
+ @Override
public void setupLaunchConfiguration(ILaunchConfigurationWorkingCopy launchConfig, IProgressMonitor monitor)
throws CoreException {
// TODO: implement setup for RSE launch delegate too
@@ -122,6 +124,7 @@
createDoDeployMarker(paths, monitor);
}
+ @Override
public void restartModule(IModule[] module, IProgressMonitor monitor) throws CoreException {
IDeployableServer ds = ServerConverter.getDeployableServer(getServer());
if( ds == null )
@@ -148,6 +151,7 @@
}
}
+ @Override
public void stop(boolean force) {
if( LaunchCommandPreferences.isIgnoreLaunchCommand(getServer())) {
super.setServerStopped();
14 years, 9 months
JBoss Tools SVN: r32767 - trunk/as/plugins/org.jboss.ide.eclipse.as.core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-08 10:48:24 -0400 (Fri, 08 Jul 2011)
New Revision: 32767
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
Log:
[JBIDE-9215] corrected wrong delegate attribute for JBoss7StartupConfiguration extension
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2011-07-08 14:30:19 UTC (rev 32766)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2011-07-08 14:48:24 UTC (rev 32767)
@@ -631,7 +631,7 @@
sourcePathComputerId="org.eclipse.jst.server.generic.core.sourcePathComputer"/>
<launchConfigurationType
category="JBoss"
- delegate="org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ServerStartLaunchConfiguration"
+ delegate="org.jboss.ide.eclipse.as.core.server.internal.v7.DelegatingJBoss7StartLaunchConfiguration"
id="org.jboss.ide.eclipse.as.core.server.JBoss7StartupConfiguration"
modes="run,debug,profile"
name="JBoss Application Server Startup Configuration"
14 years, 9 months
JBoss Tools SVN: r32766 - trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-08 10:30:19 -0400 (Fri, 08 Jul 2011)
New Revision: 32766
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSEBehaviourDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java
Log:
[JBIDE-9215] moved #forceStop() to from RSEBehaviourDelegate to AbstractRSEBehaviourDelegate
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSEBehaviourDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSEBehaviourDelegate.java 2011-07-08 14:28:34 UTC (rev 32765)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSEBehaviourDelegate.java 2011-07-08 14:30:19 UTC (rev 32766)
@@ -53,6 +53,11 @@
}
@Override
+ protected void forceStop() {
+ setServerStopped();
+ }
+
+ @Override
protected IStatus gracefullStop() {
try {
executeShutdownCommand(getShutdownCommand(getServer()));
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-07-08 14:28:34 UTC (rev 32765)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java 2011-07-08 14:30:19 UTC (rev 32766)
@@ -22,11 +22,6 @@
public class RSEBehaviourDelegate extends AbstractRSEBehaviourDelegate {
@Override
- protected void forceStop() {
- setServerStopped();
- }
-
- @Override
protected String getShutdownCommand(IServer server) throws CoreException {
String defaultCommand = ServerUtil.checkedGetBehaviorDelegate(server).getDefaultStopArguments();
ILaunchConfiguration config = getServer().getLaunchConfiguration(false, new NullProgressMonitor());
14 years, 9 months
JBoss Tools SVN: r32765 - trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-08 10:28:34 -0400 (Fri, 08 Jul 2011)
New Revision: 32765
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java
Log:
[JBIDE-9215] added @Override
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-07-08 14:27:28 UTC (rev 32764)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java 2011-07-08 14:28:34 UTC (rev 32765)
@@ -33,10 +33,12 @@
return RSELaunchConfigProperties.getShutdownCommand(config, defaultCommand);
}
+ @Override
public void serverIsStarting() {
pollServer(IServerStatePoller.SERVER_UP);
}
+ @Override
public void serverIsStopping() {
pollServer(IServerStatePoller.SERVER_DOWN);
}
14 years, 9 months
JBoss Tools SVN: r32764 - trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-08 10:27:28 -0400 (Fri, 08 Jul 2011)
New Revision: 32764
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSEBehaviourDelegate.java
Log:
[JBIDE-9215] extracted #executeShutdownCommand(shutdownCommand)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSEBehaviourDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSEBehaviourDelegate.java 2011-07-08 14:24:23 UTC (rev 32763)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSEBehaviourDelegate.java 2011-07-08 14:27:28 UTC (rev 32764)
@@ -55,13 +55,7 @@
@Override
protected IStatus gracefullStop() {
try {
- String shutdownCommand = getShutdownCommand(getServer());
- ServerShellModel model = RSEHostShellModel.getInstance().getModel(getServer());
- model.executeRemoteCommand("/", shutdownCommand, new String[]{}, new NullProgressMonitor(), 10000, true);
- IHostShell shell = model.getStartupShell();
- if( RSEUtils.isActive(shell)) {
- shell.writeToShell("exit");
- }
+ executeShutdownCommand(getShutdownCommand(getServer()));
return Status.OK_STATUS;
} catch(CoreException ce) {
ServerLogger.getDefault().log(getServer(), ce.getStatus());
@@ -72,6 +66,15 @@
}
}
+ private void executeShutdownCommand(String shutdownCommand) throws CoreException {
+ ServerShellModel model = RSEHostShellModel.getInstance().getModel(getServer());
+ model.executeRemoteCommand("/", shutdownCommand, new String[]{}, new NullProgressMonitor(), 10000, true);
+ IHostShell shell = model.getStartupShell();
+ if( RSEUtils.isActive(shell)) {
+ shell.writeToShell("exit");
+ }
+ }
+
protected abstract String getShutdownCommand(IServer server) throws CoreException;
/**
14 years, 9 months
JBoss Tools SVN: r32763 - trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-08 10:24:23 -0400 (Fri, 08 Jul 2011)
New Revision: 32763
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSEBehaviourDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java
Log:
[JBIDE-9215] moved #gracefulStop() to superclass (from RSEBehaviourDelegate to AbstractRSEBehaviourDelegate)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSEBehaviourDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSEBehaviourDelegate.java 2011-07-08 14:19:07 UTC (rev 32762)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSEBehaviourDelegate.java 2011-07-08 14:24:23 UTC (rev 32763)
@@ -12,9 +12,19 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.rse.core;
+import java.text.MessageFormat;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.rse.services.shells.IHostShell;
+import org.eclipse.wst.server.core.IServer;
+import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger;
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.util.LaunchCommandPreferences;
+import org.jboss.ide.eclipse.as.rse.core.RSEHostShellModel.ServerShellModel;
public abstract class AbstractRSEBehaviourDelegate extends AbstractJBossBehaviourDelegate {
@@ -41,7 +51,29 @@
setServerStopped();
}
}
-
+
+ @Override
+ protected IStatus gracefullStop() {
+ try {
+ String shutdownCommand = getShutdownCommand(getServer());
+ ServerShellModel model = RSEHostShellModel.getInstance().getModel(getServer());
+ model.executeRemoteCommand("/", shutdownCommand, new String[]{}, new NullProgressMonitor(), 10000, true);
+ IHostShell shell = model.getStartupShell();
+ if( RSEUtils.isActive(shell)) {
+ shell.writeToShell("exit");
+ }
+ return Status.OK_STATUS;
+ } catch(CoreException ce) {
+ ServerLogger.getDefault().log(getServer(), ce.getStatus());
+ return new Status(
+ IStatus.ERROR, RSECorePlugin.PLUGIN_ID,
+ MessageFormat.format("Could not stop server {0}", getServer().getName()),
+ ce);
+ }
+ }
+
+ protected abstract String getShutdownCommand(IServer server) throws CoreException;
+
/**
* ATTENTION: don't call this directly, use {@link #getActualBehavior().getServerStarting()} instead.
* if we would call the delegating server behavior here to set it's state, we would cause an infinite loop.
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-07-08 14:19:07 UTC (rev 32762)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java 2011-07-08 14:24:23 UTC (rev 32763)
@@ -12,19 +12,12 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.rse.core;
-import java.text.MessageFormat;
-
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.rse.services.shells.IHostShell;
import org.eclipse.wst.server.core.IServer;
-import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger;
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller;
import org.jboss.ide.eclipse.as.core.util.ServerUtil;
-import org.jboss.ide.eclipse.as.rse.core.RSEHostShellModel.ServerShellModel;
public class RSEBehaviourDelegate extends AbstractRSEBehaviourDelegate {
@@ -34,26 +27,7 @@
}
@Override
- protected IStatus gracefullStop() {
- try {
- String shutdownCommand = getShutdownCommand(getServer());
- ServerShellModel model = RSEHostShellModel.getInstance().getModel(getServer());
- model.executeRemoteCommand("/", shutdownCommand, new String[]{}, new NullProgressMonitor(), 10000, true);
- IHostShell shell = model.getStartupShell();
- if( RSEUtils.isActive(shell)) {
- shell.writeToShell("exit");
- }
- return Status.OK_STATUS;
- } catch(CoreException ce) {
- ServerLogger.getDefault().log(getServer(), ce.getStatus());
- return new Status(
- IStatus.ERROR, RSECorePlugin.PLUGIN_ID,
- MessageFormat.format("Could not stop server {0}", getServer().getName()),
- ce);
- }
- }
-
- private String getShutdownCommand(IServer server) throws CoreException {
+ protected String getShutdownCommand(IServer server) throws CoreException {
String defaultCommand = ServerUtil.checkedGetBehaviorDelegate(server).getDefaultStopArguments();
ILaunchConfiguration config = getServer().getLaunchConfiguration(false, new NullProgressMonitor());
return RSELaunchConfigProperties.getShutdownCommand(config, defaultCommand);
14 years, 9 months
JBoss Tools SVN: r32762 - trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-08 10:19:07 -0400 (Fri, 08 Jul 2011)
New Revision: 32762
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java
Log:
[JBIDE-9215] moved shell checks to RSEUtils#isActive(IHostShell)
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-07-08 14:18:41 UTC (rev 32761)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java 2011-07-08 14:19:07 UTC (rev 32762)
@@ -41,7 +41,7 @@
model.executeRemoteCommand("/", shutdownCommand, new String[]{}, new NullProgressMonitor(), 10000, true);
IHostShell shell = model.getStartupShell();
if( RSEUtils.isActive(shell)) {
- model.getStartupShell().writeToShell("exit");
+ shell.writeToShell("exit");
}
return Status.OK_STATUS;
} catch(CoreException ce) {
14 years, 9 months
JBoss Tools SVN: r32761 - trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-08 10:18:41 -0400 (Fri, 08 Jul 2011)
New Revision: 32761
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/RSEUtils.java
Log:
[JBIDE-9215] moved shell checks to RSEUtils#isActive(IHostShell)
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-07-08 14:15:38 UTC (rev 32760)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java 2011-07-08 14:18:41 UTC (rev 32761)
@@ -19,6 +19,7 @@
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Status;
import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.rse.services.shells.IHostShell;
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger;
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller;
@@ -38,7 +39,8 @@
String shutdownCommand = getShutdownCommand(getServer());
ServerShellModel model = RSEHostShellModel.getInstance().getModel(getServer());
model.executeRemoteCommand("/", shutdownCommand, new String[]{}, new NullProgressMonitor(), 10000, true);
- if( model.getStartupShell() != null && model.getStartupShell().isActive()) {
+ IHostShell shell = model.getStartupShell();
+ if( RSEUtils.isActive(shell)) {
model.getStartupShell().writeToShell("exit");
}
return Status.OK_STATUS;
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-07-08 14:15:38 UTC (rev 32760)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java 2011-07-08 14:18:41 UTC (rev 32761)
@@ -18,6 +18,7 @@
import org.eclipse.core.runtime.Status;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.model.IHost;
+import org.eclipse.rse.services.shells.IHostShell;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.IServerAttributes;
import org.eclipse.wst.server.core.IServerWorkingCopy;
@@ -170,5 +171,10 @@
IDeployableServer.DEPLOY_SERVER);
return wc.save(false, new NullProgressMonitor());
}
+
+ public static boolean isActive(IHostShell shell) {
+ return shell != null
+ && shell.isActive();
+ }
}
14 years, 9 months