[jboss-cvs] jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers ...
Robert Stryker
rob.stryker at jboss.com
Fri Feb 23 16:57:32 EST 2007
User: rawb
Date: 07/02/23 16:57:32
Modified: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers
PackagesPublisher.java
Log:
Revision Changes Path
1.8 +35 -64 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.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- PackagesPublisher.java 15 Feb 2007 14:52:03 -0000 1.7
+++ PackagesPublisher.java 23 Feb 2007 21:57:32 -0000 1.8
@@ -31,19 +31,17 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Preferences;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServer;
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.module.PackageModuleFactory.PackagedModuleDelegate;
import org.jboss.ide.eclipse.as.core.server.attributes.IDeployableServer;
import org.jboss.ide.eclipse.as.core.util.FileUtil;
import org.jboss.ide.eclipse.as.core.util.SimpleTreeItem;
import org.jboss.ide.eclipse.packages.core.model.IPackage;
-import org.jboss.ide.eclipse.packages.core.model.IPackagesBuildListener;
import org.jboss.ide.eclipse.packages.core.model.PackagesCore;
/**
@@ -103,7 +101,6 @@
publishModule(false, module, monitor);
return;
}
-
}
protected void removeModule(IModule[] module, IProgressMonitor monitor) {
@@ -111,35 +108,30 @@
// remove all of the deployed items
PublishEvent event = new PublishEvent(eventRoot, REMOVE_TOP_EVENT, module[0]);
EventLogModel.markChanged(eventRoot);
-
- String projectName = module[0].getName();
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- if( project.exists() ) {
- IPackage[] packages = PackagesCore.getProjectPackages(project, new NullProgressMonitor());
- for( int i = 0; i < packages.length; i++ ) {
-
+ for( int i = 0; i < module.length; i++ ) {
+ PackagedModuleDelegate delegate = (PackagedModuleDelegate)module[i].loadAdapter(PackagedModuleDelegate.class, new NullProgressMonitor());
+ IPackage pack = delegate.getPackage();
try {
- if( packages[i].isDestinationInWorkspace()) {
- IFile file = packages[i].getPackageFile();
+ if( pack.isDestinationInWorkspace()) {
+ IFile file = pack.getPackageFile();
IPath sourcePath = file.getLocation();
IPath destPath = new Path(server.getDeployDirectory()).append(sourcePath.lastSegment());
boolean success = destPath.toFile().delete();
- addRemoveEvent(event, packages[i], destPath, success ? SUCCESS : FAILURE);
+ addRemoveEvent(event, pack, destPath, success ? SUCCESS : FAILURE);
} else {
- IPath path = packages[i].getPackageFilePath();
+ IPath path = pack.getPackageFilePath();
Path deployDir = new Path(server.getDeployDirectory());
if( path.toOSString().startsWith(deployDir.toOSString())) {
boolean success = path.toFile().delete();
- addRemoveEvent(event, packages[i], path, success ? SUCCESS : FAILURE);
+ addRemoveEvent(event, pack, path, success ? SUCCESS : FAILURE);
} else {
- addRemoveEvent(event, packages[i], path, SKIPPED, null);
+ addRemoveEvent(event, pack, path, SKIPPED, null);
}
}
} catch( Exception e ) {
- IPath dest = packages[i].getPackageFile().getLocation();
- addRemoveEvent(event, packages[i], dest, FAILURE, e);
- }
+ IPath dest = pack.getPackageFile().getLocation();
+ addRemoveEvent(event, pack, dest, FAILURE, e);
}
}
}
@@ -149,34 +141,22 @@
protected void publishModule(boolean incremental, IModule[] module, IProgressMonitor monitor) {
PublishEvent event = new PublishEvent(eventRoot, PUBLISH_TOP_EVENT, module[0]);
EventLogModel.markChanged(eventRoot);
-
- int inc2 = incremental ? IncrementalProjectBuilder.INCREMENTAL_BUILD : IncrementalProjectBuilder.FULL_BUILD;
- String projectName = module[0].getName();
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- try {
- addBuildEvent(event, project, inc2);
- PackagesCore.buildProject(project, inc2, monitor);
- IPackage[] packages = PackagesCore.getProjectPackages(project, new NullProgressMonitor());
- for( int i = 0; i < packages.length; i++ ) {
- if( packages[i].isDestinationInWorkspace()) {
+ for( int i = 0; i < module.length; i++ ) {
+ PackagedModuleDelegate delegate = (PackagedModuleDelegate)module[i].loadAdapter(PackagedModuleDelegate.class, new NullProgressMonitor());
+ IPackage pack = delegate.getPackage();
+ if( pack.isDestinationInWorkspace()) {
// destination is workspace. Move it.
- IFile file = packages[i].getPackageFile();
+ IFile file = pack.getPackageFile();
IPath sourcePath = file.getLocation();
IPath destPath = new Path(server.getDeployDirectory()).append(sourcePath.lastSegment());
IStatus status = FileUtil.copyFile(sourcePath.toFile(), destPath.toFile());
- addMoveEvent(event, packages[i], packages[i].isDestinationInWorkspace(), sourcePath, destPath, status.isOK() ? SUCCESS : FAILURE, status.getException());
+ addMoveEvent(event, pack, pack.isDestinationInWorkspace(), sourcePath, destPath, status.isOK() ? SUCCESS : FAILURE, status.getException());
} else {
- IPath sourcePath = packages[i].getPackageFilePath();
- addMoveEvent(event, packages[i], packages[i].isDestinationInWorkspace(), sourcePath, sourcePath, SUCCESS, null);
- }
- }
- }catch( Exception ce ) {
- ce.printStackTrace();
+
+ IPath sourcePath = pack.getPackageFilePath();
+ addMoveEvent(event, pack, pack.isDestinationInWorkspace(), sourcePath, sourcePath, SUCCESS, null);
}
}
-
- protected void addBuildEvent(PublishEvent parent, IProject project, int incremental ) {
- EventLogModel.markChanged(parent);
}
protected void addMoveEvent(PublishEvent parent, IPackage pack, boolean inWorkspace,
IPath sourcePath, IPath destPath, int success, Throwable e) {
@@ -241,13 +221,4 @@
setProperty(EXCEPTION_MESSAGE, e.getLocalizedMessage());
}
}
- public static class PackagesPublisherBuildEvent extends EventLogTreeItem {
- // property names
- public static final String BUILD_TYPE = "PackagesPublisherRemoveEvent.BUILD_TYPE";
-
- public PackagesPublisherBuildEvent(SimpleTreeItem parent, String specificType, int type) {
- super(parent, PUBLISH_MAJOR_TYPE, specificType);
- setProperty(BUILD_TYPE, new Integer(type));
- }
- }
}
More information about the jboss-cvs-commits
mailing list