JBoss Tools SVN: r36651 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-11-25 02:09:44 -0500 (Fri, 25 Nov 2011)
New Revision: 36651
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBASHostShellListener.java
Log:
investigating the openshift console writer
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBASHostShellListener.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBASHostShellListener.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBASHostShellListener.java 2011-11-25 07:09:44 UTC (rev 36651)
@@ -0,0 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.ide.eclipse.as.core.server;
+
+public interface IJBASHostShellListener {
+ public void writeToShell(String serverId, String[] lines);
+}
\ No newline at end of file
13 years, 1 month
JBoss Tools SVN: r36650 - in trunk/as/plugins: org.jboss.ide.eclipse.as.ui/META-INF and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-11-25 02:08:41 -0500 (Fri, 25 Nov 2011)
New Revision: 36650
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/console/JBASConsoleWriter.java
Removed:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/JBASConsoleWriter.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEUIPlugin.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF
Log:
Allowing delegates to participate in stopping even if ignore start / stop is checked. investigating the rse console writer
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/JBASConsoleWriter.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/JBASConsoleWriter.java 2011-11-25 07:05:52 UTC (rev 36649)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/JBASConsoleWriter.java 2011-11-25 07:08:41 UTC (rev 36650)
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.ide.eclipse.as.rse.ui;
-
-import org.eclipse.ui.console.ConsolePlugin;
-import org.eclipse.ui.console.IConsole;
-import org.eclipse.ui.console.IConsoleManager;
-import org.eclipse.ui.console.MessageConsole;
-import org.eclipse.ui.console.MessageConsoleStream;
-import org.jboss.ide.eclipse.as.rse.core.RSEHostShellModel.IJBASHostShellListener;
-
-public class JBASConsoleWriter implements IJBASHostShellListener {
- public void writeToShell(String serverId, String[] lines) {
- MessageConsole myConsole = findConsole(serverId);
- MessageConsoleStream out = myConsole.newMessageStream();
- for( int i = 0; i < lines.length; i++ )
- out.println(lines[i]);
- }
-
- private MessageConsole findConsole(String name) {
- ConsolePlugin plugin = ConsolePlugin.getDefault();
- IConsoleManager conMan = plugin.getConsoleManager();
- IConsole[] existing = conMan.getConsoles();
- for (int i = 0; i < existing.length; i++)
- if (name.equals(existing[i].getName()))
- return (MessageConsole) existing[i];
- //no console found, so create a new one
- MessageConsole myConsole = new MessageConsole(name, null);
- conMan.addConsoles(new IConsole[]{myConsole});
- return myConsole;
- }
-
-}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEUIPlugin.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEUIPlugin.java 2011-11-25 07:05:52 UTC (rev 36649)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEUIPlugin.java 2011-11-25 07:08:41 UTC (rev 36650)
@@ -1,3 +1,14 @@
+/*******************************************************************************
+ * 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
+ *
+ ******************************************************************************/
package org.jboss.ide.eclipse.as.rse.ui;
import org.jboss.ide.eclipse.as.rse.core.RSEHostShellModel;
@@ -2,2 +13,3 @@
import org.jboss.ide.eclipse.as.rse.core.RSEPublishMethod;
+import org.jboss.ide.eclipse.as.ui.console.JBASConsoleWriter;
import org.jboss.ide.eclipse.as.ui.editor.DeploymentModuleOptionCompositeAssistant;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF 2011-11-25 07:05:52 UTC (rev 36649)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF 2011-11-25 07:08:41 UTC (rev 36650)
@@ -58,6 +58,7 @@
org.eclipse.wst.common.emfworkbench.integration;bundle-version="1.2.100"
Bundle-ActivationPolicy: lazy
Export-Package: org.jboss.ide.eclipse.as.ui,
+ org.jboss.ide.eclipse.as.ui.console,
org.jboss.ide.eclipse.as.ui.dialogs,
org.jboss.ide.eclipse.as.ui.editor,
org.jboss.ide.eclipse.as.ui.launch,
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/console/JBASConsoleWriter.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/console/JBASConsoleWriter.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/console/JBASConsoleWriter.java 2011-11-25 07:08:41 UTC (rev 36650)
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.ide.eclipse.as.ui.console;
+
+import org.eclipse.ui.console.ConsolePlugin;
+import org.eclipse.ui.console.IConsole;
+import org.eclipse.ui.console.IConsoleManager;
+import org.eclipse.ui.console.MessageConsole;
+import org.eclipse.ui.console.MessageConsoleStream;
+import org.jboss.ide.eclipse.as.core.server.IJBASHostShellListener;
+
+public class JBASConsoleWriter implements IJBASHostShellListener {
+ public void writeToShell(String serverId, String[] lines) {
+ MessageConsole myConsole = findConsole(serverId);
+ MessageConsoleStream out = myConsole.newMessageStream();
+ for( int i = 0; i < lines.length; i++ )
+ out.println(lines[i]);
+ }
+
+ private MessageConsole findConsole(String name) {
+ ConsolePlugin plugin = ConsolePlugin.getDefault();
+ IConsoleManager conMan = plugin.getConsoleManager();
+ IConsole[] existing = conMan.getConsoles();
+ for (int i = 0; i < existing.length; i++)
+ if (name.equals(existing[i].getName()))
+ return (MessageConsole) existing[i];
+ //no console found, so create a new one
+ MessageConsole myConsole = new MessageConsole(name, null);
+ conMan.addConsoles(new IConsole[]{myConsole});
+ return myConsole;
+ }
+
+}
13 years, 1 month
JBoss Tools SVN: r36649 - in trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core: META-INF and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-11-25 02:05:52 -0500 (Fri, 25 Nov 2011)
New Revision: 36649
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/META-INF/MANIFEST.MF
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/plugin.properties
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/RSEHostShellModel.java
Log:
Allowing delegates to participate in stopping even if ignore start / stop is checked.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/META-INF/MANIFEST.MF 2011-11-25 06:43:32 UTC (rev 36648)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/META-INF/MANIFEST.MF 2011-11-25 07:05:52 UTC (rev 36649)
@@ -26,5 +26,6 @@
org.eclipse.jdt.launching;bundle-version="3.6.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.jboss.ide.eclipse.as.rse.core
+Export-Package: org.jboss.ide.eclipse.as.rse.core,
+ org.jboss.ide.eclipse.as.rse.core.xpl
Bundle-Localization: plugin
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/plugin.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/plugin.properties 2011-11-25 06:43:32 UTC (rev 36648)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/plugin.properties 2011-11-25 07:05:52 UTC (rev 36649)
@@ -1,9 +1,12 @@
Bundle-Vendor.0 = JBoss by Red Hat
Bundle-Name.0 = JBossAS RSE Tools
-AllJBossRuntimeTypes=org.jboss.ide.eclipse.as.runtime.32,org.jboss.ide.eclipse.as.runtime.40,org.jboss.ide.eclipse.as.runtime.42,org.jboss.ide.eclipse.as.runtime.50,org.jboss.ide.eclipse.as.runtime.51,org.jboss.ide.eclipse.as.runtime.60,org.jboss.ide.eclipse.as.runtime.70,org.jboss.ide.eclipse.as.runtime.eap.43,org.jboss.ide.eclipse.as.runtime.eap.50,org.jboss.ide.eclipse.as.runtime.eap.60
-AllJBossServerTypes=org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50,org.jboss.ide.eclipse.as.eap.60,
-AllJBTServerTypes=org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50,org.jboss.ide.eclipse.as.eap.60,org.jboss.ide.eclipse.as.systemCopyServer
-ServerTypesJBoss6OrHigher=org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.eap.60
+RSEMethodName=Remote System Deployment
+
+AllJBossRuntimeTypes=org.jboss.ide.eclipse.as.runtime.32,org.jboss.ide.eclipse.as.runtime.40,org.jboss.ide.eclipse.as.runtime.42,org.jboss.ide.eclipse.as.runtime.50,org.jboss.ide.eclipse.as.runtime.51,org.jboss.ide.eclipse.as.runtime.60,org.jboss.ide.eclipse.as.runtime.70,org.jboss.ide.eclipse.as.runtime.71,org.jboss.ide.eclipse.as.runtime.eap.43,org.jboss.ide.eclipse.as.runtime.eap.50,org.jboss.ide.eclipse.as.runtime.eap.60
+AllJBossServerTypes=org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.71,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50,org.jboss.ide.eclipse.as.eap.60,
+AllJBTServerTypes=org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.71,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50,org.jboss.ide.eclipse.as.eap.60,org.jboss.ide.eclipse.as.systemCopyServer
ServerTypesJBoss6OrLower=org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50
-ServerTypesJBoss7=org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.eap.60
-RSEMethodName=Remote System Deployment
\ No newline at end of file
+RuntimeTypesJBoss6OrLower=org.jboss.ide.eclipse.as.runtime.32,org.jboss.ide.eclipse.as.runtime.40,org.jboss.ide.eclipse.as.runtime.42,org.jboss.ide.eclipse.as.runtime.50,org.jboss.ide.eclipse.as.runtime.51,org.jboss.ide.eclipse.as.runtime.60,org.jboss.ide.eclipse.as.runtime.eap.43,org.jboss.ide.eclipse.as.runtime.eap.50
+ServerTypesJBoss6OrHigher=org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.71,org.jboss.ide.eclipse.as.eap.60
+ServerTypesJBoss7=org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.71,org.jboss.ide.eclipse.as.eap.60
+RuntimeTypesJBoss7=org.jboss.ide.eclipse.as.runtime.70,org.jboss.ide.eclipse.as.runtime.71,org.jboss.ide.eclipse.as.runtime.eap.60
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-11-25 06:43:32 UTC (rev 36648)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSEBehaviourDelegate.java 2011-11-25 07:05:52 UTC (rev 36649)
@@ -25,7 +25,7 @@
}
@Override
- public void stop(boolean force) {
+ public void stopImpl(boolean force) {
if( force ) {
forceStop();
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEHostShellModel.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEHostShellModel.java 2011-11-25 06:43:32 UTC (rev 36648)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEHostShellModel.java 2011-11-25 07:05:52 UTC (rev 36649)
@@ -32,6 +32,7 @@
import org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.IShellServiceSubSystem;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.ServerCore;
+import org.jboss.ide.eclipse.as.core.server.IJBASHostShellListener;
import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
import org.jboss.ide.eclipse.as.core.util.ThreadUtils;
import org.jboss.ide.eclipse.as.rse.core.xpl.ConnectAllSubsystemsUtil;
@@ -51,10 +52,6 @@
}
- public interface IJBASHostShellListener {
- public void writeToShell(String serverId, String[] lines);
- }
-
private ArrayList<IJBASHostShellListener> listeners = new ArrayList<IJBASHostShellListener>();
public void addHostShellListener(IJBASHostShellListener listener) {
listeners.add(listener);
13 years, 1 month
JBoss Tools SVN: r36648 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-11-25 01:43:32 -0500 (Fri, 25 Nov 2011)
New Revision: 36648
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IJBossBehaviourDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java
Log:
Allowing delegates to participate in stopping even if ignore start / stop is checked.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java 2011-11-25 05:26:11 UTC (rev 36647)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java 2011-11-25 06:43:32 UTC (rev 36648)
@@ -19,6 +19,7 @@
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
+import org.jboss.ide.eclipse.as.core.util.LaunchCommandPreferences;
import org.jboss.ide.eclipse.as.core.util.PollThreadUtils;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
@@ -44,6 +45,16 @@
public void publishFinish(IProgressMonitor monitor) throws CoreException {
}
+ public void stop(boolean force) {
+ if( LaunchCommandPreferences.isIgnoreLaunchCommand(getServer())) {
+ actualBehavior.setServerStopped();
+ return;
+ }
+ stopImpl(force);
+ }
+
+ protected abstract void stopImpl(boolean force);
+
protected abstract void forceStop();
protected abstract IStatus gracefullStop();
@@ -54,6 +65,12 @@
public void onServerStopping() {
}
+ public void onServerStarted() {
+ }
+
+ public void onServerStopped() {
+ }
+
@Override
public IStatus canChangeState(String launchMode) {
return Status.OK_STATUS;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java 2011-11-25 05:26:11 UTC (rev 36647)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java 2011-11-25 06:43:32 UTC (rev 36648)
@@ -48,26 +48,44 @@
super();
}
- public IJBossBehaviourDelegate getDelegate() {
+ public synchronized IJBossBehaviourDelegate getDelegate() {
IJBossServerPublishMethodType type = DeploymentPreferenceLoader.getCurrentDeploymentMethodType(getServer());
String id = type == null ? LocalPublishMethod.LOCAL_PUBLISH_METHOD : type.getId();
if( id.equals(lastModeId) && delegate != null && delegate.getBehaviourTypeId().equals(id))
return delegate;
BehaviourImpl impl = BehaviourModel.getModel().getBehaviour(getServer().getServerType().getId()).getImpl(id);
- delegate = impl.getBehaviourDelegate();
- delegate.setActualBehaviour(this);
+ IJBossBehaviourDelegate d = impl.getBehaviourDelegate();
+ d.setActualBehaviour(this);
+ lastModeId = id;
+ delegate = d;
return delegate;
}
public void stop(boolean force) {
- if( LaunchCommandPreferences.isIgnoreLaunchCommand(getServer())) {
- setServerStopped();
- return;
- }
getDelegate().stop(force);
}
+ @Override
+ public void setServerStarting() {
+ super.setServerStarting();
+ getDelegate().onServerStarting();
+ }
+
+ @Override
+ public void setServerStarted() {
+ super.setServerStarted();
+ getDelegate().onServerStarted();
+ }
+
+ @Override
+ public void setServerStopping() {
+ super.setServerStopping();
+ getDelegate().onServerStopping();
+ }
+
+
+
public void setServerStopped() {
super.setServerStopped();
IModule[] mods = getServer().getModules();
@@ -96,18 +114,6 @@
setMode(mode);
}
- @Override
- public void setServerStarting() {
- super.setServerStarting();
- getDelegate().onServerStarting();
- }
-
- @Override
- public void setServerStopping() {
- super.setServerStopping();
- getDelegate().onServerStopping();
- }
-
protected void publishStart(final IProgressMonitor monitor) throws CoreException {
super.publishStart(monitor);
getDelegate().publishStart(monitor);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java 2011-11-25 05:26:11 UTC (rev 36647)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java 2011-11-25 06:43:32 UTC (rev 36648)
@@ -161,6 +161,7 @@
protected int getServerStateVal() {
return serverStateVal;
}
+
public void setServerStarted() {
serverStateVal = IServer.STATE_STARTED;
setServerState(IServer.STATE_STARTED);
@@ -180,6 +181,7 @@
serverStateVal = IServer.STATE_STOPPING;
setServerState(IServer.STATE_STOPPING);
}
+
protected void initialize(IProgressMonitor monitor) {
serverStateVal = getServer().getServerState();
getServer().addServerListener(new IServerListener() {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IJBossBehaviourDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IJBossBehaviourDelegate.java 2011-11-25 05:26:11 UTC (rev 36647)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IJBossBehaviourDelegate.java 2011-11-25 06:43:32 UTC (rev 36648)
@@ -31,6 +31,10 @@
public void onServerStopping();
+ public void onServerStarted();
+
+ public void onServerStopped();
+
public IStatus canChangeState(String launchMode);
public String getDefaultStopArguments() throws CoreException;
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-11-25 05:26:11 UTC (rev 36647)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2011-11-25 06:43:32 UTC (rev 36648)
@@ -67,7 +67,7 @@
}
@Override
- public void stop(boolean force) {
+ public void stopImpl(boolean force) {
int state = getServer().getServerState();
if (force
|| !isProcessRunning()
13 years, 1 month
JBoss Tools SVN: r36647 - 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: rob.stryker(a)jboss.com
Date: 2011-11-25 00:26:11 -0500 (Fri, 25 Nov 2011)
New Revision: 36647
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java
Log:
JBIDE-9227
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java 2011-11-25 00:00:17 UTC (rev 36646)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java 2011-11-25 05:26:11 UTC (rev 36647)
@@ -28,20 +28,23 @@
public class LocalJBoss7BehaviorDelegate extends LocalJBossBehaviorDelegate {
private IJBoss7ManagerService service;
-
+ private boolean previousStopFailed = false;
+
public IStatus canChangeState(String launchMode) {
return Status.OK_STATUS;
}
@Override
public void stop(boolean force) {
- if (force) {
+ if (force || previousStopFailed) {
forceStop();
+ previousStopFailed = false;
} else {
setServerStopping();
IStatus result = gracefullStop();
if (!result.isOK()) {
- forceStop();
+ previousStopFailed = true;
+ setServerStarted();
}
}
}
13 years, 1 month
JBoss Tools SVN: r36646 - trunk/central/site.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-11-24 19:00:17 -0500 (Thu, 24 Nov 2011)
New Revision: 36646
Modified:
trunk/central/site/site.xml
Log:
tweak site.xml
Modified: trunk/central/site/site.xml
===================================================================
--- trunk/central/site/site.xml 2011-11-25 00:00:09 UTC (rev 36645)
+++ trunk/central/site/site.xml 2011-11-25 00:00:17 UTC (rev 36646)
@@ -6,7 +6,8 @@
<feature url="features/org.jboss.tools.central.feature_0.0.0.jar" id="org.jboss.tools.central.feature" version="0.0.0">
<category name="JBoss Central Nightly Build Update Site"/>
</feature>
- <feature url="features/org.jboss.tools.central.discovery.feature_0.0.0.jar" id="org.jboss.tools.central.discovery.feature" version="0.0.0"/>
+ <feature url="features/org.jboss.tools.central.discovery.feature_0.0.0.jar" id="org.jboss.tools.central.discovery.feature" version="0.0.0">
+ </feature>
<feature url="features/org.jboss.tools.community.central.feature_1.0.0.qualifier.jar" id="org.jboss.tools.community.central.feature" version="1.0.0.qualifier">
<category name="JBoss Central Nightly Build Update Site"/>
</feature>
13 years, 1 month
JBoss Tools SVN: r36645 - trunk/central/features.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-11-24 19:00:09 -0500 (Thu, 24 Nov 2011)
New Revision: 36645
Modified:
trunk/central/features/pom.xml
Log:
fix typo in pom - org.jboss.tools.comunity.central.feature -> org.jboss.tools.community.central.feature
Modified: trunk/central/features/pom.xml
===================================================================
--- trunk/central/features/pom.xml 2011-11-24 23:42:10 UTC (rev 36644)
+++ trunk/central/features/pom.xml 2011-11-25 00:00:09 UTC (rev 36645)
@@ -15,7 +15,7 @@
<modules>
<module>org.jboss.tools.central.feature</module>
<module>org.jboss.tools.central.discovery.feature</module>
- <module>org.jboss.tools.comunity.central.feature</module>
+ <module>org.jboss.tools.community.central.feature</module>
</modules>
</project>
13 years, 1 month
JBoss Tools SVN: r36644 - in trunk/build/aggregate: site and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-11-24 18:42:10 -0500 (Thu, 24 Nov 2011)
New Revision: 36644
Modified:
trunk/build/aggregate/bottests-site/site/pom.xml
trunk/build/aggregate/site/pom.xml
trunk/build/aggregate/site/sources/pom.xml
trunk/build/aggregate/soa-site/pom.xml
Log:
use basedir instead of (optionally) using results/ folder as input
Modified: trunk/build/aggregate/bottests-site/site/pom.xml
===================================================================
--- trunk/build/aggregate/bottests-site/site/pom.xml 2011-11-24 23:39:07 UTC (rev 36643)
+++ trunk/build/aggregate/bottests-site/site/pom.xml 2011-11-24 23:42:10 UTC (rev 36644)
@@ -26,12 +26,8 @@
<quiet>true</quiet>
<tasks>
<!-- called AFTER generating update site + zip to add in extra content -->
- <condition property="output.dir" value="${WORKSPACE}/results"
- else="${basedir}">
- <available file="${WORKSPACE}/results" />
- </condition>
<ant antfile="build.xml" target="basic.build" dir="../../">
- <property name="output.dir" value="${output.dir}" />
+ <property name="output.dir" value="${basedir}" />
<property name="inputRepo"
value="${jbosstools-nightly-staging-composite}" />
<property name="update.site.name" value="JBoss Tools - Bot Tests"/>
Modified: trunk/build/aggregate/site/pom.xml
===================================================================
--- trunk/build/aggregate/site/pom.xml 2011-11-24 23:39:07 UTC (rev 36643)
+++ trunk/build/aggregate/site/pom.xml 2011-11-24 23:42:10 UTC (rev 36644)
@@ -25,12 +25,8 @@
<quiet>true</quiet>
<tasks>
<!-- called AFTER generating update site + zip to add in extra content -->
- <condition property="output.dir" value="${WORKSPACE}/results"
- else="${basedir}">
- <available file="${WORKSPACE}/results" />
- </condition>
<ant antfile="build.xml" target="custom.build" dir="../">
- <property name="output.dir" value="${output.dir}" />
+ <property name="output.dir" value="${basedir}" />
<property name="inputRepo"
value="${jbosstools-nightly-staging-composite}" />
<property name="update.site.name" value="JBoss Tools - Core"/>
Modified: trunk/build/aggregate/site/sources/pom.xml
===================================================================
--- trunk/build/aggregate/site/sources/pom.xml 2011-11-24 23:39:07 UTC (rev 36643)
+++ trunk/build/aggregate/site/sources/pom.xml 2011-11-24 23:42:10 UTC (rev 36644)
@@ -26,12 +26,8 @@
<quiet>true</quiet>
<tasks>
<!-- called AFTER generating update site + zip to add in extra content -->
- <condition property="output.dir" value="${WORKSPACE}/results"
- else="${basedir}">
- <available file="${WORKSPACE}/results" />
- </condition>
<ant antfile="build.xml" target="basic.build" dir="../../">
- <property name="output.dir" value="${output.dir}" />
+ <property name="output.dir" value="${basedir}" />
<property name="inputRepo"
value="${jbosstools-nightly-staging-composite}" />
<property name="update.site.name" value="JBoss Tools - Core Sources"/>
Modified: trunk/build/aggregate/soa-site/pom.xml
===================================================================
--- trunk/build/aggregate/soa-site/pom.xml 2011-11-24 23:39:07 UTC (rev 36643)
+++ trunk/build/aggregate/soa-site/pom.xml 2011-11-24 23:42:10 UTC (rev 36644)
@@ -25,12 +25,8 @@
<quiet>true</quiet>
<tasks>
<!-- called AFTER generating update site + zip to add in extra content -->
- <condition property="output.dir" value="${WORKSPACE}/results"
- else="${basedir}">
- <available file="${WORKSPACE}/results" />
- </condition>
<ant antfile="build.xml" target="custom.build" dir="../">
- <property name="output.dir" value="${output.dir}" />
+ <property name="output.dir" value="${basedir}" />
<property name="inputRepo"
value="${jbosstools-nightly-staging-composite}" />
<property name="update.site.name" value="JBoss Tools - SOA Tooling"/>
13 years, 1 month
JBoss Tools SVN: r36643 - in trunk/build/aggregate/site: sources and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-11-24 18:39:07 -0500 (Thu, 24 Nov 2011)
New Revision: 36643
Modified:
trunk/build/aggregate/site/site.xml
trunk/build/aggregate/site/sources/site.xml
Log:
add new central feature to sources/site.xml too; add note in files to encourage people to commit VALID XML when adding new features
Modified: trunk/build/aggregate/site/site.xml
===================================================================
--- trunk/build/aggregate/site/site.xml 2011-11-24 23:38:58 UTC (rev 36642)
+++ trunk/build/aggregate/site/site.xml 2011-11-24 23:39:07 UTC (rev 36643)
@@ -2,6 +2,13 @@
<site>
<description>JBoss Tools 3.3 Updates</description>
+ <!-- PLEASE NOTE!
+ When updating this file, please be sure that it parses as valid XML before committing it.
+ To test, just run `mvn clean install` in this folder.
+
+ Please also remember to add matching source feature entries to sources/site.xml
+ -->
+
<!-- only in JBDS
<feature url="features/com.jboss.jbds.product.feature_0.0.0.jar" id="com.jboss.jbds.product.feature" version="0.0.0" patch="false">
<category name="AbridgedTools" />
Modified: trunk/build/aggregate/site/sources/site.xml
===================================================================
--- trunk/build/aggregate/site/sources/site.xml 2011-11-24 23:38:58 UTC (rev 36642)
+++ trunk/build/aggregate/site/sources/site.xml 2011-11-24 23:39:07 UTC (rev 36643)
@@ -1,10 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
<description>JBoss Tools 3.3 Sources</description>
+
+ <!-- PLEASE NOTE!
+ When updating this file, please be sure that it parses as valid XML before committing it.
+ To test, just run `mvn clean install` in this folder.
+
+ Please also remember to add matching feature entries to ../site.xml
+ -->
+
+ <!-- only in JBDS
+ <feature url="features/com.jboss.jbds.product.feature_0.0.0.jar" id="com.jboss.jbds.product.feature" version="0.0.0" patch="false">
+ </feature>
+ -->
+
<!--
<feature url="features/org.jboss.tools.central.source.feature_0.0.0.jar" id="org.jboss.tools.central.source.feature" version="0.0.0">
<category name="AllSources"/>
</feature>
+ <feature url="features/org.jboss.tools.community.central.source.feature_0.0.0.jar" id="org.jboss.tools.community.central.source.feature" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
<feature url="features/org.jboss.tools.central.discovery.source.feature_0.0.0.jar" id="org.jboss.tools.central.discovery.source.feature" version="0.0.0">
</feature>
<feature url="features/org.jboss.tools.richfaces.source.feature_0.0.0.jar" id="org.jboss.tools.richfaces.source.feature" version="0.0.0">
@@ -116,15 +132,15 @@
<category name="AllSources" />
</feature>
-->
- <feature url="features/org.jboss.tools.common.all.source.feature_0.0.0.jar" id="org.jboss.tools.common.all.source.feature" version="0.0.0">
- <category name="AllSources" />
- </feature>
<feature url="features/org.jboss.tools.common.jdt.source.feature_0.0.0.jar" id="org.jboss.tools.common.jdt.source.feature" version="0.0.0">
<category name="AllSources" />
</feature>
<feature url="features/org.jboss.tools.common.mylyn.source.feature_0.0.0.jar" id="org.jboss.tools.common.mylyn.source.feature" version="0.0.0">
<category name="AllSources" />
</feature>
+ <feature url="features/org.jboss.tools.common.all.source.feature_0.0.0.jar" id="org.jboss.tools.common.all.source.feature" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
<!--
<feature url="features/org.jboss.tools.runtime.source.feature_0.0.0.jar" id="org.jboss.tools.runtime.source.feature" version="0.0.0">
<category name="AllSources" />
13 years, 1 month
JBoss Tools SVN: r36642 - trunk/build/aggregate/site.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-11-24 18:38:58 -0500 (Thu, 24 Nov 2011)
New Revision: 36642
Modified:
trunk/build/aggregate/site/site.xml
Log:
fix busted-a17409 xml -- missing closing tags FTL
Modified: trunk/build/aggregate/site/site.xml
===================================================================
--- trunk/build/aggregate/site/site.xml 2011-11-24 22:54:40 UTC (rev 36641)
+++ trunk/build/aggregate/site/site.xml 2011-11-24 23:38:58 UTC (rev 36642)
@@ -9,14 +9,15 @@
-->
<feature url="features/org.jboss.tools.central.feature_0.0.0.jar" id="org.jboss.tools.central.feature" version="0.0.0">
- <category name="AbridgedTools"/>
+ <category name="AbridgedTools" />
</feature>
<!-- only in JBT -->
<feature url="features/org.jboss.tools.community.central.feature_0.0.0.jar" id="org.jboss.tools.community.central.feature" version="0.0.0">
- <category name="AbridgedTools"/>
+ <category name="AbridgedTools" />
+ </feature>
<feature url="features/org.jboss.tools.central.discovery.feature_0.0.0.jar" id="org.jboss.tools.central.discovery.feature" version="0.0.0">
</feature>
- <feature url="features/org.jboss.tools.richfaces.feature_0.0.0.jar" id="org.jboss.tools.richfaces.feature" version="0.0.0">
+ <feature url="features/org.jboss.tools.richfaces.feature_0.0.0.jar" id="org.jboss.tools.richfaces.feature" version="0.0.0">
<category name="AbridgedTools" />
<category name="WebTools" />
</feature>
@@ -34,10 +35,12 @@
<category name="WebTools" />
</feature>
<!-- include but do not categorize -->
- <feature url="features/org.jboss.tools.xulrunner.feature_0.0.0.jar" id="org.jboss.tools.xulrunner.feature" version="0.0.0"></feature>
- <feature url="features/org.mozilla.xulrunner.feature_0.0.0.jar" id="org.mozilla.xulrunner.feature" version="0.0.0"></feature>
+ <feature url="features/org.jboss.tools.xulrunner.feature_0.0.0.jar" id="org.jboss.tools.xulrunner.feature" version="0.0.0">
+ </feature>
+ <feature url="features/org.mozilla.xulrunner.feature_0.0.0.jar" id="org.mozilla.xulrunner.feature" version="0.0.0">
+ </feature>
- <feature url="features/org.jboss.tools.seam.feature_0.0.0.jar" id="org.jboss.tools.seam.feature" version="0.0.0">
+ <feature url="features/org.jboss.tools.seam.feature_0.0.0.jar" id="org.jboss.tools.seam.feature" version="0.0.0">
<category name="AbridgedTools" />
<category name="WebTools" />
</feature>
@@ -61,7 +64,7 @@
</feature>
<!-- only in JBT -->
<feature url="features/org.jboss.tools.openshift.express.feature_0.0.0.jar" id="org.jboss.tools.openshift.express.feature" version="0.0.0">
- <category name="AbridgedTools" />
+ <category name="AbridgedTools" />
<category name="CloudTools" />
</feature>
<feature url="features/org.jboss.tools.openshift.egit.integration.feature_0.0.0.jar" id="org.jboss.tools.openshift.egit.integration.feature" version="0.0.0">
@@ -107,7 +110,7 @@
<!-- only in JBT -->
<feature url="features/org.jboss.tools.forge.feature_0.0.0.jar" id="org.jboss.tools.forge.feature" version="0.0.0">
<category name="WebTools" />
- </feature>
+ </feature>
<feature url="features/org.jboss.tools.community.project.examples.feature_0.0.0.jar" id="org.jboss.tools.community.project.examples.feature" version="0.0.0">
<category name="AbridgedTools" />
<category name="GeneralTools" />
@@ -144,7 +147,7 @@
</feature>
<feature url="features/org.jboss.tools.maven.jbosspackaging.feature_0.0.0.jar" id="org.jboss.tools.maven.jbosspackaging.feature" version="0.0.0">
<category name="MavenTools" />
- </feature>
+ </feature>
<feature url="features/org.jboss.tools.maven.project.examples.feature_0.0.0.jar" id="org.jboss.tools.maven.project.examples.feature" version="0.0.0">
<category name="AbridgedTools" />
<category name="MavenTools" />
@@ -163,24 +166,26 @@
<category name="AbridgedTools" />
</feature>
<!-- include but do not categorize -->
- <feature url="features/org.jboss.tools.common.feature_0.0.0.jar" id="org.jboss.tools.common.feature" version="0.0.0"></feature>
- <feature url="features/org.jboss.tools.common.core.feature_0.0.0.jar" id="org.jboss.tools.common.core.feature" version="0.0.0"></feature>
- <feature url="features/org.jboss.tools.common.text.ext.feature_0.0.0.jar" id="org.jboss.tools.common.text.ext.feature" version="0.0.0"></feature>
- <feature url="features/org.jboss.tools.common.ui.feature_0.0.0.jar" id="org.jboss.tools.common.ui.feature" version="0.0.0"></feature>
- <feature url="features/org.jboss.tools.common.verification.feature_0.0.0.jar" id="org.jboss.tools.common.verification.feature" version="0.0.0"></feature>
-
+ <feature url="features/org.jboss.tools.common.feature_0.0.0.jar" id="org.jboss.tools.common.feature" version="0.0.0">
+ </feature>
+ <feature url="features/org.jboss.tools.common.core.feature_0.0.0.jar" id="org.jboss.tools.common.core.feature" version="0.0.0">
+ </feature>
+ <feature url="features/org.jboss.tools.common.text.ext.feature_0.0.0.jar" id="org.jboss.tools.common.text.ext.feature" version="0.0.0">
+ </feature>
+ <feature url="features/org.jboss.tools.common.ui.feature_0.0.0.jar" id="org.jboss.tools.common.ui.feature" version="0.0.0">
+ </feature>
+ <feature url="features/org.jboss.tools.common.verification.feature_0.0.0.jar" id="org.jboss.tools.common.verification.feature" version="0.0.0">
+ </feature>
+
<feature url="features/org.jboss.tools.runtime.feature_0.0.0.jar" id="org.jboss.tools.runtime.feature" version="0.0.0">
<category name="AbridgedTools" />
</feature>
-
<feature url="features/org.jboss.tools.runtime.core.feature_0.0.0.jar" id="org.jboss.tools.runtime.core.feature" version="0.0.0">
<category name="AbridgedTools" />
</feature>
-
<feature url="features/org.jboss.tools.runtime.as.detector.feature_0.0.0.jar" id="org.jboss.tools.runtime.as.detector.feature" version="0.0.0">
<category name="AbridgedTools" />
</feature>
-
<feature url="features/org.jboss.tools.runtime.seam.detector.feature_0.0.0.jar" id="org.jboss.tools.runtime.seam.detector.feature" version="0.0.0">
<category name="AbridgedTools" />
</feature>
13 years, 1 month