[jboss-cvs] jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server ...
Robert Stryker
rawblem at gmail.com
Fri Dec 22 18:24:42 EST 2006
User: rawb
Date: 06/12/22 18:24:42
Modified: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server
JBossServerBehavior.java
JBossServerLaunchConfiguration.java
JBossServer.java
Log:
New PackageTypes for marshall.
Added deploy-only server (cannot start or stop)
Other associated changes.
Revision Changes Path
1.18 +2 -123 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.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- JBossServerBehavior.java 11 Dec 2006 15:43:39 -0000 1.17
+++ JBossServerBehavior.java 22 Dec 2006 23:24:42 -0000 1.18
@@ -21,8 +21,6 @@
*/
package org.jboss.ide.eclipse.as.core.server;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
@@ -30,29 +28,16 @@
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.debug.core.ILaunchManager;
import org.eclipse.debug.core.model.IProcess;
-import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.internal.Module;
-import org.eclipse.wst.server.core.internal.Server;
-import org.eclipse.wst.server.core.model.IModuleResourceDelta;
-import org.eclipse.wst.server.core.model.ModuleFactoryDelegate;
-import org.eclipse.wst.server.core.model.ServerBehaviourDelegate;
-import org.jboss.ide.eclipse.as.core.JBossServerCore;
import org.jboss.ide.eclipse.as.core.model.EventLogModel;
import org.jboss.ide.eclipse.as.core.model.ServerProcessModel;
import org.jboss.ide.eclipse.as.core.model.EventLogModel.EventLogTreeItem;
-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;
-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.packages.core.model.PackagesCore;
+import org.jboss.ide.eclipse.as.core.server.stripped.DeployableServerBehavior;
-public class JBossServerBehavior extends ServerBehaviourDelegate {
+public class JBossServerBehavior extends DeployableServerBehavior {
public static final String LAUNCH_CONFIG_DEFAULT_CLASSPATH = "__JBOSS_SERVER_BEHAVIOR_LAUNCH_CONFIG_DEFAULT_CLASSPATH__";
@@ -143,113 +128,7 @@
pollThread.cancel();
}
this.pollThread = new PollThread("Server Poller", new TwiddlePoller(), expectedState, this);
-// this.pollThread = new PollThread("Server Poller", new TimeoutPoller(), expectedState);
pollThread.start();
}
-
- // By default, goes to check if the members are all the same or any changes
- public IModuleResourceDelta[] getPublishedResourceDelta(IModule[] module) {
- return ((Server)getServer()).getPublishedResourceDelta(module);
- }
-
- protected void publishModule(int kind, int deltaKind, IModule[] module, IProgressMonitor monitor) throws CoreException {
- // kind = [incremental, full, auto, clean] = [1,2,3,4]
- // delta = [no_change, added, changed, removed] = [0,1,2,3]
-
- System.out.print("publishing module: ");
- switch( kind ) {
- 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 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 modulePublishState = getServer().getModulePublishState(module) + 0;
-
- /**
- * If our modules are already packaged as ejb jars, wars, aop files,
- * then go ahead and publish
- */
- if( arePathModules(module)) {
- publisher = new PathPublisher(JBossServerCore.getServer(getServer()), this);
- } else if( hasPackagingConfiguration(module) ) {
- publisher = new PackagesPublisher(JBossServerCore.getServer(getServer()));
- } else if( areJstModules(module)){
- //publisher = new JstPublisher(JBossServerCore.getServer(getServer()));
- publisher = new JstPackagesPublisher(JBossServerCore.getServer(getServer()));
- } else {
- publisher = new NullPublisher();
- }
-
- publisher.publishModule(kind, deltaKind, modulePublishState, module, monitor);
- 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 =
- ((Module)module[0]).getModuleFactory().getDelegate(new NullProgressMonitor());
- if( delegate instanceof PathModuleFactory ) return true;
- }
- return false;
- }
-
- /* Temporary and will need to be fixed */
- protected boolean areJstModules(IModule[] module) {
- 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"))
- continue;
- return false;
- }
- return true;
- }
- /* Temporary and will need to be fixed */
- protected boolean hasPackagingConfiguration(IModule[] module) {
- try {
- String projectName = module[0].getName();
- IProject proj = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- return PackagesCore.getProjectPackages(proj, new NullProgressMonitor()).length == 0 ? false : true;
- } catch( Exception e ) {}
- return false;
- }
-
-
-
-
- /*
- * Change the state of the server
- */
- public void setServerStarted() {
- setServerState(IServer.STATE_STARTED);
- }
-
- public void setServerStarting() {
- setServerState(IServer.STATE_STARTING);
- }
-
- public void setServerStopped() {
- setServerState(IServer.STATE_STOPPED);
- }
-
- public void setServerStopping() {
- setServerState(IServer.STATE_STOPPING);
- }
-
-
}
1.2 +0 -1 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/JBossServerLaunchConfiguration.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: JBossServerLaunchConfiguration.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/JBossServerLaunchConfiguration.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- JBossServerLaunchConfiguration.java 10 Nov 2006 00:26:25 -0000 1.1
+++ JBossServerLaunchConfiguration.java 22 Dec 2006 23:24:42 -0000 1.2
@@ -72,7 +72,6 @@
IServer server = ServerUtil.getServer(configuration);
JBossServerBehavior jbossServerBehavior = (JBossServerBehavior) server.getAdapter(JBossServerBehavior.class);
return jbossServerBehavior;
-
}
public static JBossServer getJBossServer(ILaunchConfiguration configuration) throws CoreException {
1.18 +3 -1 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/JBossServer.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: JBossServer.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/JBossServer.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- JBossServer.java 13 Dec 2006 18:35:21 -0000 1.17
+++ JBossServer.java 22 Dec 2006 23:24:42 -0000 1.18
@@ -43,10 +43,12 @@
import org.jboss.ide.eclipse.as.core.runtime.IJBossServerLaunchDefaults;
import org.jboss.ide.eclipse.as.core.runtime.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.runtime.server.ServerLaunchDefaults;
+import org.jboss.ide.eclipse.as.core.server.attributes.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.attributes.IServerStartupParameters;
import org.jboss.ide.eclipse.as.core.util.ArgsUtil;
-public class JBossServer extends ServerDelegate implements IServerStartupParameters {
+public class JBossServer extends ServerDelegate
+ implements IServerStartupParameters, IDeployableServer {
public JBossServer() {
More information about the jboss-cvs-commits
mailing list