[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 Apr 20 19:45:11 EDT 2007


  User: rawb    
  Date: 07/04/20 19:45:11

  Modified:    as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers   
                        PackagesPublisher.java JstPublisher.java
                        IJBossServerPublisher.java
  Log:
  It Compiles!  Not sure on if it *works* yet
  
  Revision  Changes    Path
  1.14      +6 -7      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.13
  retrieving revision 1.14
  diff -u -b -r1.13 -r1.14
  --- PackagesPublisher.java	19 Mar 2007 22:49:34 -0000	1.13
  +++ PackagesPublisher.java	20 Apr 2007 23:45:11 -0000	1.14
  @@ -32,8 +32,8 @@
   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.archives.core.model.IArchive;
   import org.jboss.ide.eclipse.as.core.ServerConverter;
  -import org.jboss.ide.eclipse.as.core.model.EventLogModel;
   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.publishers.PublisherEventLogger.PublishEvent;
  @@ -41,7 +41,6 @@
   import org.jboss.ide.eclipse.as.core.server.attributes.IDeployableServer;
   import org.jboss.ide.eclipse.as.core.util.FileUtil;
   import org.jboss.ide.eclipse.core.util.ResourceUtil;
  -import org.jboss.ide.eclipse.packages.core.model.IPackage;
   
   /**
    *
  @@ -88,10 +87,10 @@
   	}
   
   	protected void removeModule(IModule module, int kind, int deltaKind, IProgressMonitor monitor) {
  -		IPackage pack = getPackage(module);
  +		IArchive pack = getPackage(module);
   		// remove all of the deployed items
   		PublishEvent event = PublisherEventLogger.createSingleModuleTopEvent(eventRoot, module, kind, deltaKind);
  -		IPath sourcePath = pack.getPackageFilePath();
  +		IPath sourcePath = pack.getArchiveFilePath();
   		IPath destPath = new Path(server.getDeployDirectory()).append(sourcePath.lastSegment());
   		// remove the entire file or folder
   		PublisherFileUtilListener listener = new PublisherFileUtilListener(event);
  @@ -102,8 +101,8 @@
   	
   	protected void publishModule(IModule module, int kind, int deltaKind, int modulePublishState, IProgressMonitor monitor) {
   		PublishEvent event = PublisherEventLogger.createSingleModuleTopEvent(eventRoot, module, kind, deltaKind);
  -		IPackage pack = getPackage(module);
  -		IPath sourcePath = ResourceUtil.makeAbsolute(pack.getPackageFilePath(), pack.isDestinationInWorkspace());
  +		IArchive pack = getPackage(module);
  +		IPath sourcePath = ResourceUtil.makeAbsolute(pack.getArchiveFilePath(), pack.isDestinationInWorkspace());
   		IPath destPathRoot = new Path(server.getDeployDirectory());
   		
   		// if destination is deploy directory... no need to re-copy!
  @@ -161,7 +160,7 @@
   		}
   	}
   	
  -	protected IPackage getPackage(IModule module) {
  +	protected IArchive getPackage(IModule module) {
   		PackagedModuleDelegate delegate = (PackagedModuleDelegate)module.loadAdapter(PackagedModuleDelegate.class, new NullProgressMonitor());
   		return delegate == null ? null : delegate.getPackage();
   	}
  
  
  
  1.5       +11 -12    jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: JstPublisher.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- JstPublisher.java	19 Mar 2007 22:49:34 -0000	1.4
  +++ JstPublisher.java	20 Apr 2007 23:45:11 -0000	1.5
  @@ -31,6 +31,9 @@
   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.archives.core.model.ArchivesCore;
  +import org.jboss.ide.eclipse.archives.core.model.IArchive;
  +import org.jboss.ide.eclipse.archives.core.model.types.IArchiveType;
   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.EventLogTreeItem;
  @@ -39,9 +42,6 @@
   import org.jboss.ide.eclipse.as.core.publishers.PublisherEventLogger.PublisherFileUtilListener;
   import org.jboss.ide.eclipse.as.core.server.attributes.IDeployableServer;
   import org.jboss.ide.eclipse.as.core.util.FileUtil;
  -import org.jboss.ide.eclipse.packages.core.model.IPackage;
  -import org.jboss.ide.eclipse.packages.core.model.PackagesCore;
  -import org.jboss.ide.eclipse.packages.core.model.types.IPackageType;
   
   /**
    *  This class provides a default implementation for 
  @@ -76,11 +76,10 @@
   						int deltaKind, int modulePublishState, IProgressMonitor monitor) throws CoreException {
   		PublishEvent event = PublisherEventLogger.createSingleModuleTopEvent(eventRoot, module, kind, deltaKind);
   		EventLogModel.markChanged(eventRoot);
  -		IPackage topLevel = createTopPackage(module, jbServer.getDeployDirectory(), monitor);
  +		IArchive topLevel = createTopPackage(module, jbServer.getDeployDirectory(), monitor);
   		if( topLevel != null ) {
  -			Throwable t = null;
   			try {
  -				PackagesCore.buildPackage(topLevel, new NullProgressMonitor());
  +				ArchivesCore.buildArchive(topLevel, new NullProgressMonitor());
   			} catch( Exception e ) {
   				return new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, BUILD_FAILED_CODE, "", e);
   			}
  @@ -93,9 +92,9 @@
   	protected IStatus unpublish(IDeployableServer jbServer, IModule module, 
   						int kind, int deltaKind, int modulePublishKind, IProgressMonitor monitor) throws CoreException {
   		PublishEvent event = PublisherEventLogger.createSingleModuleTopEvent(eventRoot, module, kind, deltaKind);
  -		IPackage topLevel = createTopPackage(module, jbServer.getDeployDirectory(), monitor);
  +		IArchive topLevel = createTopPackage(module, jbServer.getDeployDirectory(), monitor);
   		if( topLevel != null ) {
  -			IPath path = topLevel.getPackageFilePath();
  +			IPath path = topLevel.getArchiveFilePath();
   			FileUtil.safeDelete(path.toFile(), new PublisherFileUtilListener(event));
   		} else {
   			return new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, PACKAGE_UNDETERMINED_CODE, "", null);
  @@ -103,11 +102,11 @@
   		return new Status(IStatus.OK, JBossServerCorePlugin.PLUGIN_ID, IStatus.OK, "", null);
   	}
   
  -	protected IPackage createTopPackage(IModule module, String deployDir, IProgressMonitor monitor) {
  -		IPackageType type = ModulePackageTypeConverter.getPackageTypeFor(module);
  +	protected IArchive createTopPackage(IModule module, String deployDir, IProgressMonitor monitor) {
  +		IArchiveType type = ModulePackageTypeConverter.getPackageTypeFor(module);
   		if( type != null ) {
  -    		IPackage topLevel = type.createDefaultConfiguration(module.getProject(), monitor);
  -    		topLevel.setDestinationPath(new Path(deployDir));
  +    		IArchive topLevel = type.createDefaultConfiguration(module.getProject(), monitor);
  +    		topLevel.setDestinationPath(new Path(deployDir), false);
       		return topLevel;
   		} 
   		return null;
  
  
  
  1.5       +0 -2      jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/IJBossServerPublisher.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: IJBossServerPublisher.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/IJBossServerPublisher.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- IJBossServerPublisher.java	19 Mar 2007 22:49:34 -0000	1.4
  +++ IJBossServerPublisher.java	20 Apr 2007 23:45:11 -0000	1.5
  @@ -24,8 +24,6 @@
   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.model.EventLogModel.EventLogTreeItem;
  -import org.jboss.ide.eclipse.as.core.util.SimpleTreeItem;
   
   public interface IJBossServerPublisher {
   	public void publishModule(int kind, int deltaKind, int modulePublishState,
  
  
  



More information about the jboss-cvs-commits mailing list