JBoss Tools SVN: r32720 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-07 12:53:35 -0400 (Thu, 07 Jul 2011)
New Revision: 32720
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.classpath
Log:
JBIDE-9289
https://issues.jboss.org/browse/JBIDE-9289
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.classpath
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.classpath 2011-07-07 15:42:24 UTC (rev 32719)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.classpath 2011-07-07 16:53:35 UTC (rev 32720)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_21">
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<attributes>
<attribute name="owner.project.facets" value="java"/>
</attributes>
14 years, 9 months
JBoss Tools SVN: r32719 - 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-07 11:42:24 -0400 (Thu, 07 Jul 2011)
New Revision: 32719
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java
Log:
[JBIDE-9215] renamed RSELaunchDelegate to RSEJBossStartLaunchDelegate (to match local variants: LocalJBossStartLaunchDelegate etc.). Kept the old RSELaunchDelegate class and deprecated it
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-07-07 15:26:21 UTC (rev 32718)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java 2011-07-07 15:42:24 UTC (rev 32719)
@@ -43,6 +43,9 @@
import org.jboss.ide.eclipse.as.core.util.ServerUtil;
import org.jboss.ide.eclipse.as.rse.core.RSEHostShellModel.ServerShellModel;
+/**
+ * @deprecated replaced by {@link RSEJBossStartLaunchDelegate}
+ */
@Deprecated
public class RSELaunchDelegate extends AbstractRSELaunchDelegate {
public void actualLaunch(
14 years, 9 months
JBoss Tools SVN: r32718 - in trunk/as/plugins: org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-07 11:26:21 -0400 (Thu, 07 Jul 2011)
New Revision: 32718
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBossStartLaunchDelegate.java
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/RSELaunchConfigProperties.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.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSELaunchTabProvider.java
Log:
[JBIDE-9215] renamed RSELaunchDelegate to RSEJBossStartLaunchDelegate (to match local variants: LocalJBossStartLaunchDelegate etc.). Kept the old RSELaunchDelegate class and deprecated it
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-07 14:29:38 UTC (rev 32717)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSECorePlugin.java 2011-07-07 15:26:21 UTC (rev 32718)
@@ -33,8 +33,8 @@
public void start(BundleContext bundleContext) throws Exception {
RSECorePlugin.context = bundleContext;
DelegatingServerBehavior.addDelegateMapping(RSEPublishMethod.RSE_ID, RSEBehaviourDelegate.class);
- DelegatingStartLaunchConfiguration.addLaunchDelegateMapping(RSEPublishMethod.RSE_ID, new RSELaunchDelegate());
- DelegatingStartLaunchConfiguration.addSetupLaunchParticipant(new RSELaunchDelegate());
+ DelegatingStartLaunchConfiguration.addLaunchDelegateMapping(RSEPublishMethod.RSE_ID, new RSEJBossStartLaunchDelegate());
+ DelegatingStartLaunchConfiguration.addSetupLaunchParticipant(new RSEJBossStartLaunchDelegate());
}
/*
Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBossStartLaunchDelegate.java (from rev 32717, 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/RSEJBossStartLaunchDelegate.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBossStartLaunchDelegate.java 2011-07-07 15:26:21 UTC (rev 32718)
@@ -0,0 +1,221 @@
+/*******************************************************************************
+ * 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.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
+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.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.extensions.events.ServerLogger;
+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.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.rse.core.RSEHostShellModel.ServerShellModel;
+
+public class RSEJBossStartLaunchDelegate 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
+ RSEHostShellModel.delay(30000);
+ beh.setServerStarted();
+ }
+
+ /**
+ *
+ * @deprecated
+ * This was called from {@link RSEBehaviourDelegate#stop(boolean)
+ * WTP keeps launching in launch configs and stopping in
+ * the server behavior. We should not change that and offer
+ * stopping-functionalities in launch delegates.
+ *
+ * @param behaviour
+ */
+ @Deprecated
+ public static void launchStopServerCommand(DelegatingServerBehavior behaviour) {
+ if (LaunchCommandPreferences.isIgnoreLaunchCommand(behaviour.getServer())) {
+ behaviour.setServerStopping();
+ behaviour.setServerStopped();
+ return;
+ }
+ ILaunchConfiguration config = null;
+ String command2 = "";
+ try {
+ config = behaviour.getServer().getLaunchConfiguration(false, new NullProgressMonitor());
+ /*
+ * ATTENTION: this was commented since #getDefaultStopCommand is not static any more
+ * String defaultCmd = getDefaultStopCommand(behaviour.getServer(), true);
+ */
+
+ /*
+ * This was added to make it compile
+ */
+ String defaultCmd = "";
+
+
+ command2 = config == null ? defaultCmd :
+ RSELaunchConfigProperties.getShutdownCommand(config, defaultCmd);
+ behaviour.setServerStopping();
+ ServerShellModel model = RSEHostShellModel.getInstance().getModel(behaviour.getServer());
+ model.executeRemoteCommand("/", command2, new String[] {}, new NullProgressMonitor(), 10000, true);
+ if (model.getStartupShell() != null && model.getStartupShell().isActive())
+ model.getStartupShell().writeToShell("exit");
+ behaviour.setServerStopped();
+ } catch (CoreException ce) {
+ behaviour.setServerStarted();
+ ServerLogger.getDefault().log(behaviour.getServer(), ce.getStatus());
+ }
+ }
+
+ public boolean preLaunchCheck(ILaunchConfiguration configuration,
+ String mode, IProgressMonitor monitor) throws CoreException {
+ // ping if up
+ final DelegatingServerBehavior beh = JBossServerBehaviorUtils.getServerBehavior(configuration);
+ // TODO: use configured polelr
+ boolean started = WebPortPoller.onePing(beh.getServer());
+ if (started) {
+ beh.setServerStarting();
+ beh.setServerStarted();
+ return false;
+ }
+ return true;
+ }
+
+ 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;
+ }
+
+ @Deprecated
+ public static IServer findServer(ILaunchConfiguration config) throws CoreException {
+ String serverId = config.getAttribute("server-id", (String) null);
+ 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();
+ }
+
+ 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;
+ }
+}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchConfigProperties.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchConfigProperties.java 2011-07-07 14:29:38 UTC (rev 32717)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchConfigProperties.java 2011-07-07 15:26:21 UTC (rev 32718)
@@ -19,12 +19,12 @@
*/
public class RSELaunchConfigProperties {
- public static final String RSE_DEFAULT_STARTUP_COMMAND = "org.jboss.ide.eclipse.as.rse.core.RSELaunchDelegate.DEFAULT_STARTUP_COMMAND";
- public static final String RSE_STARTUP_COMMAND = "org.jboss.ide.eclipse.as.rse.core.RSELaunchDelegate.STARTUP_COMMAND";
- public static final String RSE_DEFAULT_SHUTDOWN_COMMAND = "org.jboss.ide.eclipse.as.rse.core.RSELaunchDelegate.DEFAULT_SHUTDOWN_COMMAND";
- public static final String RSE_SHUTDOWN_COMMAND = "org.jboss.ide.eclipse.as.rse.core.RSELaunchDelegate.SHUTDOWN_COMMAND";
- public static final String DETECT_STARTUP_COMMAND = "org.jboss.ide.eclipse.as.rse.core.RSELaunchDelegate.DETECT_STARTUP_COMMAND";
- public static final String DETECT_SHUTDOWN_COMMAND = "org.jboss.ide.eclipse.as.rse.core.RSELaunchDelegate.DETECT_SHUTDOWN_COMMAND";
+ public static final String RSE_DEFAULT_STARTUP_COMMAND = "org.jboss.ide.eclipse.as.rse.core.RSEJBossStartLaunchDelegate.DEFAULT_STARTUP_COMMAND";
+ public static final String RSE_STARTUP_COMMAND = "org.jboss.ide.eclipse.as.rse.core.RSEJBossStartLaunchDelegate.STARTUP_COMMAND";
+ public static final String RSE_DEFAULT_SHUTDOWN_COMMAND = "org.jboss.ide.eclipse.as.rse.core.RSEJBossStartLaunchDelegate.DEFAULT_SHUTDOWN_COMMAND";
+ public static final String RSE_SHUTDOWN_COMMAND = "org.jboss.ide.eclipse.as.rse.core.RSEJBossStartLaunchDelegate.SHUTDOWN_COMMAND";
+ public static final String DETECT_STARTUP_COMMAND = "org.jboss.ide.eclipse.as.rse.core.RSEJBossStartLaunchDelegate.DETECT_STARTUP_COMMAND";
+ public static final String DETECT_SHUTDOWN_COMMAND = "org.jboss.ide.eclipse.as.rse.core.RSEJBossStartLaunchDelegate.DETECT_SHUTDOWN_COMMAND";
public static boolean isDetectStartupCommand(ILaunchConfiguration launchConfig) throws CoreException {
return isDetectStartupCommand(launchConfig, true);
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-07-07 14:29:38 UTC (rev 32717)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java 2011-07-07 15:26:21 UTC (rev 32718)
@@ -43,6 +43,7 @@
import org.jboss.ide.eclipse.as.core.util.ServerUtil;
import org.jboss.ide.eclipse.as.rse.core.RSEHostShellModel.ServerShellModel;
+@Deprecated
public class RSELaunchDelegate extends AbstractRSELaunchDelegate {
public void actualLaunch(
DelegatingStartLaunchConfiguration launchConfig,
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSELaunchTabProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSELaunchTabProvider.java 2011-07-07 14:29:38 UTC (rev 32717)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSELaunchTabProvider.java 2011-07-07 15:26:21 UTC (rev 32718)
@@ -101,7 +101,7 @@
if( autoStartArgs.getSelection()) {
String command = null;
try {
-// command = RSELaunchDelegate.getDefaultLaunchCommand(initialConfig);
+// command = RSEJBossStartLaunchDelegate.getDefaultLaunchCommand(initialConfig);
command = RSELaunchConfigProperties.getDefaultStartupCommand(initialConfig, "");
startText.setText(command);
} catch(CoreException ce) {
14 years, 9 months
JBoss Tools SVN: r32717 - 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-07 10:29:38 -0400 (Thu, 07 Jul 2011)
New Revision: 32717
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSELaunchDelegate.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java
Log:
[JBIDE-9215] added abstract super class for RSELaunchDelegate
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSELaunchDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSELaunchDelegate.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSELaunchDelegate.java 2011-07-07 14:29:38 UTC (rev 32717)
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * 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.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
+import org.eclipse.rse.services.shells.IHostOutput;
+import org.eclipse.rse.services.shells.IHostShell;
+import org.eclipse.rse.services.shells.IHostShellChangeEvent;
+import org.eclipse.rse.services.shells.IHostShellOutputListener;
+import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
+import org.jboss.ide.eclipse.as.core.server.internal.launch.DelegatingStartLaunchConfiguration.IStartLaunchSetupParticipant;
+import org.jboss.ide.eclipse.as.core.server.internal.launch.IStartLaunchDelegate;
+import org.jboss.ide.eclipse.as.rse.core.RSEHostShellModel.ServerShellModel;
+
+public abstract class AbstractRSELaunchDelegate implements IStartLaunchDelegate, IStartLaunchSetupParticipant {
+
+ protected void executeRemoteCommand(String command, DelegatingServerBehavior behavior)
+ throws CoreException {
+ try {
+ ServerShellModel model = RSEHostShellModel.getInstance().getModel(behavior.getServer());
+ IHostShell shell = model.createStartupShell("/", command, new String[] {}, new NullProgressMonitor());
+ addShellOutputListener(shell);
+ } catch (SystemMessageException sme) {
+ behavior.setServerStopped(); // Not sure when this comes, but we should
+ // try to keep track
+ throw new CoreException(new Status(IStatus.ERROR,
+ org.jboss.ide.eclipse.as.rse.core.RSECorePlugin.PLUGIN_ID,
+ sme.getMessage(), sme));
+ }
+ }
+
+ // Only for debugging
+ private void addShellOutputListener(IHostShell shell) {
+ IHostShellOutputListener listener = null;
+ listener = new IHostShellOutputListener() {
+ public void shellOutputChanged(IHostShellChangeEvent event) {
+ IHostOutput[] out = event.getLines();
+ for (int i = 0; i < out.length; i++) {
+ // TODO listen here for obvious exceptions or failures
+ // System.out.println(out[i]);
+ }
+ }
+ };
+ // shell.addOutputListener(listener);
+ }
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSELaunchDelegate.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
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-07-07 13:48:32 UTC (rev 32716)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java 2011-07-07 14:29:38 UTC (rev 32717)
@@ -23,11 +23,6 @@
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
import org.eclipse.osgi.util.NLS;
-import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
-import org.eclipse.rse.services.shells.IHostOutput;
-import org.eclipse.rse.services.shells.IHostShell;
-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;
@@ -38,8 +33,6 @@
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.DelegatingStartLaunchConfiguration.IStartLaunchSetupParticipant;
-import org.jboss.ide.eclipse.as.core.server.internal.launch.IStartLaunchDelegate;
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;
@@ -50,8 +43,7 @@
import org.jboss.ide.eclipse.as.core.util.ServerUtil;
import org.jboss.ide.eclipse.as.rse.core.RSEHostShellModel.ServerShellModel;
-public class RSELaunchDelegate implements IStartLaunchDelegate, IStartLaunchSetupParticipant {
-
+public class RSELaunchDelegate extends AbstractRSELaunchDelegate {
public void actualLaunch(
DelegatingStartLaunchConfiguration launchConfig,
ILaunchConfiguration configuration, String mode, ILaunch launch,
@@ -62,43 +54,17 @@
beh.setServerStarted();
return;
}
-
String command = RSELaunchConfigProperties.getStartupCommand(configuration);
- try {
- ServerShellModel model = RSEHostShellModel.getInstance().getModel(beh.getServer());
- IHostShell shell = model.createStartupShell("/", command, new String[] {}, new NullProgressMonitor());
- addShellOutputListener(shell);
- launchPingThread(beh);
- } catch (SystemMessageException sme) {
- beh.setServerStopped(); // Not sure when this comes, but we should
- // try to keep track
- throw new CoreException(new Status(IStatus.ERROR,
- org.jboss.ide.eclipse.as.rse.core.RSECorePlugin.PLUGIN_ID,
- sme.getMessage(), sme));
- }
+ executeRemoteCommand(command, beh);
+ launchPingThread(beh);
}
-
+
private void launchPingThread(DeployableServerBehavior beh) {
// TODO do it properly here
RSEHostShellModel.delay(30000);
beh.setServerStarted();
}
- // Only for debugging
- private void addShellOutputListener(IHostShell shell) {
- IHostShellOutputListener listener = null;
- listener = new IHostShellOutputListener() {
- public void shellOutputChanged(IHostShellChangeEvent event) {
- IHostOutput[] out = event.getLines();
- for (int i = 0; i < out.length; i++) {
- // TODO listen here for obvious exceptions or failures
- // System.out.println(out[i]);
- }
- }
- };
- // shell.addOutputListener(listener);
- }
-
/**
*
* @deprecated
@@ -149,6 +115,7 @@
String mode, IProgressMonitor monitor) throws CoreException {
// ping if up
final DelegatingServerBehavior beh = JBossServerBehaviorUtils.getServerBehavior(configuration);
+ // TODO: use configured polelr
boolean started = WebPortPoller.onePing(beh.getServer());
if (started) {
beh.setServerStarting();
14 years, 9 months
JBoss Tools SVN: r32715 - in trunk/forge/plugins/org.jboss.tools.forge.ui: META-INF and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-07-07 09:47:40 -0400 (Thu, 07 Jul 2011)
New Revision: 32715
Added:
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/ForgeUIPlugin.java
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/action/
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/action/StartDelegate.java
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/action/StopDelegate.java
Removed:
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ForgeUIPlugin.java
Modified:
trunk/forge/plugins/org.jboss.tools.forge.ui/META-INF/MANIFEST.MF
trunk/forge/plugins/org.jboss.tools.forge.ui/plugin.xml
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/CommandRecorder.java
Log:
rename org.jboss.tools.forge.action into org.jboss.tools.forge.ui.action
move ForgeUIPlugin to package org.jboss.tools.forge.ui
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/META-INF/MANIFEST.MF 2011-07-07 13:44:17 UTC (rev 32714)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/META-INF/MANIFEST.MF 2011-07-07 13:47:40 UTC (rev 32715)
@@ -18,5 +18,5 @@
org.jboss.tools.forge.core;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
-Bundle-Activator: org.jboss.tools.forge.ForgeUIPlugin
+Bundle-Activator: org.jboss.tools.forge.ui.ForgeUIPlugin
Bundle-ClassPath: .
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/plugin.xml
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/plugin.xml 2011-07-07 13:44:17 UTC (rev 32714)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/plugin.xml 2011-07-07 13:47:40 UTC (rev 32715)
@@ -25,7 +25,7 @@
label="Forge">
</menu>
<action
- class="org.jboss.tools.forge.action.StopDelegate"
+ class="org.jboss.tools.forge.ui.action.StopDelegate"
icon="icons/stop.gif"
id="org.jboss.tools.forge.stop"
label="Stop Forge"
@@ -34,7 +34,7 @@
toolbarPath="org.jboss.tools.forge.toolbar">
</action>
<action
- class="org.jboss.tools.forge.action.StartDelegate"
+ class="org.jboss.tools.forge.ui.action.StartDelegate"
icon="icons/start.gif"
id="org.jboss.tools.forge.start"
label="Start Forge"
@@ -47,13 +47,13 @@
<extension point="org.eclipse.ui.preferencePages">
<page
name="Forge"
- class="org.jboss.tools.forge.preferences.ForgeEmptyPreferencePage"
+ class="org.jboss.tools.forge.ui.preferences.ForgeEmptyPreferencePage"
id="org.jboss.tools.forge">
</page>
<page
name="Installed Forge Runtimes"
category="org.jboss.tools.forge"
- class="org.jboss.tools.forge.preferences.ForgeInstallationsPreferencePage"
+ class="org.jboss.tools.forge.ui.preferences.ForgeInstallationsPreferencePage"
id="org.jboss.tools.forge.runtimes">
</page>
</extension>
Deleted: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ForgeUIPlugin.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ForgeUIPlugin.java 2011-07-07 13:44:17 UTC (rev 32714)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ForgeUIPlugin.java 2011-07-07 13:47:40 UTC (rev 32715)
@@ -1,36 +0,0 @@
-package org.jboss.tools.forge;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-public class ForgeUIPlugin extends AbstractUIPlugin {
-
- public static final String PLUGIN_ID = "org.jboss.tools.forge.ui";
-
- private static ForgeUIPlugin plugin;
-
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- public static ForgeUIPlugin getDefault() {
- return plugin;
- }
-
- public static void log(Throwable t) {
- getDefault().getLog().log(newErrorStatus("Error logged from Forge Plugin: ", t));
- }
-
- private static IStatus newErrorStatus(String message, Throwable exception) {
- return new Status(IStatus.ERROR, PLUGIN_ID, IStatus.INFO, message, exception);
- }
-
-}
Copied: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/ForgeUIPlugin.java (from rev 32704, trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ForgeUIPlugin.java)
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/ForgeUIPlugin.java (rev 0)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/ForgeUIPlugin.java 2011-07-07 13:47:40 UTC (rev 32715)
@@ -0,0 +1,36 @@
+package org.jboss.tools.forge.ui;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+public class ForgeUIPlugin extends AbstractUIPlugin {
+
+ public static final String PLUGIN_ID = "org.jboss.tools.forge.ui";
+
+ private static ForgeUIPlugin plugin;
+
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+ plugin = this;
+ }
+
+ public void stop(BundleContext context) throws Exception {
+ plugin = null;
+ super.stop(context);
+ }
+
+ public static ForgeUIPlugin getDefault() {
+ return plugin;
+ }
+
+ public static void log(Throwable t) {
+ getDefault().getLog().log(newErrorStatus("Error logged from Forge Plugin: ", t));
+ }
+
+ private static IStatus newErrorStatus(String message, Throwable exception) {
+ return new Status(IStatus.ERROR, PLUGIN_ID, IStatus.INFO, message, exception);
+ }
+
+}
Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/action/StartDelegate.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/action/StartDelegate.java (rev 0)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/action/StartDelegate.java 2011-07-07 13:47:40 UTC (rev 32715)
@@ -0,0 +1,28 @@
+package org.jboss.tools.forge.ui.action;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.ui.IViewActionDelegate;
+import org.eclipse.ui.IViewPart;
+import org.jboss.tools.forge.ui.part.ConsoleView;
+
+public class StartDelegate implements IViewActionDelegate {
+
+ @Override
+ public void run(IAction action) {
+ ConsoleView.INSTANCE.startForge();
+ }
+
+ @Override
+ public void selectionChanged(IAction action, ISelection selection) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void init(IViewPart view) {
+ // TODO Auto-generated method stub
+
+ }
+
+}
Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/action/StopDelegate.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/action/StopDelegate.java (rev 0)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/action/StopDelegate.java 2011-07-07 13:47:40 UTC (rev 32715)
@@ -0,0 +1,28 @@
+package org.jboss.tools.forge.ui.action;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.ui.IViewActionDelegate;
+import org.eclipse.ui.IViewPart;
+import org.jboss.tools.forge.ui.part.ConsoleView;
+
+public class StopDelegate implements IViewActionDelegate {
+
+ @Override
+ public void run(IAction action) {
+ ConsoleView.INSTANCE.stopForge();
+ }
+
+ @Override
+ public void selectionChanged(IAction action, ISelection selection) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void init(IViewPart view) {
+ // TODO Auto-generated method stub
+
+ }
+
+}
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/CommandRecorder.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/CommandRecorder.java 2011-07-07 13:44:17 UTC (rev 32714)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/CommandRecorder.java 2011-07-07 13:47:40 UTC (rev 32715)
@@ -24,9 +24,9 @@
import org.eclipse.ui.ide.IDE;
import org.eclipse.ui.part.ISetSelectionTarget;
import org.eclipse.ui.texteditor.ITextEditor;
-import org.jboss.tools.forge.ForgeUIPlugin;
import org.jboss.tools.forge.importer.ProjectConfigurationUpdater;
import org.jboss.tools.forge.importer.ProjectImporter;
+import org.jboss.tools.forge.ui.ForgeUIPlugin;
public class CommandRecorder implements IDocumentListener {
14 years, 9 months
JBoss Tools SVN: r32714 - in trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge: ui and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-07-07 09:44:17 -0400 (Thu, 07 Jul 2011)
New Revision: 32714
Added:
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/preferences/
Removed:
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/preferences/
Modified:
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/preferences/ForgeEmptyPreferencePage.java
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/preferences/ForgeInstallationDialog.java
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/preferences/ForgeInstallationLabelProvider.java
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/preferences/ForgeInstallationsPreferencePage.java
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/preferences/ForgeIntallationLabelProvider.java
Log:
rename org.jboss.tools.forge.preferences into org.jboss.tools.forge.ui.preferences
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/preferences/ForgeEmptyPreferencePage.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/preferences/ForgeEmptyPreferencePage.java 2011-07-07 13:01:44 UTC (rev 32704)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/preferences/ForgeEmptyPreferencePage.java 2011-07-07 13:44:17 UTC (rev 32714)
@@ -1,4 +1,4 @@
-package org.jboss.tools.forge.preferences;
+package org.jboss.tools.forge.ui.preferences;
import org.eclipse.jface.preference.PreferencePage;
import org.eclipse.swt.SWT;
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/preferences/ForgeInstallationDialog.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/preferences/ForgeInstallationDialog.java 2011-07-07 13:01:44 UTC (rev 32704)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/preferences/ForgeInstallationDialog.java 2011-07-07 13:44:17 UTC (rev 32714)
@@ -1,4 +1,4 @@
-package org.jboss.tools.forge.preferences;
+package org.jboss.tools.forge.ui.preferences;
import org.eclipse.jface.dialogs.Dialog;
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/preferences/ForgeInstallationLabelProvider.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/preferences/ForgeInstallationLabelProvider.java 2011-07-07 13:01:44 UTC (rev 32704)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/preferences/ForgeInstallationLabelProvider.java 2011-07-07 13:44:17 UTC (rev 32714)
@@ -1,4 +1,4 @@
-package org.jboss.tools.forge.preferences;
+package org.jboss.tools.forge.ui.preferences;
import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.viewers.LabelProvider;
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/preferences/ForgeInstallationsPreferencePage.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/preferences/ForgeInstallationsPreferencePage.java 2011-07-07 13:01:44 UTC (rev 32704)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/preferences/ForgeInstallationsPreferencePage.java 2011-07-07 13:44:17 UTC (rev 32714)
@@ -1,4 +1,4 @@
-package org.jboss.tools.forge.preferences;
+package org.jboss.tools.forge.ui.preferences;
import java.util.ArrayList;
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/preferences/ForgeIntallationLabelProvider.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/preferences/ForgeIntallationLabelProvider.java 2011-07-07 13:01:44 UTC (rev 32704)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/preferences/ForgeIntallationLabelProvider.java 2011-07-07 13:44:17 UTC (rev 32714)
@@ -1,4 +1,4 @@
-package org.jboss.tools.forge.preferences;
+package org.jboss.tools.forge.ui.preferences;
import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.viewers.LabelProvider;
14 years, 9 months
JBoss Tools SVN: r32711 - in trunk/forge: plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-07-07 09:41:29 -0400 (Thu, 07 Jul 2011)
New Revision: 32711
Modified:
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/old/ConsolePartition.java
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/old/ConsolePartitioner.java
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/Console.java
trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntimeTest.java
Log:
move ConsoleInputStream to org.jboss.tools.forge.core.io
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/old/ConsolePartition.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/old/ConsolePartition.java 2011-07-07 13:39:54 UTC (rev 32710)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/old/ConsolePartition.java 2011-07-07 13:41:29 UTC (rev 32711)
@@ -5,7 +5,7 @@
import org.eclipse.jface.text.ITypedRegion;
import org.eclipse.swt.custom.StyleRange;
import org.eclipse.ui.console.ConsolePlugin;
-import org.jboss.tools.forge.console.ConsoleInputStream;
+import org.jboss.tools.forge.core.io.ConsoleInputStream;
public class ConsolePartition implements ITypedRegion {
public static final String OUTPUT_PARTITION_TYPE = ConsolePlugin.getUniqueIdentifier() + ".io_console_output_partition_type"; //$NON-NLS-1$
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/old/ConsolePartitioner.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/old/ConsolePartitioner.java 2011-07-07 13:39:54 UTC (rev 32710)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/old/ConsolePartitioner.java 2011-07-07 13:41:29 UTC (rev 32711)
@@ -25,7 +25,7 @@
import org.eclipse.ui.console.IConsoleDocumentPartitioner;
import org.eclipse.ui.progress.UIJob;
import org.eclipse.ui.progress.WorkbenchJob;
-import org.jboss.tools.forge.console.ConsoleInputStream;
+import org.jboss.tools.forge.core.io.ConsoleInputStream;
import org.jboss.tools.forge.ui.console.Console;
/**
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/Console.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/Console.java 2011-07-07 13:39:54 UTC (rev 32710)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/Console.java 2011-07-07 13:41:29 UTC (rev 32711)
@@ -15,7 +15,7 @@
import org.eclipse.ui.console.IConsoleView;
import org.eclipse.ui.console.TextConsole;
import org.eclipse.ui.part.IPageBookViewPage;
-import org.jboss.tools.forge.console.ConsoleInputStream;
+import org.jboss.tools.forge.core.io.ConsoleInputStream;
import org.jboss.tools.forge.core.io.ForgeInputReadJob;
public class Console extends TextConsole implements IDebugEventSetListener {
Modified: trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntimeTest.java
===================================================================
--- trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntimeTest.java 2011-07-07 13:39:54 UTC (rev 32710)
+++ trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntimeTest.java 2011-07-07 13:41:29 UTC (rev 32711)
@@ -25,7 +25,7 @@
public class ForgeAbstractRuntimeTest {
- private ForgeRuntime runtime;
+ private ForgeAbstractRuntime runtime;
private Set<String> calledMethods;
private List<PropertyChangeEvent> propertyChangeEvents;
private PropertyChangeListener propertyChangeListener;
14 years, 9 months