Author: rob.stryker(a)jboss.com Date: 2008-04-11 22:12:16 -0400 (Fri, 11 Apr 2008) New Revision: 7513 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java Log: JBIDE-2048 - consolidating common server code / child modules etc Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java 2008-04-11 19:57:33 UTC (rev 7512) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java 2008-04-12 02:12:16 UTC (rev 7513) @@ -31,21 +31,36 @@ import org.eclipse.jst.server.core.IWebModule; import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.server.core.IModuleType; +import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.IServerWorkingCopy; +import org.eclipse.wst.server.core.ServerPort; import org.eclipse.wst.server.core.ServerUtil; import org.eclipse.wst.server.core.model.ServerDelegate; import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; import org.jboss.ide.eclipse.as.core.server.IDeployableServer; -// TODO: share the logic for modules with normal deployable server! public class DeployableServer extends ServerDelegate implements IDeployableServer { public DeployableServer() { } + protected void initialize() { + } + + public void setDefaults(IProgressMonitor monitor) { + } + + public void importRuntimeConfiguration(IRuntime runtime, IProgressMonitor monitor) throws CoreException { + } + + public void saveConfiguration(IProgressMonitor monitor) throws CoreException { + } + + public void configurationChanged() { + } + /* - * (non-Javadoc) - * @see org.eclipse.wst.server.core.model.ServerDelegate#canModifyModules(org.eclipse.wst.server.core.IModule[], org.eclipse.wst.server.core.IModule[]) + * Abstracts to implement */ public IStatus canModifyModules(IModule[] add, IModule[] remove) { return new Status(IStatus.OK, JBossServerCorePlugin.PLUGIN_ID,0, "OK", null); @@ -89,7 +104,7 @@ private IModule[] doGetParentModules(IModule module) { IModule[] ears = ServerUtil.getModules("jst.ear"); //$NON-NLS-1$ - ArrayList list = new ArrayList(); + ArrayList<IModule> list = new ArrayList<IModule>(); for (int i = 0; i < ears.length; i++) { IEnterpriseApplication ear = (IEnterpriseApplication)ears[i].loadAdapter(IEnterpriseApplication.class,null); IModule[] childs = ear.getModules(); @@ -98,15 +113,15 @@ list.add(ears[i]); } } - return (IModule[])list.toArray(new IModule[list.size()]); + return list.toArray(new IModule[list.size()]); } - /* - * (non-Javadoc) - * @see org.eclipse.wst.server.core.model.ServerDelegate#modifyModules(org.eclipse.wst.server.core.IModule[], org.eclipse.wst.server.core.IModule[], org.eclipse.core.runtime.IProgressMonitor) - */ + + public ServerPort[] getServerPorts() { + return new ServerPort[0]; + } + public void modifyModules(IModule[] add, IModule[] remove, IProgressMonitor monitor) throws CoreException { - // TODO Auto-generated method stub } /* (non-Javadoc) Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2008-04-11 19:57:33 UTC (rev 7512) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2008-04-12 02:12:16 UTC (rev 7513) @@ -24,30 +24,19 @@ import java.io.File; import java.net.MalformedURLException; import java.net.URL; -import java.util.ArrayList; import java.util.Map; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Status; import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants; -import org.eclipse.jst.server.core.IEnterpriseApplication; import org.eclipse.jst.server.core.IWebModule; import org.eclipse.wst.server.core.IModule; -import org.eclipse.wst.server.core.IModuleType; -import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.IServerWorkingCopy; -import org.eclipse.wst.server.core.ServerPort; -import org.eclipse.wst.server.core.ServerUtil; import org.eclipse.wst.server.core.internal.Server; import org.eclipse.wst.server.core.model.IURLProvider; -import org.eclipse.wst.server.core.model.ServerDelegate; -import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathModel; import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathQuery; import org.jboss.ide.eclipse.as.core.server.IDeployableServer; @@ -60,7 +49,7 @@ * @author Rob Stryker rob.stryker(a)jboss.com * */ -public class JBossServer extends ServerDelegate +public class JBossServer extends DeployableServer implements IJBossServerConstants, IDeployableServer, IURLProvider { public static final String SERVER_USERNAME = "org.jboss.ide.eclipse.as.core.server.userName"; @@ -69,95 +58,6 @@ public JBossServer() { } - protected void initialize() { - } - - public void setDefaults(IProgressMonitor monitor) { - } - - public void importRuntimeConfiguration(IRuntime runtime, IProgressMonitor monitor) throws CoreException { - } - - public void saveConfiguration(IProgressMonitor monitor) throws CoreException { - } - - public void configurationChanged() { - } - - /* - * Abstracts to implement - */ - public IStatus canModifyModules(IModule[] add, IModule[] remove) { - return new Status(IStatus.OK, JBossServerCorePlugin.PLUGIN_ID,0, "OK", null); - } - - public IModule[] getChildModules(IModule[] module) { - int last = module.length-1; - if (module[last] != null && module[last].getModuleType() != null) { - IModuleType moduleType = module[last].getModuleType(); - if("jst.ear".equals(moduleType.getId())) { //$NON-NLS-1$ - IEnterpriseApplication enterpriseApplication = (IEnterpriseApplication) module[0] - .loadAdapter(IEnterpriseApplication.class, null); - if (enterpriseApplication != null) { - IModule[] earModules = enterpriseApplication.getModules(); - if ( earModules != null) { - return earModules; - } - } - } - else if ("jst.web".equals(moduleType.getId())) { //$NON-NLS-1$ - IWebModule webModule = (IWebModule) module[last].loadAdapter(IWebModule.class, null); - if (webModule != null) { - IModule[] modules = webModule.getModules(); - return modules; - } - } - } - return new IModule[0]; - } - - public IModule[] getRootModules(IModule module) throws CoreException { - IStatus status = canModifyModules(new IModule[] { module }, null); - if (status != null && !status.isOK()) - throw new CoreException(status);; - IModule[] parents = doGetParentModules(module); - if(parents.length>0) - return parents; - return new IModule[] { module }; - } - - - private IModule[] doGetParentModules(IModule module) { - IModule[] ears = ServerUtil.getModules("jst.ear"); //$NON-NLS-1$ - ArrayList<IModule> list = new ArrayList<IModule>(); - for (int i = 0; i < ears.length; i++) { - IEnterpriseApplication ear = (IEnterpriseApplication)ears[i].loadAdapter(IEnterpriseApplication.class,null); - IModule[] childs = ear.getModules(); - for (int j = 0; j < childs.length; j++) { - if(childs[j].equals(module)) - list.add(ears[i]); - } - } - return list.toArray(new IModule[list.size()]); - } - - public ServerPort[] getServerPorts() { - return new ServerPort[0]; - } - - public void modifyModules(IModule[] add, IModule[] remove, - IProgressMonitor monitor) throws CoreException { - } - - public boolean equals(Object o2) { - if( !(o2 instanceof JBossServer)) - return false; - JBossServer o2Server = (JBossServer)o2; - return o2Server.getServer().getId().equals(getServer().getId()); - } - - - public ServerAttributeHelper getAttributeHelper() { IServerWorkingCopy copy = getServerWorkingCopy(); if( copy == null ) {