prep for 203 build. synching up 202 patches with 20 maintenacne
diff --git a/plugins/org.eclipse.jst.j2ee.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.core/META-INF/MANIFEST.MF index 06ef3a2..a292bfc 100644 --- a/plugins/org.eclipse.jst.j2ee.core/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.j2ee.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.jst.j2ee.core; singleton:=true -Bundle-Version: 1.1.104.qualifier +Bundle-Version: 1.1.105.qualifier Bundle-Activator: org.eclipse.jst.j2ee.core.internal.plugin.J2EECorePlugin Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/util/WebXMLHelperImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/util/WebXMLHelperImpl.java index 611f316..171d38f 100644 --- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/util/WebXMLHelperImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/util/WebXMLHelperImpl.java
@@ -10,7 +10,9 @@ *******************************************************************************/ package org.eclipse.jst.javaee.web.internal.util; +import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.xmi.XMLResource; import org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage; import org.eclipse.jst.javaee.core.internal.util.JEEXMLHelperImpl; @@ -39,4 +41,15 @@ return super.getQName(ePackage, name, mustHavePrefix); } + @Override + public EStructuralFeature getFeature(EClass class1, String namespaceURI, String name, boolean isElement) { + + EStructuralFeature feat = super.getFeature(class1, namespaceURI, name, isElement); + if (feat == null) + //Try to use JSP namespace + feat = super.getFeature(class1, JspPackage.eNS_URI, name, isElement); + return feat; + + } + }
diff --git a/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF index 3da338b..4c43e91 100644 --- a/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.jst.j2ee; singleton:=true -Bundle-Version: 1.1.106.qualifier +Bundle-Version: 1.1.107.qualifier Bundle-Activator: org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/J2EEFlexProjDeployable.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/J2EEFlexProjDeployable.java index d65995c..c61fbc8 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/J2EEFlexProjDeployable.java +++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/J2EEFlexProjDeployable.java
@@ -424,15 +424,17 @@ else if (component!=null && J2EEProjectUtilities.isDynamicWebProject(component.getProject())) { if (module != null) { IVirtualComponent webComp = ComponentCore.createComponent(component.getProject()); - IVirtualReference reference = webComp.getReference(module.getProject().getName()); + String extension = IJ2EEModuleConstants.JAR_EXT; if (J2EEProjectUtilities.isDynamicWebProject(module.getProject())) { - aURI = ComponentUtilities.getDeployUriOfComponent(reference, IJ2EEModuleConstants.WAR_EXT); + extension = IJ2EEModuleConstants.WAR_EXT; + } else if (J2EEProjectUtilities.isJCAProject(module.getProject())) { + extension = IJ2EEModuleConstants.RAR_EXT; } - else if (J2EEProjectUtilities.isJCAProject(module.getProject())) { - aURI = ComponentUtilities.getDeployUriOfComponent(reference, IJ2EEModuleConstants.RAR_EXT); - } - else { - aURI = ComponentUtilities.getDeployUriOfComponent(reference, IJ2EEModuleConstants.JAR_EXT); + IVirtualReference reference = webComp.getReference(module.getProject().getName()); + if(reference != null){ + aURI = ComponentUtilities.getDeployUriOfComponent(reference, extension); + } else { + aURI = webComp.getDeployedName() + extension; } } }
diff --git a/plugins/org.eclipse.jst.jee/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.jee/META-INF/MANIFEST.MF index 6241e08..1f21a42 100644 --- a/plugins/org.eclipse.jst.jee/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.jee/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.jst.jee;singleton:=true -Bundle-Version: 1.0.2.qualifier +Bundle-Version: 1.0.3.qualifier Bundle-Activator: org.eclipse.jst.jee.JEEPlugin Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", org.eclipse.wst.common.project.facet.core;bundle-version="[1.2.0,1.3.0)",
diff --git a/plugins/org.eclipse.jst.jee/earproject/org/eclipse/jst/jee/internal/deployables/JEEDeployableFactory.java b/plugins/org.eclipse.jst.jee/earproject/org/eclipse/jst/jee/internal/deployables/JEEDeployableFactory.java index 31e346e..64f7010 100644 --- a/plugins/org.eclipse.jst.jee/earproject/org/eclipse/jst/jee/internal/deployables/JEEDeployableFactory.java +++ b/plugins/org.eclipse.jst.jee/earproject/org/eclipse/jst/jee/internal/deployables/JEEDeployableFactory.java
@@ -49,7 +49,7 @@ public class JEEDeployableFactory extends ProjectModuleFactoryDelegate { protected Map moduleDelegates = new HashMap(5); - public static final String ID = "org.eclipse.jst.j2ee.server"; //$NON-NLS-1$ + public static final String ID = "org.eclipse.jst.jee.server"; //$NON-NLS-1$ public JEEDeployableFactory() { super();