Author: rob.stryker(a)jboss.com Date: 2007-09-11 01:09:17 -0400 (Tue, 11 Sep 2007) New Revision: 3530 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java Removed: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/singledeployable/SingleFilePublisher.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/DeployableServerBehavior.java Log: Moved the SingleFilePublisher into the publishers directory. Moving to a cleaner API which can be opened up logically and more easily extended. Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java (from rev 3525, trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/singledeployable/SingleFilePublisher.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java 2007-09-11 05:09:17 UTC (rev 3530) @@ -0,0 +1,75 @@ +package org.jboss.ide.eclipse.as.core.publishers; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +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.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.server.attributes.IDeployableServer; +import org.jboss.ide.eclipse.as.core.singledeployable.SingleDeployableFactory; +import org.jboss.ide.eclipse.as.core.singledeployable.SingleDeployableFactory.SingleDeployableModuleDelegate; +import org.jboss.ide.eclipse.as.core.util.FileUtil; +import org.jboss.ide.eclipse.as.core.util.ServerConverter; + +public class SingleFilePublisher implements IJBossServerPublisher { + + private IDeployableServer server; + public SingleFilePublisher(IServer server) { + this.server = ServerConverter.getDeployableServer(server); + } + + public int getPublishState() { + return IServer.PUBLISH_STATE_NONE; + } + + public IStatus publishModule(int kind, int deltaKind, + int modulePublishState, IModule module, IProgressMonitor monitor) + throws CoreException { + + + IStatus status = null; + if(ServerBehaviourDelegate.REMOVED == deltaKind){ + status = unpublish(server, module, kind, deltaKind, modulePublishState, monitor); + } else if( ServerBehaviourDelegate.NO_CHANGE != deltaKind || kind == IServer.PUBLISH_FULL || kind == IServer.PUBLISH_CLEAN ){ + // if there's no change, do nothing. Otherwise, on change or add, re-publish + status = publish(server, module, kind, deltaKind, modulePublishState, monitor); + } else if( ServerBehaviourDelegate.NO_CHANGE != deltaKind && kind == IServer.PUBLISH_INCREMENTAL ){ + status = publish(server, module, kind, deltaKind, modulePublishState, monitor); + } + return status; + + } + + protected IStatus publish(IDeployableServer server, IModule module, int kind, int deltaKind, int modulePublishState, IProgressMonitor monitor) { + // COPY THE FILE HERE!!! + SingleDeployableModuleDelegate delegate = (SingleDeployableModuleDelegate)module.loadAdapter(SingleDeployableModuleDelegate.class, new NullProgressMonitor()); + if( delegate != null ) { + IPath sourcePath = delegate.getGlobalSourcePath(); + IPath destFolder = new Path(server.getDeployDirectory()); + FileUtil.fileSafeCopy(sourcePath.toFile(), destFolder.append(sourcePath.lastSegment()).toFile()); + } + + return null; + } + + protected IStatus unpublish(IDeployableServer server, IModule module, int kind, int deltaKind, int modulePublishState, IProgressMonitor monitor) { + // delete file + SingleDeployableModuleDelegate delegate = (SingleDeployableModuleDelegate)module.loadAdapter(SingleDeployableModuleDelegate.class, new NullProgressMonitor()); + if( delegate != null ) { + IPath sourcePath = delegate.getGlobalSourcePath(); + IPath destFolder = new Path(server.getDeployDirectory()); + FileUtil.safeDelete(destFolder.append(sourcePath.lastSegment()).toFile()); + } + + return null; + } + public void setDelta(IModuleResourceDelta[] delta) { + // ignore delta + } + +} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/DeployableServerBehavior.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/DeployableServerBehavior.java 2007-09-11 05:07:14 UTC (rev 3529) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/DeployableServerBehavior.java 2007-09-11 05:09:17 UTC (rev 3530) @@ -25,8 +25,8 @@ import org.jboss.ide.eclipse.as.core.publishers.NullPublisher; import org.jboss.ide.eclipse.as.core.publishers.PackagesPublisher; import org.jboss.ide.eclipse.as.core.publishers.PublisherEventLogger; +import org.jboss.ide.eclipse.as.core.publishers.SingleFilePublisher; import org.jboss.ide.eclipse.as.core.server.internal.launch.DeployableLaunchConfiguration; -import org.jboss.ide.eclipse.as.core.singledeployable.SingleFilePublisher; public class DeployableServerBehavior extends ServerBehaviourDelegate { Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/singledeployable/SingleFilePublisher.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/singledeployable/SingleFilePublisher.java 2007-09-11 05:07:14 UTC (rev 3529) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/singledeployable/SingleFilePublisher.java 2007-09-11 05:09:17 UTC (rev 3530) @@ -1,75 +0,0 @@ -package org.jboss.ide.eclipse.as.core.singledeployable; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -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.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.publishers.IJBossServerPublisher; -import org.jboss.ide.eclipse.as.core.server.attributes.IDeployableServer; -import org.jboss.ide.eclipse.as.core.singledeployable.SingleDeployableFactory.SingleDeployableModuleDelegate; -import org.jboss.ide.eclipse.as.core.util.FileUtil; -import org.jboss.ide.eclipse.as.core.util.ServerConverter; - -public class SingleFilePublisher implements IJBossServerPublisher { - - private IDeployableServer server; - public SingleFilePublisher(IServer server) { - this.server = ServerConverter.getDeployableServer(server); - } - - public int getPublishState() { - return IServer.PUBLISH_STATE_NONE; - } - - public IStatus publishModule(int kind, int deltaKind, - int modulePublishState, IModule module, IProgressMonitor monitor) - throws CoreException { - - - IStatus status = null; - if(ServerBehaviourDelegate.REMOVED == deltaKind){ - status = unpublish(server, module, kind, deltaKind, modulePublishState, monitor); - } else if( ServerBehaviourDelegate.NO_CHANGE != deltaKind || kind == IServer.PUBLISH_FULL || kind == IServer.PUBLISH_CLEAN ){ - // if there's no change, do nothing. Otherwise, on change or add, re-publish - status = publish(server, module, kind, deltaKind, modulePublishState, monitor); - } else if( ServerBehaviourDelegate.NO_CHANGE != deltaKind && kind == IServer.PUBLISH_INCREMENTAL ){ - status = publish(server, module, kind, deltaKind, modulePublishState, monitor); - } - return status; - - } - - protected IStatus publish(IDeployableServer server, IModule module, int kind, int deltaKind, int modulePublishState, IProgressMonitor monitor) { - // COPY THE FILE HERE!!! - SingleDeployableModuleDelegate delegate = (SingleDeployableModuleDelegate)module.loadAdapter(SingleDeployableModuleDelegate.class, new NullProgressMonitor()); - if( delegate != null ) { - IPath sourcePath = delegate.getGlobalSourcePath(); - IPath destFolder = new Path(server.getDeployDirectory()); - FileUtil.fileSafeCopy(sourcePath.toFile(), destFolder.append(sourcePath.lastSegment()).toFile()); - } - - return null; - } - - protected IStatus unpublish(IDeployableServer server, IModule module, int kind, int deltaKind, int modulePublishState, IProgressMonitor monitor) { - // delete file - SingleDeployableModuleDelegate delegate = (SingleDeployableModuleDelegate)module.loadAdapter(SingleDeployableModuleDelegate.class, new NullProgressMonitor()); - if( delegate != null ) { - IPath sourcePath = delegate.getGlobalSourcePath(); - IPath destFolder = new Path(server.getDeployDirectory()); - FileUtil.safeDelete(destFolder.append(sourcePath.lastSegment()).toFile()); - } - - return null; - } - public void setDelta(IModuleResourceDelta[] delta) { - // ignore delta - } - -}