[223821] Run on server
diff --git a/plugins/org.eclipse.jst.jee.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.jee.ui/META-INF/MANIFEST.MF index 5e5ff16..fa86bf8 100644 --- a/plugins/org.eclipse.jst.jee.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.jee.ui/META-INF/MANIFEST.MF
@@ -15,6 +15,7 @@ org.eclipse.jst.jee;bundle-version="[1.0.0,1.1.0)", org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)", org.eclipse.wst.web.ui;bundle-version="[1.1.0,1.2.0)", + org.eclipse.wst.web;bundle-version="[1.1.0,1.2.0)", org.eclipse.wst.common.frameworks.ui;bundle-version="[1.1.0,1.2.0)", org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)", org.eclipse.wst.server.core;bundle-version="[1.0.0,1.1.0)", @@ -28,15 +29,16 @@ org.eclipse.jst.j2ee.ejb;bundle-version="[1.1.103,1.2.0)", org.eclipse.jst.j2ee.core;bundle-version="[1.1.102,1.2.0)", org.eclipse.wst.common.emf;bundle-version="[1.1.103,2.0.0)", - org.eclipse.jdt.ui, - org.eclipse.ui.ide, - org.eclipse.ui.navigator, - org.eclipse.emf.edit;bundle-version="2.4.0", - org.eclipse.jst.j2ee.navigator.ui;bundle-version="1.1.102", - org.eclipse.emf.edit.ui;bundle-version="2.4.0", - org.eclipse.ui.navigator.resources;bundle-version="3.3.100", - org.eclipse.jst.common.frameworks;bundle-version="1.1.102", - org.eclipse.jst.j2ee.jca;bundle-version="1.1.200" + org.eclipse.jdt.ui;bundle-version="[3.2.0,4.0.0)", + org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)", + org.eclipse.ui.navigator;bundle-version="[3.2.0,4.0.0)", + org.eclipse.emf.edit;bundle-version="[2.2.0,3.0.0)", + org.eclipse.jst.j2ee.navigator.ui;bundle-version="[1.1.0,2.0.0)", + org.eclipse.emf.edit.ui;bundle-version="[2.2.0,3.0.0)", + org.eclipse.ui.navigator.resources;bundle-version="[3.2.0,4.0.0)", + org.eclipse.jst.server.core;bundle-version="[1.0.102,1.1.0)", + org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,2.0.0)", + org.eclipse.jst.j2ee.jca;bundle-version="[1.1.0,2.0.0)" Eclipse-LazyStart: true Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor.0 @@ -44,4 +46,4 @@ Export-Package: org.eclipse.jst.jee.ui.internal, org.eclipse.jst.jee.ui.internal.deployables, org.eclipse.jst.jee.ui.plugin, - org.eclipse.jst.jee.ui.project.facet + org.eclipse.jst.jee.ui.project.facet \ No newline at end of file
diff --git a/plugins/org.eclipse.jst.jee.ui/plugin.properties b/plugins/org.eclipse.jst.jee.ui/plugin.properties index 1872634..58bd16a 100644 --- a/plugins/org.eclipse.jst.jee.ui/plugin.properties +++ b/plugins/org.eclipse.jst.jee.ui/plugin.properties
@@ -13,4 +13,4 @@ Bundle-Vendor.0 = Eclipse.org create_deploy_files=Generate Deployment Descriptor Stub j2ee=Java EE -j2ee.actions.description_ui_=Actions for J2EE Development +j2ee.actions.description_ui_=Actions for Java EE Development
diff --git a/plugins/org.eclipse.jst.jee.ui/plugin.xml b/plugins/org.eclipse.jst.jee.ui/plugin.xml index 34f646d..5df0da5 100644 --- a/plugins/org.eclipse.jst.jee.ui/plugin.xml +++ b/plugins/org.eclipse.jst.jee.ui/plugin.xml
@@ -19,28 +19,28 @@ adaptableType="org.eclipse.core.resources.IFile"> <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/> </factory> -<!-- + <factory class="org.eclipse.jst.jee.ui.internal.deployables.EnterpriseDeployableArtifactAdapterFactory" - adaptableType="org.eclipse.jst.j2ee.application.Application"> + adaptableType="org.eclipse.jst.javaee.application.Application"> <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/> </factory> - --> + </extension> <extension point="org.eclipse.wst.server.core.moduleArtifactAdapters"> -<!-- + <moduleArtifactAdapter - id="org.eclipse.jst.j2ee.server.ear1" + id="org.eclipse.jst.jee.server.ear1" class="org.eclipse.jst.jee.ui.internal.deployables.EnterpriseDeployableArtifactAdapterFactory"> <enablement> <with variable="selection"> - <adapt type="org.eclipse.jst.j2ee.application.Application"/> + <adapt type="org.eclipse.jst.javaee.application.Application"/> </with> </enablement> </moduleArtifactAdapter> - --> + <moduleArtifactAdapter id="org.eclipse.jst.jee.server.ear2" class="org.eclipse.jst.jee.ui.internal.deployables.EnterpriseDeployableArtifactAdapterFactory"> @@ -187,18 +187,30 @@ adaptableType="org.eclipse.core.resources.IFile"> <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/> </factory> - <!-- - <factory - class="org.eclipse.jst.ejb.ui.internal.deployables.EJBDeployableArtifactAdapterFactory" - adaptableType="org.eclipse.jst.j2ee.ejb.EnterpriseBean"> - <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/> - </factory> - <factory - class="org.eclipse.jst.ejb.ui.internal.deployables.EJBDeployableArtifactAdapterFactory" - adaptableType="org.eclipse.jst.j2ee.ejb.EJBJar"> - <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/> - </factory> - --> + + <factory + class="org.eclipse.jst.jee.ui.internal.deployables.EJBDeployableArtifactAdapterFactory" + adaptableType="org.eclipse.jst.javaee.ejb.EJBJar"> + <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/> + </factory> + + <factory + class="org.eclipse.jst.jee.ui.internal.deployables.EJBDeployableArtifactAdapterFactory" + adaptableType="org.eclipse.jst.javaee.ejb.SessionBean"> + <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/> + </factory> + + <factory + class="org.eclipse.jst.jee.ui.internal.deployables.EJBDeployableArtifactAdapterFactory" + adaptableType="org.eclipse.jst.javaee.ejb.MessageDrivenBean"> + <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/> + </factory> + + <factory + class="org.eclipse.jst.jee.ui.internal.deployables.EJBDeployableArtifactAdapterFactory" + adaptableType="org.eclipse.jst.javaee.ejb.EntityBean"> + <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/> + </factory> </extension> <!-- ==================================================================== --> @@ -207,26 +219,26 @@ <!-- ==================================================================== --> <extension point="org.eclipse.wst.server.core.moduleArtifactAdapters"> -<!-- + <moduleArtifactAdapter id="org.eclipse.jst.j2ee.server.ejb" - class="org.eclipse.jst.ejb.ui.internal.deployables.EJBDeployableArtifactAdapterFactory"> + class="org.eclipse.jst.jee.ui.internal.deployables.EJBDeployableArtifactAdapterFactory"> <enablement> <with variable="selection"> - <adapt type="org.eclipse.jst.j2ee.ejb.EJBJar"/> + <adapt type="org.eclipse.jst.javaee.ejb.EJBJar"/> </with> </enablement> </moduleArtifactAdapter> <moduleArtifactAdapter id="org.eclipse.jst.j2ee.server.ejb2" - class="org.eclipse.jst.ejb.ui.internal.deployables.EJBDeployableArtifactAdapterFactory"> + class="org.eclipse.jst.jee.ui.internal.deployables.EJBDeployableArtifactAdapterFactory"> <enablement> <with variable="selection"> - <adapt type="org.eclipse.jst.j2ee.ejb.EnterpriseBean"/> + <adapt type="org.eclipse.jst.javaee.ejb.SessionBean"/> </with> </enablement> </moduleArtifactAdapter> ---> + <moduleArtifactAdapter id="org.eclipse.jst.jee.server.ejb3" class="org.eclipse.jst.jee.ui.internal.deployables.EJBDeployableArtifactAdapterFactory"> @@ -262,6 +274,26 @@ </with> </enablement> </moduleArtifactAdapter> + + <moduleArtifactAdapter + id="org.eclipse.jst.j2ee.server.ejb6" + class="org.eclipse.jst.jee.ui.internal.deployables.EJBDeployableArtifactAdapterFactory"> + <enablement> + <with variable="selection"> + <adapt type="org.eclipse.jst.javaee.ejb.MessageDrivenBean"/> + </with> + </enablement> + </moduleArtifactAdapter> + + <moduleArtifactAdapter + id="org.eclipse.jst.j2ee.server.ejb7" + class="org.eclipse.jst.jee.ui.internal.deployables.EJBDeployableArtifactAdapterFactory"> + <enablement> + <with variable="selection"> + <adapt type="org.eclipse.jst.javaee.ejb.EntityBean"/> + </with> + </enablement> + </moduleArtifactAdapter> </extension> <extension @@ -276,7 +308,7 @@ icon="icons/full/ctool16/dep_desc.gif" id="createDeploymentFiles" label="%create_deploy_files" - menubarPath="javeeUIPopupMenuCategory/slot1"> + menubarPath="javeeUIPopupMenuCategory/slot2"> </action> <enablement> <or> @@ -373,55 +405,8 @@ </instanceof> </or> </possibleChildren> - <actionProvider - class="org.eclipse.jst.jee.ui.internal.navigator.JEEActionProvider" - id="org.eclipse.jst.javaee.ui.JEEActionProvider"> - <enablement> - <or> - <instanceof value="org.eclipse.jst.jee.ui.internal.navigator.AbstractDDNode"/> - <instanceof value="org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanNode"/> - <instanceof value="org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanInterfaceNode"/> - <instanceof value="org.eclipse.jst.javaee.core.JavaEEObject" /> - <instanceof - value="org.eclipse.jst.jee.ui.internal.navigator.AbstractGroupProvider"> - </instanceof> - <instanceof - value="org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider"> - </instanceof> - <instanceof - value="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider"> - </instanceof> - <instanceof - value="org.eclipse.jst.jee.ui.internal.navigator.appclient.GroupAppClientProvider"> - </instanceof> - </or> - </enablement> - </actionProvider> - <actionProvider - class="org.eclipse.ui.internal.navigator.resources.actions.NewActionProvider" - id="org.eclipse.ui.navigator.resources.JEENewActions"> - <enablement> - <or> - <instanceof - value="org.eclipse.jst.jee.ui.internal.navigator.AbstractDDNode"> - </instanceof> - <instanceof - value="org.eclipse.jst.jee.ui.internal.navigator.AbstractGroupProvider"> - </instanceof> - <instanceof - value="org.eclipse.jst.javaee.core.JavaEEObject"> - </instanceof> - <instanceof - value="org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider"> - </instanceof> - <instanceof - value="org.eclipse.jst.jee.ui.internal.navigator.web.AbstractSubWebProviders"> - </instanceof> - <instanceof - value="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider"> - </instanceof></or> - </enablement> - </actionProvider> + + <commonWizard menuGroupId="org.eclipse.jst.ejb.ui" type="new" @@ -451,6 +436,58 @@ </instanceof> </or></enablement> </commonWizard> + + + <actionProvider + class="org.eclipse.jst.jee.ui.internal.navigator.JEEActionProvider" + id="org.eclipse.jst.javaee.ui.JEEActionProvider"> + <enablement> + <or> + <instanceof value="org.eclipse.jst.jee.ui.internal.navigator.AbstractDDNode"/> + <instanceof value="org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanNode"/> + <instanceof value="org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanInterfaceNode"/> + <instanceof value="org.eclipse.jst.javaee.core.JavaEEObject" /> + <instanceof + value="org.eclipse.jst.jee.ui.internal.navigator.AbstractGroupProvider"> + </instanceof> + <instanceof + value="org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider"> + </instanceof> + <instanceof + value="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider"> + </instanceof> + <instanceof + value="org.eclipse.jst.jee.ui.internal.navigator.appclient.GroupAppClientProvider"> + </instanceof> + </or> + </enablement> + </actionProvider> + + + <actionProvider + class="org.eclipse.ui.internal.navigator.resources.actions.NewActionProvider" + id="org.eclipse.ui.navigator.resources.JEENewActions"> + <enablement> + <or> + <instanceof + value="org.eclipse.jst.jee.ui.internal.navigator.AbstractDDNode"> + </instanceof> + <instanceof + value="org.eclipse.jst.jee.ui.internal.navigator.AbstractGroupProvider"> + </instanceof> + + <instanceof + value="org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider"> + </instanceof> + <instanceof + value="org.eclipse.jst.jee.ui.internal.navigator.web.AbstractSubWebProviders"> + </instanceof> + <instanceof + value="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider"> + </instanceof></or> + </enablement> + </actionProvider> + <actionProvider class="org.eclipse.ui.internal.navigator.resources.actions.ResourceMgmtActionProvider" id="org.eclipse.ui.navigator.resources.actions.JEEResourceMgmtAction"> @@ -462,9 +499,7 @@ <instanceof value="org.eclipse.jst.jee.ui.internal.navigator.AbstractGroupProvider"> </instanceof> - <instanceof - value="org.eclipse.jst.javaee.core.JavaEEObject"> - </instanceof> + </or> </enablement> </actionProvider> @@ -479,9 +514,11 @@ <instanceof value="org.eclipse.jst.jee.ui.internal.navigator.AbstractGroupProvider"> </instanceof> - <instanceof - value="org.eclipse.jst.javaee.core.JavaEEObject"> - </instanceof> + + <instanceof + value="org.eclipse.jst.javaee.core.JavaEEObject"> + </instanceof> + </or> </enablement> </actionProvider> @@ -496,13 +533,14 @@ <instanceof value="org.eclipse.jst.jee.ui.internal.navigator.AbstractDDNode"> </instanceof> - <instanceof - value="org.eclipse.jst.javaee.core.JavaEEObject"> - </instanceof> + </or> </enablement> </actionProvider> + + </navigatorContent> + <navigatorContent contentProvider="org.eclipse.jst.jee.ui.internal.navigator.Web25ContentProvider" id="org.eclipse.jst.navigator.j2ee.ui.web25" @@ -537,6 +575,8 @@ </instanceof> </or> </possibleChildren> + + <actionProvider class="org.eclipse.ui.internal.navigator.resources.actions.ResourceMgmtActionProvider" id="org.eclipse.ui.internal.navigator.resources.actions.JEEWebResourceMgmtAction"> @@ -562,9 +602,11 @@ <instanceof value="org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider"> </instanceof> - <instanceof - value="org.eclipse.jst.javaee.core.JavaEEObject"> - </instanceof> + + <instanceof + value="org.eclipse.jst.javaee.core.JavaEEObject"> + </instanceof> + </or> </enablement> </actionProvider> @@ -582,6 +624,7 @@ </or> </enablement> </actionProvider> + <commonWizard menuGroupId="org.eclipse.wst.web.ui" type="new" @@ -824,6 +867,14 @@ type="org.eclipse.debug.ui.actions.ILaunchable"> </adapter> </factory> + + + <factory + adaptableType="org.eclipse.jst.javaee.core.JavaEEObject" + class="org.eclipse.jst.j2ee.navigator.internal.J2EEEMFAdapterFactory"> + <adapter type="org.eclipse.core.resources.IResource"/> + </factory> + </extension> <extension point="org.eclipse.ui.navigator.viewer">
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/EJBDeployableArtifactAdapterUtil.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/EJBDeployableArtifactAdapterUtil.java index 58ca77b..d7ed1ed 100644 --- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/EJBDeployableArtifactAdapterUtil.java +++ b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/EJBDeployableArtifactAdapterUtil.java
@@ -15,18 +15,31 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.jem.util.emf.workbench.ProjectUtilities; import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.jst.j2ee.internal.J2EEConstants; import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities; +import org.eclipse.jst.javaee.ejb.EJBJar; +import org.eclipse.jst.javaee.ejb.EntityBean; +import org.eclipse.jst.javaee.ejb.MessageDrivenBean; +import org.eclipse.jst.javaee.ejb.SessionBean; +import org.eclipse.jst.jee.internal.deployables.JEEFlexProjDeployable; +import org.eclipse.jst.server.core.EJBBean; import org.eclipse.wst.common.componentcore.ComponentCore; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.common.componentcore.resources.IVirtualResource; +import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper; import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.server.core.IModuleArtifact; import org.eclipse.wst.server.core.ServerUtil; +import org.eclipse.wst.server.core.model.ModuleDelegate; import org.eclipse.wst.server.core.util.NullModuleArtifact; /** @@ -44,10 +57,14 @@ public static IModuleArtifact getModuleObject(Object obj) { if (obj == null) return null; -// else if (obj instanceof EJBJar) -// return getModuleObject((EJBJar) obj); -// else if (obj instanceof EnterpriseBean) -// return getModuleObject((EnterpriseBean) obj); + else if (obj instanceof EJBJar) + return getModuleObject((EJBJar) obj); + else if (obj instanceof SessionBean) + return getModuleObject((SessionBean) obj); + else if (obj instanceof MessageDrivenBean) + return getModuleObject((MessageDrivenBean) obj); + else if (obj instanceof EntityBean) + return getModuleObject((EntityBean) obj); else if (obj instanceof IProject) return getModuleObject((IProject) obj); else if (obj instanceof IJavaProject) @@ -78,16 +95,15 @@ return null; } -// protected static IModuleArtifact getModuleObject(EJBJar ejbJar) { -// IModule dep = getModule(ejbJar); -// return createModuleObject(dep, null, false, false); -// } -// -// protected static IModuleArtifact getModuleObject(EnterpriseBean ejb) { -// -// IModule dep = getModule(ejb); -// return createModuleObject(dep, ejb.getName(), ejb.hasRemoteClient(), ejb.hasLocalClient()); -// } + protected static IModuleArtifact getModuleObject(EJBJar ejbJar) { + IModule dep = getModule((EObject)ejbJar); + return createModuleObject(dep, null, false, false); + } + + protected static IModuleArtifact getModuleObject(SessionBean ejb) { + IModule dep = getModule((EObject)ejb); + return createModuleObject(dep, ejb.getEjbName(), false, false); + } protected static IModuleArtifact getModuleObject(IProject project) { if (hasInterestedComponents(project)) { @@ -112,21 +128,21 @@ return null; } -// protected static IModule getModule(EObject refObject) { -// IProject proj = ProjectUtilities.getProject(refObject); -// Resource refResource = refObject.eResource(); -// IVirtualResource[] resources = null; -// IVirtualComponent component = null; -// try { -// IResource eclipeServResoruce = WorkbenchResourceHelper.getFile(refResource); -// resources = ComponentCore.createResources(eclipeServResoruce); -// if (resources[0] != null) -// component = resources[0].getComponent(); -// } catch (Exception e) { -// e.printStackTrace(); -// } -// return getModule(proj, component); -// } + protected static IModule getModule(EObject refObject) { + IProject proj = ProjectUtilities.getProject(refObject); + Resource refResource = refObject.eResource(); + IVirtualResource[] resources = null; + IVirtualComponent component = null; + try { + IResource eclipeServResoruce = WorkbenchResourceHelper.getFile(refResource); + resources = ComponentCore.createResources(eclipeServResoruce); + if (resources[0] != null) + component = resources[0].getComponent(); + } catch (Exception e) { + e.printStackTrace(); + } + return getModule(proj, component); + } protected static IModule getModule(IProject project, IVirtualComponent component) { IModule deployable = null; @@ -201,10 +217,10 @@ if (module != null) { String jndiName = null; if (ejbName != null) { -// module.loadAdapter(ModuleDelegate.class, new NullProgressMonitor()); -// JEEFlexProjDeployable moduleDelegate = (JEEFlexProjDeployable)module.getAdapter(ModuleDelegate.class); -// jndiName = moduleDelegate.getJNDIName(ejbName); -// return new EJBBean(module, jndiName, remote, local); + module.loadAdapter(ModuleDelegate.class, new NullProgressMonitor()); + JEEFlexProjDeployable moduleDelegate = (JEEFlexProjDeployable)module.getAdapter(ModuleDelegate.class); + jndiName = moduleDelegate.getJNDIName(ejbName); + return new EJBBean(module, jndiName, remote, local); } return new NullModuleArtifact(module); }
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/EnterpriseApplicationDeployableAdapterUtil.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/EnterpriseApplicationDeployableAdapterUtil.java index 9eda962..8049b42 100644 --- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/EnterpriseApplicationDeployableAdapterUtil.java +++ b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/EnterpriseApplicationDeployableAdapterUtil.java
@@ -15,11 +15,17 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.jem.util.emf.workbench.ProjectUtilities; import org.eclipse.jst.j2ee.internal.J2EEConstants; import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities; +import org.eclipse.jst.javaee.application.Application; import org.eclipse.wst.common.componentcore.ComponentCore; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.common.componentcore.resources.IVirtualResource; +import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper; import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.server.core.IModuleArtifact; import org.eclipse.wst.server.core.ServerUtil; @@ -44,8 +50,8 @@ * obj - Object to adapt. */ public static IModuleArtifact getModuleObject(Object obj) { -// if (obj instanceof Application) -// return getModuleObject((Application) obj); + if (obj instanceof Application) + return getModuleObject((Application) obj); if (obj instanceof IProject) return getModuleObject((IProject) obj); if (obj instanceof IFile) @@ -53,16 +59,16 @@ return null; }// getDeployableObject -// /** -// * Gets the deployable object for ear instance. -// * -// * @param Application -// * application - EAR instance. -// */ -// protected static IModuleArtifact getModuleObject(Application application) { -// IModule dep = getModule(application); -// return createModuleObject(dep); -// }// getDeployableObject + /** + * Gets the deployable object for ear instance. + * + * @param Application + * application - EAR instance. + */ + protected static IModuleArtifact getModuleObject(Application application) { + IModule dep = getModule((EObject)application); + return createModuleObject(dep); + } /** * Gets the deployable object for project instances. @@ -96,28 +102,28 @@ return null; }// getModuleObject -// /** -// * Gets the deployable object. -// * -// * @param EObject -// * refObject - The current refObject. -// * @return IModule -// */ -// protected static IModule getModule(EObject refObject) { -// IProject proj = ProjectUtilities.getProject(refObject); -// Resource servResource = refObject.eResource(); -// IVirtualResource[] resources = null; -// try { -// IResource eclipeServResoruce = WorkbenchResourceHelper.getFile(servResource); -// resources = ComponentCore.createResources(eclipeServResoruce); -// } catch (Exception e) { -// e.printStackTrace(); -// } -// IVirtualComponent component = null; -// if (resources[0] != null) -// component = resources[0].getComponent(); -// return getModule(proj,component); -// }// getModule + /** + * Gets the deployable object. + * + * @param EObject + * refObject - The current refObject. + * @return IModule + */ + protected static IModule getModule(EObject refObject) { + IProject proj = ProjectUtilities.getProject(refObject); + Resource servResource = refObject.eResource(); + IVirtualResource[] resources = null; + try { + IResource eclipeServResoruce = WorkbenchResourceHelper.getFile(servResource); + resources = ComponentCore.createResources(eclipeServResoruce); + } catch (Exception e) { + e.printStackTrace(); + } + IVirtualComponent component = null; + if (resources[0] != null) + component = resources[0].getComponent(); + return getModule(proj,component); + }