Author: rob.stryker(a)jboss.com Date: 2009-08-26 15:23:44 -0400 (Wed, 26 Aug 2009) New Revision: 17282 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/LocalPublishMethod.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerPublishMethod.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/schema/publishMethod.exsd Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/NullPublisher.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerPublisher.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/plugin.xml trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ModuleActionProvider.java Log: Preparing for multiple publish types Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java 2009-08-26 19:21:00 UTC (rev 17281) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java 2009-08-26 19:23:44 UTC (rev 17282) @@ -58,8 +58,8 @@ return IServer.PUBLISH_STATE_NONE; } - public boolean accepts(IServer server, IModule[] module) { - if( module != null && module.length > 0 + public boolean accepts(String method, IServer server, IModule[] module) { + if( "local".equals(method) && module != null && module.length > 0 //$NON-NLS-1$ && PackageModuleFactory.MODULE_TYPE.equals(module[0].getModuleType().getId())) return true; return false; Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java 2009-08-26 19:21:00 UTC (rev 17281) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java 2009-08-26 19:23:44 UTC (rev 17282) @@ -37,9 +37,10 @@ public class WTPZippedPublisher extends PublishUtil implements IJBossServerPublisher { private int moduleState = IServer.PUBLISH_STATE_NONE; - public boolean accepts(IServer server, IModule[] module) { + public boolean accepts(String method, IServer server, IModule[] module) { // TODO check for zip preference - return ModuleCoreNature.isFlexibleProject(module[0].getProject()); + return "local".equals(method) && //$NON-NLS-1$ + ModuleCoreNature.isFlexibleProject(module[0].getProject()); } public int getPublishState() { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java 2009-08-26 19:21:00 UTC (rev 17281) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java 2009-08-26 19:23:44 UTC (rev 17282) @@ -140,14 +140,14 @@ } - public IJBossServerPublisher getPublisher(IServer server, IModule[] module) { + public IJBossServerPublisher getPublisher(IServer server, IModule[] module, String deployMethod) { if( publishers == null ) loadPublishers(); Iterator<PublisherWrapper> i = publishers.iterator(); PublisherWrapper wrapper; while(i.hasNext()) { wrapper = i.next(); - if( wrapper.publisher.accepts(server, module)) + if( wrapper.publisher.accepts(deployMethod, server, module)) return wrapper.getNewInstance(); } return null; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2009-08-26 19:21:00 UTC (rev 17281) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2009-08-26 19:23:44 UTC (rev 17282) @@ -319,7 +319,8 @@ } } } - public boolean accepts(IServer server, IModule[] module) { - return ModuleCoreNature.isFlexibleProject(module[0].getProject()); + public boolean accepts(String type, IServer server, IModule[] module) { + return "local".equals(type) && //$NON-NLS-1$ + ModuleCoreNature.isFlexibleProject(module[0].getProject()); } } Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/LocalPublishMethod.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/LocalPublishMethod.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/LocalPublishMethod.java 2009-08-26 19:23:44 UTC (rev 17282) @@ -0,0 +1,77 @@ +package org.jboss.ide.eclipse.as.core.publishers; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.wst.server.core.IModule; +import org.eclipse.wst.server.core.IServer; +import org.eclipse.wst.server.core.model.IModuleResourceDelta; +import org.eclipse.wst.server.core.model.ServerBehaviourDelegate; +import org.jboss.ide.eclipse.as.core.ExtensionManager; +import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger; +import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethod; +import org.jboss.ide.eclipse.as.core.server.IJBossServerPublisher; +import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior; + +public class LocalPublishMethod implements IJBossServerPublishMethod { + + public boolean accepts(String methodType) { + return "local".equals(methodType); //$NON-NLS-1$ + } + + public void publishStart(DeployableServerBehavior behaviour, + IProgressMonitor monitor) throws CoreException { + } + + public int publishFinish(DeployableServerBehavior behaviour, + IProgressMonitor monitor) throws CoreException { + IModule[] modules = behaviour.getServer().getModules(); + boolean allpublished= true; + for (int i = 0; i < modules.length; i++) { + if(behaviour.getServer().getModulePublishState(new IModule[]{modules[i]})!=IServer.PUBLISH_STATE_NONE) + allpublished=false; + } + return allpublished ? IServer.PUBLISH_STATE_NONE : IServer.PUBLISH_STATE_INCREMENTAL; + } + + public int getServerPublishState(DeployableServerBehavior behaviour) { + IModule[] modules = behaviour.getServer().getModules(); + boolean allpublished= true; + for (int i = 0; i < modules.length; i++) { + if(behaviour.getServer().getModulePublishState(new IModule[]{modules[i]})!=IServer.PUBLISH_STATE_NONE) + allpublished=false; + } + if(allpublished) + return IServer.PUBLISH_STATE_NONE; + return IServer.PUBLISH_STATE_INCREMENTAL; + } + + public int publishModule(DeployableServerBehavior behaviour, int kind, + int deltaKind, IModule[] module, IProgressMonitor monitor) + throws CoreException { + // kind = [incremental, full, auto, clean] = [1,2,3,4] + // delta = [no_change, added, changed, removed] = [0,1,2,3] + if( module.length == 0 ) return IServer.PUBLISH_STATE_NONE; + int modulePublishState = behaviour.getServer().getModulePublishState(module); + int publishType = behaviour.getPublishType(kind, deltaKind, modulePublishState); + IJBossServerPublisher publisher; + + // Let the publisher decide what to do + if( module.length > 0 ) { + publisher = ExtensionManager.getDefault().getPublisher(behaviour.getServer(), module, "local"); //$NON-NLS-1$ + IModuleResourceDelta[] deltas = new IModuleResourceDelta[]{}; + if( deltaKind != ServerBehaviourDelegate.REMOVED) + deltas = behaviour.getPublishedResourceDelta(module); + if( publisher != null ) { + IStatus result = publisher.publishModule(behaviour.getServer(), module, + publishType, deltas, monitor); + if( result != null ) + ServerLogger.getDefault().log(behaviour.getServer(), result); + return publisher.getPublishState(); + } + return IServer.PUBLISH_STATE_INCREMENTAL; + } + return IServer.PUBLISH_STATE_NONE; + } + +} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/NullPublisher.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/NullPublisher.java 2009-08-26 19:21:00 UTC (rev 17281) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/NullPublisher.java 2009-08-26 19:23:44 UTC (rev 17282) @@ -31,7 +31,7 @@ public int getPublishState() { return IServer.PUBLISH_STATE_NONE; } - public boolean accepts(IServer server, IModule[] module) { + public boolean accepts(String method, IServer server, IModule[] module) { return true; } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java 2009-08-26 19:21:00 UTC (rev 17281) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java 2009-08-26 19:23:44 UTC (rev 17282) @@ -46,8 +46,8 @@ return publishState; } - public boolean accepts(IServer server, IModule[] module) { - if( module != null && module.length > 0 + public boolean accepts(String method, IServer server, IModule[] module) { + if( "local".equals(method) && module != null && module.length > 0 //$NON-NLS-1$ && module[module.length-1] != null && module[module.length-1].getModuleType().getId().equals(SingleDeployableFactory.MODULE_TYPE)) return true; Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerPublishMethod.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerPublishMethod.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerPublishMethod.java 2009-08-26 19:23:44 UTC (rev 17282) @@ -0,0 +1,13 @@ +package org.jboss.ide.eclipse.as.core.server; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.wst.server.core.IModule; +import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior; + +public interface IJBossServerPublishMethod { + public boolean accepts(String methodType); + public void publishStart(DeployableServerBehavior behaviour, IProgressMonitor monitor) throws CoreException; + public int publishFinish(DeployableServerBehavior behaviour, IProgressMonitor monitor) throws CoreException; + public int publishModule(DeployableServerBehavior behaviour, int kind, int deltaKind, IModule[] module, IProgressMonitor monitor) throws CoreException; +} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerPublisher.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerPublisher.java 2009-08-26 19:21:00 UTC (rev 17281) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerPublisher.java 2009-08-26 19:23:44 UTC (rev 17282) @@ -30,12 +30,9 @@ // pre-publish - public boolean accepts(IServer server, IModule[] module); - - - public IStatus publishModule(IServer server, IModule[] module, - int publishType, IModuleResourceDelta[] delta, IProgressMonitor monitor) throws CoreException; - + public boolean accepts(String method, IServer server, IModule[] module); // post publish public int getPublishState(); + public IStatus publishModule(IServer server, IModule[] module, + int publishType, IModuleResourceDelta[] delta, IProgressMonitor monitor) throws CoreException; } 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 2009-08-26 19:21:00 UTC (rev 17281) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java 2009-08-26 19:23:44 UTC (rev 17282) @@ -14,7 +14,6 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.server.core.IServer; @@ -22,8 +21,8 @@ import org.eclipse.wst.server.core.ServerEvent; import org.eclipse.wst.server.core.model.IModuleResourceDelta; import org.eclipse.wst.server.core.model.ServerBehaviourDelegate; -import org.jboss.ide.eclipse.as.core.ExtensionManager; -import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger; +import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod; +import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethod; import org.jboss.ide.eclipse.as.core.server.IJBossServerPublisher; import org.jboss.ide.eclipse.as.core.server.internal.launch.DeployableLaunchConfiguration; @@ -41,59 +40,31 @@ } protected void publishStart(IProgressMonitor monitor) throws CoreException { + IJBossServerPublishMethod method = getPublishMethod(); + method.publishStart(this, monitor); } protected void publishFinish(IProgressMonitor monitor) throws CoreException { - IModule[] modules = this.getServer().getModules(); - boolean allpublished= true; - for (int i = 0; i < modules.length; i++) { - if(this.getServer().getModulePublishState(new IModule[]{modules[i]})!=IServer.PUBLISH_STATE_NONE) - allpublished=false; - } - if(allpublished) - setServerPublishState(IServer.PUBLISH_STATE_NONE); + IJBossServerPublishMethod method = getPublishMethod(); + int result = method.publishFinish(this, monitor); + setServerPublishState(result); } - - /* - * The module is a list of module trail points, from parent to child - * Thus: - * {ear, war} for the war portion, {ear, ejb} for the ejb portion - * - * (non-Javadoc) - * @see org.eclipse.wst.server.core.model.ServerBehaviourDelegate#publishModule(int, int, org.eclipse.wst.server.core.IModule[], org.eclipse.core.runtime.IProgressMonitor) - */ protected void publishModule(int kind, int deltaKind, IModule[] module, IProgressMonitor monitor) throws CoreException { - // kind = [incremental, full, auto, clean] = [1,2,3,4] - // delta = [no_change, added, changed, removed] = [0,1,2,3] - if( module.length == 0 ) return; - int modulePublishState = getServer().getModulePublishState(module); - int publishType = getPublishType(kind, deltaKind, modulePublishState); - IJBossServerPublisher publisher; - - // Let the publisher decide what to do - if( module.length > 0 ) { - publisher = ExtensionManager.getDefault().getPublisher(getServer(), module); - IModuleResourceDelta[] deltas = new IModuleResourceDelta[]{}; - if( deltaKind != ServerBehaviourDelegate.REMOVED) - deltas = getPublishedResourceDelta(module); - if( publisher != null ) { - try { - IStatus result = publisher.publishModule(getServer(), module, - publishType, deltas, monitor); - if( result != null ) - ServerLogger.getDefault().log(getServer(), result); - } catch( CoreException ce ) { - throw ce; - } finally { - setModulePublishState(module, publisher.getPublishState()); - } - } - } + IJBossServerPublishMethod method = getPublishMethod(); + int result = method.publishModule(this, kind, deltaKind, module, monitor); + setModulePublishState(module, result); } + protected IJBossServerPublishMethod getPublishMethod() { + return new LocalPublishMethod(); // TODO FIX THIS + } - protected int getPublishType(int kind, int deltaKind, int modulePublishState) { + public IModuleResourceDelta[] getPublishedResourceDelta(IModule[] module) { + return super.getPublishedResourceDelta(module); + } + + public int getPublishType(int kind, int deltaKind, int modulePublishState) { if (ServerBehaviourDelegate.REMOVED == deltaKind) { return IJBossServerPublisher.REMOVE_PUBLISH; } else if (kind == IServer.PUBLISH_FULL || modulePublishState == IServer.PUBLISH_STATE_FULL || kind == IServer.PUBLISH_CLEAN ) { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2009-08-26 19:21:00 UTC (rev 17281) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2009-08-26 19:23:44 UTC (rev 17282) @@ -5,6 +5,7 @@ <extension-point id="pollers" name="org.jboss.ide.eclipse.as.core.runtime.server.pollers" schema="schema/pollers.exsd"/> <extension-point id="pollerFailureHandler" name="org.jboss.ide.eclipse.as.core.runtime.server.pollerFailureHandler" schema="schema/pollerFailureHandler.exsd"/> <extension-point id="publishers" name="org.jboss.ide.eclipse.as.core.publishers" schema="schema/publishers.exsd"/> + <extension-point id="publishMethod" name="org.jboss.ide.eclipse.as.core.publishMethod" schema="schema/publishMethod.exsd"/> <extension point="org.eclipse.wst.server.core.serverTypes"> Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/schema/publishMethod.exsd =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/schema/publishMethod.exsd (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/schema/publishMethod.exsd 2009-08-26 19:23:44 UTC (rev 17282) @@ -0,0 +1,102 @@ +<?xml version='1.0' encoding='UTF-8'?> +<!-- Schema file written by PDE --> +<schema targetNamespace="org.jboss.ide.eclipse.as.core" xmlns="http://www.w3.org/2001/XMLSchema"> +<annotation> + <appInfo> + <meta.schema plugin="org.jboss.ide.eclipse.as.core" id="publishMethod" name="org.jboss.ide.eclipse.as.core.publishMethod"/> + </appInfo> + <documentation> + [Enter description of this extension point.] + </documentation> + </annotation> + + <element name="extension"> + <annotation> + <appInfo> + <meta.element /> + </appInfo> + </annotation> + <complexType> + <sequence minOccurs="1" maxOccurs="unbounded"> + <element ref="publishMethod" minOccurs="1" maxOccurs="unbounded"/> + </sequence> + <attribute name="point" type="string" use="required"> + <annotation> + <documentation> + + </documentation> + </annotation> + </attribute> + <attribute name="id" type="string"> + <annotation> + <documentation> + + </documentation> + </annotation> + </attribute> + <attribute name="name" type="string"> + <annotation> + <documentation> + + </documentation> + <appInfo> + <meta.attribute translatable="true"/> + </appInfo> + </annotation> + </attribute> + </complexType> + </element> + + <element name="publishMethod"> + <complexType> + <attribute name="class" type="string" use="required"> + <annotation> + <documentation> + + </documentation> + <appInfo> + <meta.attribute kind="java" basedOn=":org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethod"/> + </appInfo> + </annotation> + </attribute> + </complexType> + </element> + + <annotation> + <appInfo> + <meta.section type="since"/> + </appInfo> + <documentation> + [Enter the first release in which this extension point appears.] + </documentation> + </annotation> + + <annotation> + <appInfo> + <meta.section type="examples"/> + </appInfo> + <documentation> + [Enter extension point usage example here.] + </documentation> + </annotation> + + <annotation> + <appInfo> + <meta.section type="apiinfo"/> + </appInfo> + <documentation> + [Enter API information here.] + </documentation> + </annotation> + + <annotation> + <appInfo> + <meta.section type="implementation"/> + </appInfo> + <documentation> + [Enter information about supplied implementation of this extension point.] + </documentation> + </annotation> + + +</schema> Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ModuleActionProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ModuleActionProvider.java 2009-08-26 19:21:00 UTC (rev 17281) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ModuleActionProvider.java 2009-08-26 19:23:44 UTC (rev 17282) @@ -194,7 +194,7 @@ ModuleServer ms = selection[0]; IModule[] module = ms.module; IJBossServerPublisher publisher = ExtensionManager.getDefault() - .getPublisher(ms.getServer(), module); + .getPublisher(ms.getServer(), module, "local"); IPath path = null; IDeployableServer deployableServer = ServerConverter .getDeployableServer(ms.server);