[jbosstools-commits] JBoss Tools SVN: r24251 - in trunk/as/plugins: org.jboss.ide.eclipse.as.rse.core/META-INF and 1 other directories.

Author: rob.stryker(a)jboss.com Date: 2010-08-18 04:01:03 -0400 (Wed, 18 Aug 2010) New Revision: 24251 Added: 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.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/META-INF/MANIFEST.MF 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/RSEPublishMethod.java Log: Critical RSE usability fixes Added: 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 (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java 2010-08-18 08:01:03 UTC (rev 24251) @@ -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 + ******************************************************************************/ +package org.jboss.ide.eclipse.as.core.server.internal; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; +import org.eclipse.wst.server.core.IServer; +import org.jboss.ide.eclipse.as.core.server.IServerStatePoller; +import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior.JBossBehaviourDelegate; + +public abstract class AbstractJBossBehaviourDelegate implements JBossBehaviourDelegate { + + private JBossServerBehavior actualBehavior; + public void setActualBehaviour(JBossServerBehavior actualBehaviour) { + this.actualBehavior = actualBehaviour; + } + + public JBossServerBehavior getActualBehavior() { + return actualBehavior; + } + + public IServer getServer() { + return actualBehavior.getServer(); + } + + public abstract void stop(boolean force); + public abstract void setupLaunchConfiguration( + ILaunchConfigurationWorkingCopy workingCopy, + IProgressMonitor monitor) throws CoreException; + + public void publishStart(IProgressMonitor monitor) throws CoreException { + } + + public void publishFinish(IProgressMonitor monitor) throws CoreException { + } + + public void serverStarting() { + actualBehavior.setServerStarting(); + } + + public void serverStopping() { + actualBehavior.setServerStopping(); + } + + 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/JBossServerBehavior.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java 2010-08-18 07:46:18 UTC (rev 24250) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java 2010-08-18 08:01:03 UTC (rev 24251) @@ -8,16 +8,6 @@ * Contributors: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -/******************************************************************************* - * 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; import java.util.HashMap; @@ -70,6 +60,9 @@ return delegate; Class c = delegateClassMap.get(id); + if( c == null ) + c = delegateClassMap.get(LocalPublishMethod.LOCAL_PUBLISH_METHOD); + try { JBossBehaviourDelegate o = (JBossBehaviourDelegate)c.newInstance(); o.setActualBehaviour(this); 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 2010-08-18 07:46:18 UTC (rev 24250) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2010-08-18 08:01:03 UTC (rev 24251) @@ -57,24 +57,15 @@ * @author Rob Stryker * */ -public class LocalJBossBehaviorDelegate implements JBossBehaviourDelegate, IProcessProvider { +public class LocalJBossBehaviorDelegate extends AbstractJBossBehaviourDelegate implements IProcessProvider { private PollThread pollThread = null; protected IProcess process; protected boolean nextStopRequiresForce = false; - private JBossServerBehavior actualBehavior; public LocalJBossBehaviorDelegate() { super(); } - - public void setActualBehaviour(JBossServerBehavior actualBehaviour) { - this.actualBehavior = actualBehaviour; - } - protected IServer getServer() { - return actualBehavior.getServer(); - } - public void stop(boolean force) { int state = getServer().getServerState(); if( force || process == null || process.isTerminated() || state == IServer.STATE_STOPPED || nextStopRequiresForce) { @@ -95,7 +86,7 @@ boolean success = StopLaunchConfiguration.stop(getServer()); if( !success ) { if( process != null && !process.isTerminated() ) { - actualBehavior.setServerStarted(); + getActualBehavior().setServerStarted(); pollThread.cancel(Messages.STOP_FAILED_MESSAGE); nextStopRequiresForce = true; } @@ -114,7 +105,7 @@ } } process = null; - actualBehavior.setServerStopped(); + getActualBehavior().setServerStopped(); } protected void addForceStopFailedEvent(DebugException e) { @@ -177,7 +168,7 @@ } public void serverStopping() { - actualBehavior.setServerStopping(); + getActualBehavior().setServerStopping(); pollServer(IServerStatePoller.SERVER_DOWN); } @@ -189,7 +180,7 @@ if( this.pollThread != null ) { pollThread.cancel(); } - this.pollThread = new PollThread(Messages.ServerPollerThreadName, expectedState, actualBehavior); + this.pollThread = new PollThread(Messages.ServerPollerThreadName, expectedState, getActualBehavior()); pollThread.start(); } 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 2010-08-18 07:46:18 UTC (rev 24250) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/META-INF/MANIFEST.MF 2010-08-18 08:01:03 UTC (rev 24251) @@ -19,7 +19,8 @@ org.eclipse.wst.common.modulecore, org.eclipse.wst.common.emfworkbench.integration, org.eclipse.jem.util, - org.jboss.ide.eclipse.archives.webtools;resolution:=optional + org.jboss.ide.eclipse.archives.webtools;resolution:=optional, + org.eclipse.debug.core Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: org.jboss.ide.eclipse.as.rse.core Added: 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 (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java 2010-08-18 08:01:03 UTC (rev 24251) @@ -0,0 +1,24 @@ +package org.jboss.ide.eclipse.as.rse.core; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; +import org.jboss.ide.eclipse.as.core.server.internal.AbstractJBossBehaviourDelegate; + +public class RSEBehaviourDelegate extends AbstractJBossBehaviourDelegate { + + @Override + public void stop(boolean force) { + // TODO Auto-generated method stub + + } + + @Override + public void setupLaunchConfiguration( + ILaunchConfigurationWorkingCopy workingCopy, + IProgressMonitor monitor) throws CoreException { + // TODO Auto-generated method stub + + } + +} 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 2010-08-18 07:46:18 UTC (rev 24250) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSECorePlugin.java 2010-08-18 08:01:03 UTC (rev 24251) @@ -1,5 +1,6 @@ package org.jboss.ide.eclipse.as.rse.core; +import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; @@ -17,6 +18,7 @@ */ public void start(BundleContext bundleContext) throws Exception { RSECorePlugin.context = bundleContext; + JBossServerBehavior.addDelegateMapping(RSEPublishMethod.RSE_ID, RSEBehaviourDelegate.class); } /* Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java 2010-08-18 07:46:18 UTC (rev 24250) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java 2010-08-18 08:01:03 UTC (rev 24251) @@ -111,10 +111,11 @@ ssh.files */ protected static List<String> APPROVED_FILE_SYSTEMS = - Arrays.asList(new String[]{ "ftp.files", "local.files", "ssh.files"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + Arrays.asList(new String[]{ "ftp.files", "local.files", "ssh.files", "dstore.files"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ protected IFileServiceSubSystem findFileTransferSubSystem(IHost host) { ISubSystem[] systems = RSECorePlugin.getTheSystemRegistry().getSubSystems(host); for( int i = 0; i < systems.length; i++ ) { + String tmp = systems[i].getConfigurationId(); if( APPROVED_FILE_SYSTEMS.contains(systems[i].getConfigurationId())) return (IFileServiceSubSystem)systems[i]; }