migrating to j2ee modules
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServer.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServer.java
index bd5909f..40b4416 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServer.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServer.java
@@ -167,14 +167,12 @@
public IModule[] getParentModules(IModule module) throws CoreException {
//FIXME This is valid for only web modules. A generic server should support any
// kind of j2ee module. Fix this after the server architectures are determined.
- if (module instanceof IWebModule) {
- IWebModule webModule = (IWebModule) module;
+ IWebModule webModule = (IWebModule)module.getAdapter(IWebModule.class);
+ if (webModule!=null) {
IStatus status = canModifyModules(new IModule[] { module }, null);
if (status == null || !status.isOK())
throw new CoreException(status);
- ArrayList l = new ArrayList();
- l.add(webModule);
- return (IModule[])l.toArray(new IModule[l.size()]);
+ return new IModule[] { module };
}
return null;
diff --git a/plugins/org.eclipse.jst.server.generic.modules/plugin.xml b/plugins/org.eclipse.jst.server.generic.modules/plugin.xml
index 9242892..6401d80 100644
--- a/plugins/org.eclipse.jst.server.generic.modules/plugin.xml
+++ b/plugins/org.eclipse.jst.server.generic.modules/plugin.xml
@@ -21,7 +21,7 @@
<import plugin="org.eclipse.jst.server.core"/>
</requires>
- <extension point="org.eclipse.wst.server.core.moduleFactories">
+ <!-- <extension point="org.eclipse.wst.server.core.moduleFactories">
<moduleFactory
projects="true"
class="org.eclipse.jst.server.generic.modules.J2eeSpecModuleFactoryDelegate"
@@ -38,5 +38,5 @@
id="org.eclipse.jst.server.generic.modules.j2eeSpecModuleObjectAdapter"
class="org.eclipse.jst.server.generic.modules.J2EESpecModuleObjectAdapter"
objectClass="org.eclipse.core.resources.IResource"/>
- </extension>
+ </extension>-->
</plugin>
