[jboss-cvs] jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server ...

[Robert Stryker]

  User: rawb    
  Date: 06/11/28 12:31:02

  Modified:    as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server 
                        JBossServerBehavior.java
  Log:
  First attempt to get package publisher to work. (There are lots of debugging output changes which are meaningless)
  
  Revision  Changes    Path
  1.15      +31 -12    jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/JBossServerBehavior.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: JBossServerBehavior.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/JBossServerBehavior.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- JBossServerBehavior.java	15 Nov 2006 22:26:55 -0000	1.14
  +++ JBossServerBehavior.java	28 Nov 2006 17:31:01 -0000	1.15
  @@ -21,6 +21,8 @@
    */
   package org.jboss.ide.eclipse.as.core.server;
   
  +import org.eclipse.core.internal.resources.WorkspaceRoot;
  +import org.eclipse.core.resources.ResourcesPlugin;
   import org.eclipse.core.runtime.CoreException;
   import org.eclipse.core.runtime.IProgressMonitor;
   import org.eclipse.core.runtime.NullProgressMonitor;
  @@ -43,12 +45,14 @@
   import org.jboss.ide.eclipse.as.core.publishers.IJBossServerPublisher;
   import org.jboss.ide.eclipse.as.core.publishers.JstPublisher;
   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.PathPublisher;
   import org.jboss.ide.eclipse.as.core.runtime.server.IServerStatePoller;
   import org.jboss.ide.eclipse.as.core.runtime.server.polling.PollThread;
   import org.jboss.ide.eclipse.as.core.runtime.server.polling.TwiddlePoller;
   import org.jboss.ide.eclipse.as.core.runtime.server.polling.TwiddlePoller.TwiddlePollerEvent;
   import org.jboss.ide.eclipse.as.core.util.SimpleTreeItem;
  +import org.jboss.ide.eclipse.packages.core.model.PackagesCore;
   
   public class JBossServerBehavior extends ServerBehaviourDelegate {
   	public static final String LAUNCH_CONFIG_DEFAULT_CLASSPATH = "__JBOSS_SERVER_BEHAVIOR_LAUNCH_CONFIG_DEFAULT_CLASSPATH__";
  @@ -157,30 +161,38 @@
   
   		System.out.print("publishing module: ");
   		switch( kind ) {
  -			case 1: System.out.print("incremental, "); break;
  -			case 2: System.out.print("full, "); break;
  -			case 3: System.out.print("auto, "); break;
  -			case 4: System.out.print("clean, "); break;
  +			case IServer.PUBLISH_INCREMENTAL: System.out.print("incremental, "); break;
  +			case IServer.PUBLISH_FULL: System.out.print("full, "); break;
  +			case IServer.PUBLISH_AUTO: System.out.print("auto, "); break;
  +			case IServer.PUBLISH_CLEAN: System.out.print("clean, "); break;
   		}
   		switch( deltaKind ) {
  -			case 0: System.out.print("no change"); break;
  -			case 1: System.out.print("added"); break;
  -			case 2: System.out.print("changed"); break;
  -			case 3: System.out.print("removed"); break;
  +			case ServerBehaviourDelegate.NO_CHANGE: System.out.print("no change"); break;
  +			case ServerBehaviourDelegate.ADDED: System.out.print("added"); break;
  +			case ServerBehaviourDelegate.CHANGED: System.out.print("changed"); break;
  +			case ServerBehaviourDelegate.REMOVED: System.out.print("removed"); break;
   		}
   		System.out.println("");
   		
   		if( module.length == 0 ) return;
  -
   		IJBossServerPublisher publisher;
   
  +		int newDeltaKind = -1;
  +		switch( getServer().getModulePublishState(module)) {
  +		case IServer.PUBLISH_STATE_FULL:
  +			newDeltaKind = IServer.PUBLISH_FULL;
  +			break;
  +		case IServer.PUBLISH_STATE_INCREMENTAL:
  +			newDeltaKind = IServer.PUBLISH_INCREMENTAL;
  +			break;
  +		}
  +		
   		/**
   		 * If our modules are already packaged as ejb jars, wars, aop files, 
   		 * then go ahead and publish
   		 */
   		if( hasPackagingConfiguration(module) ) {
  -			// will be changed
  -			publisher = new NullPublisher();
  +			publisher = new PackagesPublisher(JBossServerCore.getServer(getServer()));
   		} else if( arePathModules(module)) {
   			publisher = new PathPublisher(JBossServerCore.getServer(getServer()), this);
   		} else if( areJstModules(module)){
  @@ -193,6 +205,8 @@
   		setModulePublishState(module, publisher.getPublishState());
   	}
   	
  +	// Is it just a file being deployed? 
  +	// .xml, or .jar specifically
   	public boolean arePathModules(IModule[] module) {
   		if( module.length == 1 && module[0] instanceof Module ) {
   			ModuleFactoryDelegate delegate = 
  @@ -207,7 +221,8 @@
   		String type;
   		for( int i = 0; i < module.length; i++ ) {
   			type = module[i].getModuleType().getId();
  -			if( type.equals("jst.ejb") || type.equals("jst.client") || type.equals("jst.web") || type.equals("jst.ear")) 
  +			if( type.equals("jst.ejb") || type.equals("jst.client") 
  +					|| type.equals("jst.web") || type.equals("jst.ear")) 
   				continue;
   			return false;
   		}
  @@ -215,6 +230,10 @@
   	}
   	/* Temporary and will need to be fixed */
   	protected boolean hasPackagingConfiguration(IModule[] module) {
  +		try {
  +			String projectName = module[0].getName();
  +			return PackagesCore.projectHasPackages(ResourcesPlugin.getWorkspace().getRoot().getProject(projectName));
  +		} catch( Exception e ) {} 
   		return false;
   	}