[jboss-cvs] jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers ...
Robert Stryker
rawblem at gmail.com
Mon Jan 8 14:47:19 EST 2007
User: rawb
Date: 07/01/08 14:47:19
Modified: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers
PackagesPublisher.java JstPackagesPublisher.java
PathPublisher.java
Log:
Publish events <3
Revision Changes Path
1.5 +2 -2 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PackagesPublisher.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PackagesPublisher.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PackagesPublisher.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- PackagesPublisher.java 22 Dec 2006 23:24:42 -0000 1.4
+++ PackagesPublisher.java 8 Jan 2007 19:47:19 -0000 1.5
@@ -228,8 +228,8 @@
public static class PackagesPublisherMoveEvent extends EventLogTreeItem {
// property names
public static final String PACKAGE_NAME = "PackagesPublisherRemoveEvent.PACKAGE_NAME";
- public static final String MOVE_DESTINATION = "PackagesPublisherRemoveEvent.MOVE_DESTINATION";
- public static final String MOVE_SOURCE = "PackagesPublisherRemoveEvent.MOVE_SOURCE";
+ public static final String MOVE_DESTINATION = "PackagesPublisherMoveEvent.MOVE_DESTINATION";
+ public static final String MOVE_SOURCE = "PackagesPublisherMoveEvent.MOVE_SOURCE";
public static final String EXCEPTION_MESSAGE = "PackagesPublisherRemoveEvent.EXCEPTION_MESSAGE";
1.4 +43 -4 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPackagesPublisher.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: JstPackagesPublisher.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPackagesPublisher.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- JstPackagesPublisher.java 22 Dec 2006 23:24:42 -0000 1.3
+++ JstPackagesPublisher.java 8 Jan 2007 19:47:19 -0000 1.4
@@ -33,7 +33,13 @@
import org.eclipse.wst.server.core.internal.DeletedModule;
import org.eclipse.wst.server.core.model.ServerBehaviourDelegate;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
+import org.jboss.ide.eclipse.as.core.model.EventLogModel;
+import org.jboss.ide.eclipse.as.core.model.EventLogModel.EventLogRoot;
+import org.jboss.ide.eclipse.as.core.model.EventLogModel.EventLogTreeItem;
import org.jboss.ide.eclipse.as.core.packages.ModulePackageTypeConverter;
+import org.jboss.ide.eclipse.as.core.publishers.IJBossServerPublisher.PublishEvent;
+import org.jboss.ide.eclipse.as.core.publishers.PackagesPublisher.PackagesPublisherMoveEvent;
+import org.jboss.ide.eclipse.as.core.publishers.PackagesPublisher.PackagesPublisherRemoveEvent;
import org.jboss.ide.eclipse.as.core.server.attributes.IDeployableServer;
import org.jboss.ide.eclipse.packages.core.model.IPackage;
import org.jboss.ide.eclipse.packages.core.model.PackagesCore;
@@ -45,12 +51,18 @@
*/
public class JstPackagesPublisher implements IJBossServerPublisher {
+ public static final String REMOVE_PACKAGE_SUCCESS = PackagesPublisher.REMOVE_PACKAGE_SUCCESS;
+ public static final String REMOVE_PACKAGE_FAIL = PackagesPublisher.REMOVE_PACKAGE_FAIL;
+ public static final String REMOVE_PACKAGE_SKIPPED = PackagesPublisher.REMOVE_PACKAGE_SKIPPED;
+
private int state;
private IDeployableServer server;
+ private EventLogRoot eventRoot;
public JstPackagesPublisher(IDeployableServer server) {
this.server = server;
state = IServer.PUBLISH_STATE_NONE;
+ eventRoot = EventLogModel.getModel(server.getServer()).getRoot();
}
public int getPublishState() {
return state;
@@ -65,6 +77,8 @@
} 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
publish(server, module, monitor);
+ } else if( ServerBehaviourDelegate.NO_CHANGE != deltaKind && kind == IServer.PUBLISH_INCREMENTAL ){
+ publish(server, module, monitor);
}
}
@@ -72,9 +86,19 @@
IPackage topLevel = createTopPackage(module[0], jbServer.getDeployDirectory(), monitor);
if( topLevel != null ) {
PackagesCore.buildPackage(topLevel, new NullProgressMonitor());
+ addMoveEvent(eventRoot, topLevel, topLevel.isDestinationInWorkspace(),
+ topLevel.getPackageFilePath(), topLevel.getPackageFilePath(), null);
}
return null;
}
+ protected void addMoveEvent(EventLogTreeItem parent, IPackage pack, boolean inWorkspace,
+ IPath sourcePath, IPath destPath, Throwable e) {
+ String specType = PackagesPublisher.MOVE_PACKAGE_SKIP;
+ new PackagesPublisherMoveEvent(parent, specType, pack, sourcePath, destPath, e );
+ EventLogModel.markChanged(parent);
+ }
+
+
protected IStatus[] unpublish(IDeployableServer jbServer, IModule[] module, IProgressMonitor monitor) throws CoreException {
IPackage topLevel = createTopPackage(module[0], jbServer.getDeployDirectory(), monitor);
if( topLevel.isDestinationInWorkspace() ) {
@@ -82,14 +106,29 @@
IPath path = topLevel.getPackageFile().getRawLocation();
IPath p = new Path(deployDir).append(path.lastSegment());
- p.toFile().delete();
+ boolean success = p.toFile().delete();
+ addRemoveEvent(eventRoot, topLevel, p, success ? SUCCESS : FAILURE);
} else {
IPath path = topLevel.getPackageFilePath();
- path.toFile().delete();
+ boolean success = path.toFile().delete();
+ addRemoveEvent(eventRoot, topLevel, path, success ? SUCCESS : FAILURE);
}
-
return null;
}
+ protected void addRemoveEvent(EventLogTreeItem parent, IPackage pack, IPath dest, int success ) {
+ addRemoveEvent(parent, pack, dest, success, null);
+ }
+ protected void addRemoveEvent(EventLogTreeItem parent, IPackage pack, IPath dest, int success, Exception e ) {
+ String specType = null;
+ switch( success ) {
+ case SUCCESS: specType = REMOVE_PACKAGE_SUCCESS; break;
+ case FAILURE: specType = REMOVE_PACKAGE_FAIL; break;
+ case SKIPPED: specType = REMOVE_PACKAGE_SKIPPED; break;
+ }
+ PackagesPublisherRemoveEvent event =
+ new PackagesPublisherRemoveEvent(parent, specType, pack, dest, e);
+ EventLogModel.markChanged(parent);
+ }
protected void checkClosed(IModule[] module) throws CoreException {
for(int i=0;i<module.length;i++) {
1.5 +14 -12 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PathPublisher.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PathPublisher.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PathPublisher.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- PathPublisher.java 4 Jan 2007 22:41:19 -0000 1.4
+++ PathPublisher.java 8 Jan 2007 19:47:19 -0000 1.5
@@ -124,9 +124,9 @@
* Proceed to remove it from the actual server directory.
*/
protected void unPublishModule(IModule[] module, IProgressMonitor monitor) {
- PublishEvent event = new PublishEvent(eventRoot, UNPUBLISH_TOP_EVENT, module[0]);
- EventLogModel.markChanged(eventRoot);
-
+// PublishEvent event = new PublishEvent(eventRoot, UNPUBLISH_TOP_EVENT, module[0]);
+// EventLogModel.markChanged(eventRoot);
+//
Object o;
JBossModuleDelegate delegate;
@@ -146,9 +146,9 @@
try {
File destFile = new File(dest);
boolean result = destFile.delete();
- addUnPublishEvent(module, event, dest, result, null);
+ addUnPublishEvent(module, eventRoot, dest, result, null);
} catch( Exception e ) {
- addUnPublishEvent(module, event, dest, false, e);
+ addUnPublishEvent(module, eventRoot, dest, false, e);
}
}
publishState = IServer.PUBLISH_STATE_NONE;
@@ -156,10 +156,10 @@
protected void publishModule(IModule[] module, IProgressMonitor monitor) {
-
- PublishEvent event = new PublishEvent(eventRoot, PUBLISH_TOP_EVENT, module[0]);
- EventLogModel.markChanged(eventRoot);
-
+//
+// PublishEvent event = new PublishEvent(eventRoot, PUBLISH_TOP_EVENT, module[0]);
+// EventLogModel.markChanged(eventRoot);
+//
JBossModuleDelegate delegate = null;
Object o = null;
String deployDirectory = server.getDeployDirectory();
@@ -180,7 +180,7 @@
Path srcName = new Path(src);
IStatus status = FileUtil.copyFile(src, dest);
- addPublishEvent(module, event, src, dest, status);
+ addPublishEvent(module, eventRoot, src, dest, status);
}
publishState = IServer.PUBLISH_STATE_NONE;
}
@@ -201,8 +201,9 @@
public static final String EXCEPTION = "org.jboss.ide.eclipse.as.core.publishers.PathPublisher.EXCEPTION";
- protected void addPublishEvent(IModule[] module, PublishEvent parent, String src, String dest, IStatus result) {
+ protected void addPublishEvent(IModule[] module, EventLogTreeItem parent, String src, String dest, IStatus result) {
PathPublisherEvent event = new PathPublisherEvent(parent, PUBLISH_EVENT);
+ event.setProperty(IJBossServerPublisher.MODULE_NAME, module[0].getName());
event.setProperty(SOURCE_FILE, src);
event.setProperty(DEST_FILE, dest);
event.setProperty(SUCCESS, new Boolean(result.isOK()).toString());
@@ -212,8 +213,9 @@
EventLogModel.markChanged(parent);
}
- protected void addUnPublishEvent(IModule[] module, PublishEvent parent, String dest, boolean success, Exception e) {
+ protected void addUnPublishEvent(IModule[] module, EventLogTreeItem parent, String dest, boolean success, Exception e) {
PathPublisherEvent event = new PathPublisherEvent(parent, UNPUBLISH_EVENT);
+ event.setProperty(IJBossServerPublisher.MODULE_NAME, module[0].getName());
event.setProperty(DEST_FILE, dest);
event.setProperty(SUCCESS, new Boolean(success).toString());
if( !success && e != null ) {
More information about the jboss-cvs-commits
mailing list