Author: rob.stryker(a)jboss.com Date: 2009-08-19 23:30:29 -0400 (Wed, 19 Aug 2009) New Revision: 17177 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF 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/util/ModuleUtil.java Log: JBIDE-4320 - AS Tools commit Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF 2009-08-20 02:37:24 UTC (rev 17176) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF 2009-08-20 03:30:29 UTC (rev 17177) @@ -15,7 +15,8 @@ org.eclipse.wst.xml.core, org.apache.ant, org.jboss.tools.jmx.core;bundle-version="0.2.1", - org.eclipse.core.variables;bundle-version="3.2.200" + org.eclipse.core.variables;bundle-version="3.2.200", + org.jboss.ide.eclipse.as.wtp.core;bundle-version="1.0.0" Eclipse-LazyStart: true Export-Package: org.jboss.ide.eclipse.as.core, org.jboss.ide.eclipse.as.core.extensions.descriptors, 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 2009-08-20 02:37:24 UTC (rev 17176) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java 2009-08-20 03:30:29 UTC (rev 17177) @@ -26,9 +26,9 @@ import org.eclipse.wst.server.core.model.ServerDelegate; import org.jboss.ide.eclipse.as.core.server.IDeployableServer; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; -import org.jboss.ide.eclipse.as.core.util.IWTPConstants; import org.jboss.ide.eclipse.as.core.util.ModuleUtil; import org.jboss.ide.eclipse.as.core.util.ServerUtil; +import org.jboss.ide.eclipse.as.wtp.core.modules.IJBTModule; public class DeployableServer extends ServerDelegate implements IDeployableServer { @@ -78,14 +78,27 @@ private IModule[] doGetParentModules(IModule module) { - IModule[] ears = org.eclipse.wst.server.core.ServerUtil.getModules(IWTPConstants.FACET_EAR); + // get all supported modules + IModule[] supported = + org.eclipse.wst.server.core.ServerUtil.getModules( + getServer().getServerType().getRuntimeType().getModuleTypes()); 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]); + + for( int i = 0; i < supported.length; i++ ) { + IEnterpriseApplication jeeMod = (IEnterpriseApplication)supported[i].loadAdapter(IEnterpriseApplication.class,null); + IJBTModule jbtMod = (IJBTModule)supported[i].loadAdapter(IJBTModule.class, null); + if( jeeMod != null ) { + IModule[] childs = jeeMod.getModules(); + for (int j = 0; j < childs.length; j++) { + if(childs[j].equals(module)) + list.add(supported[i]); + } + } else if( jbtMod != null ) { + IModule[] childs = jbtMod.getModules(); + for (int j = 0; j < childs.length; j++) { + if(childs[j].equals(module)) + list.add(supported[i]); + } } } return list.toArray(new IModule[list.size()]); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ModuleUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ModuleUtil.java 2009-08-20 02:37:24 UTC (rev 17176) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ModuleUtil.java 2009-08-20 03:30:29 UTC (rev 17177) @@ -15,11 +15,9 @@ import org.eclipse.core.runtime.NullProgressMonitor; 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.IServer; -import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants; +import org.jboss.ide.eclipse.as.wtp.core.modules.IJBTModule; public class ModuleUtil { public static ArrayList<IModule[]> getShallowChildren(IServer server, IModule[] root) { @@ -50,24 +48,14 @@ public static IModule[] getChildModules(IModule[] module) { int last = module.length-1; if (module[last] != null && module[last].getModuleType() != null) { - IModuleType moduleType = module[last].getModuleType(); - if(IJBossServerConstants.FACET_EAR.equals(moduleType.getId())) { - IEnterpriseApplication enterpriseApplication = (IEnterpriseApplication) module[0] - .loadAdapter(IEnterpriseApplication.class, null); - if (enterpriseApplication != null) { - IModule[] earModules = enterpriseApplication.getModules(); - if ( earModules != null) { - return earModules; - } - } - } - else if (IJBossServerConstants.FACET_WEB.equals(moduleType.getId())) { - IWebModule webModule = (IWebModule) module[last].loadAdapter(IWebModule.class, null); - if (webModule != null) { - IModule[] modules = webModule.getModules(); - return modules; - } - } + IEnterpriseApplication enterpriseApplication = (IEnterpriseApplication) module[last] + .loadAdapter(IEnterpriseApplication.class, null); + if( enterpriseApplication != null ) + return enterpriseApplication.getModules() == null ? new IModule[]{} : enterpriseApplication.getModules(); + + IJBTModule jbtMod = (IJBTModule)module[last].loadAdapter(IJBTModule.class, null); + if( jbtMod != null ) + return jbtMod.getModules(); } return new IModule[0]; }