Author: rob.stryker(a)jboss.com Date: 2011-07-06 04:01:27 -0400 (Wed, 06 Jul 2011) New Revision: 32631 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/v7/JBoss7ServerBehavior.java Log: JBIDE-9274 - implementing "restart" on the module level for as7 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 2011-07-06 04:43:54 UTC (rev 32630) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java 2011-07-06 08:01:27 UTC (rev 32631) @@ -179,9 +179,8 @@ getOrCreatePublishMethod().getCallbackHandler(depPath.removeLastSegments(1), getServer()).touchResource(new Path(depPath.lastSegment())); } else { // touch the descriptor - IPath deployPath = PublishUtil.getDeployPath(method, module, ds); - IPublishCopyCallbackHandler callback = method.getCallbackHandler(AbstractServerToolsPublisher.getRootPath(deployPath).append(deployPath), getServer()); - JSTPublisherXMLToucher.getInstance().touch(deployPath, module[0], callback); + IPublishCopyCallbackHandler callback = method.getCallbackHandler(AbstractServerToolsPublisher.getRootPath(depPath).append(depPath), getServer()); + JSTPublisherXMLToucher.getInstance().touch(depPath, module[0], callback); } } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-07-06 04:43:54 UTC (rev 32630) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-07-06 08:01:27 UTC (rev 32631) @@ -12,6 +12,7 @@ import java.text.MessageFormat; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -20,6 +21,7 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.debug.core.DebugEvent; @@ -28,16 +30,24 @@ import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.debug.core.model.IProcess; import org.eclipse.wst.server.core.IModule; +import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; import org.jboss.ide.eclipse.as.core.Messages; import org.jboss.ide.eclipse.as.core.extensions.events.IEventCodes; import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger; +import org.jboss.ide.eclipse.as.core.publishers.AbstractServerToolsPublisher; +import org.jboss.ide.eclipse.as.core.publishers.JSTPublisherXMLToucher; import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod; +import org.jboss.ide.eclipse.as.core.publishers.PublishUtil; +import org.jboss.ide.eclipse.as.core.server.IDeployableServer; import org.jboss.ide.eclipse.as.core.server.IJBoss7ManagerService; +import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethod; import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior; import org.jboss.ide.eclipse.as.core.server.internal.PollThread; +import org.jboss.ide.eclipse.as.core.server.xpl.PublishCopyUtil.IPublishCopyCallbackHandler; import org.jboss.ide.eclipse.as.core.util.LaunchCommandPreferences; import org.jboss.ide.eclipse.as.core.util.ServerConverter; +import org.jboss.ide.eclipse.as.wtp.core.util.ServerModelUtilities; public class JBoss7ServerBehavior extends JBossServerBehavior { @@ -93,19 +103,7 @@ @Override protected void publishModule(int kind, int deltaKind, IModule[] module, IProgressMonitor monitor) throws CoreException { -/* fix for JBIDE- -* if (method == null) -* throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "Not publishing")); //$NON-NLS-1$ -* try { -* int result = method.publishModule(this, kind, deltaKind, module, monitor); -* setModulePublishState(module, result); -* } catch(CoreException e) { -* setModulePublishState(module, IServer.PUBLISH_STATE_FULL); -* throw e; -* } -*/ - int result = getOrCreatePublishMethod().publishModule(this, kind, deltaKind, module, monitor); - setModulePublishState(module, result); + super.publishModule(kind, deltaKind, module, monitor); } @Override @@ -123,7 +121,18 @@ monitor.beginTask("Completing Publishes", paths.size() + 1); //$NON-NLS-1$ createDoDeployMarker(paths, monitor); } + + public void restartModule(IModule[] module, IProgressMonitor monitor) throws CoreException { + IDeployableServer ds = ServerConverter.getDeployableServer(getServer()); + if( ds == null ) + return; + IJBossServerPublishMethod method = getOrCreatePublishMethod(); + IPath depPath = PublishUtil.getDeployPath(method, module, ds); + createDoDeployMarker(new IPath[]{depPath}, monitor); + } + + protected IJBoss7ManagerService getService() throws Exception { if (service == null) { service = JBoss7ManagerUtil.getService(getServer()); @@ -230,9 +239,11 @@ } return (List<IPath>) o; } - + private void createDoDeployMarker(IPath[] paths, IProgressMonitor monitor) throws CoreException { + List<IPath> allPaths = Arrays.asList(paths); + createDoDeployMarker(allPaths, monitor); + } private void createDoDeployMarker(List<IPath> paths, IProgressMonitor monitor) throws CoreException { DeploymentMarkerUtils.addDoDeployMarker(getOrCreatePublishMethod(), getServer(), paths, monitor); } - }