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

[Robert Stryker]

  User: rawb    
  Date: 07/02/23 16:57:33

  Modified:    as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/stripped 
                        DeployableServerBehavior.java
  Log:
  
  
  Revision  Changes    Path
  1.4       +27 -3     jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/stripped/DeployableServerBehavior.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DeployableServerBehavior.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/stripped/DeployableServerBehavior.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- DeployableServerBehavior.java	9 Feb 2007 18:25:37 -0000	1.3
  +++ DeployableServerBehavior.java	23 Feb 2007 21:57:33 -0000	1.4
  @@ -13,6 +13,8 @@
   import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
   import org.eclipse.wst.server.core.IModule;
   import org.eclipse.wst.server.core.IServer;
  +import org.eclipse.wst.server.core.IServerWorkingCopy;
  +import org.eclipse.wst.server.core.ServerUtil;
   import org.eclipse.wst.server.core.internal.IModuleVisitor;
   import org.eclipse.wst.server.core.internal.Module;
   import org.eclipse.wst.server.core.internal.ProgressUtil;
  @@ -23,6 +25,7 @@
   import org.eclipse.wst.server.core.model.PublishOperation;
   import org.eclipse.wst.server.core.model.ServerBehaviourDelegate;
   import org.jboss.ide.eclipse.as.core.JBossServerCore;
  +import org.jboss.ide.eclipse.as.core.module.PackageModuleFactory;
   import org.jboss.ide.eclipse.as.core.module.PathModuleFactory;
   import org.jboss.ide.eclipse.as.core.publishers.IJBossServerPublisher;
   import org.jboss.ide.eclipse.as.core.publishers.JstPackagesPublisher;
  @@ -68,7 +71,7 @@
   			case ServerBehaviourDelegate.CHANGED: System.out.print("changed"); break;
   			case ServerBehaviourDelegate.REMOVED: System.out.print("removed"); break;
   		}
  -		System.out.println("");
  +		System.out.println(" to server " + getServer().getId());
   		
   		if( module.length == 0 ) return;
   		IJBossServerPublisher publisher;
  @@ -81,10 +84,12 @@
   		 */
   		if( arePathModules(module)) {
   			publisher = new PathPublisher(JBossServerCore.getDeployableServer(getServer()), this);
  -		} else if( hasPackagingConfiguration(module) ) {
  -			publisher = new PackagesPublisher(JBossServerCore.getDeployableServer(getServer()));
   		} else if( areJstStyleModules(module)){
   			publisher = new JstPackagesPublisher(JBossServerCore.getDeployableServer(getServer()));
  +//			} else if( hasPackagingConfiguration(module) ) {
  +//			publisher = new PackagesPublisher(JBossServerCore.getDeployableServer(getServer()));
  +		} else if( module[0].getModuleType().getId().equals(PackageModuleFactory.MODULE_TYPE)) {
  +			publisher = new PackagesPublisher(JBossServerCore.getDeployableServer(getServer()));
   		} else {
   			publisher = new NullPublisher();
   		}
  @@ -151,7 +156,9 @@
   		setServerState(IServer.STATE_STOPPING);
   	}
   	
  +	
   	public IStatus publishOneModule(int kind, IModule[] module, int deltaKind, IProgressMonitor monitor) {
  +		addAndRemoveModules( module, deltaKind);
   		ArrayList moduleList = new ArrayList();
   		ArrayList deltaKindList = new ArrayList();
   		moduleList.add(module);
  @@ -192,4 +199,21 @@
   		}
   		return null;
   	}
  +	
  +	protected void addAndRemoveModules(IModule[] module, int deltaKind) {
  +		if( deltaKind != ServerBehaviourDelegate.ADDED && deltaKind != ServerBehaviourDelegate.REMOVED) return;
  +
  +		if (getServer() != null && !ServerUtil.containsModule(getServer(), module[0], new NullProgressMonitor())) {
  +			IServerWorkingCopy wc = getServer().createWorkingCopy();
  +			try {
  +				if( deltaKind == ServerBehaviourDelegate.ADDED )
  +					ServerUtil.modifyModules(wc, module, new IModule[0], new NullProgressMonitor());
  +				else if( deltaKind == ServerBehaviourDelegate.REMOVED) 
  +					ServerUtil.modifyModules(wc, new IModule[0], module, new NullProgressMonitor());
  +					
  +				wc.save(false, new NullProgressMonitor());
  +			} catch (CoreException ce) {
  +			}
  +		}
  +	}
   }