Merge "[518385] Update artifact wizards for Java EE 8 " into R3_9_maintenance
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 eec203c..ee854c8 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.3.400.qualifier
+Bundle-Version: 1.4.0.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/core/internal/util/JavaEEExtendedMetaData.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/util/JavaEEExtendedMetaData.java
index 2c2c93a..75288d7 100644
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/util/JavaEEExtendedMetaData.java
+++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/util/JavaEEExtendedMetaData.java
@@ -109,7 +109,7 @@
}
else {
uri = J2EEConstants.APPLICATION_SCHEMA_LOC_8;
- javaeeUri = J2EEConstants.JAVAEE8_NS_URL;
+ javaeeUri = J2EEConstants.JAVAEE7_NS_URL;
}
// release the resource to make sure there is no memory leak
resource = null;
@@ -135,7 +135,7 @@
}
else {
uri = J2EEConstants.APP_CLIENT_SCHEMA_LOC_8;
- javaeeUri = J2EEConstants.JAVAEE8_NS_URL;
+ javaeeUri = J2EEConstants.JAVAEE7_NS_URL;
}
// release the resource to make sure there is no memory leak
resource = null;
@@ -204,7 +204,7 @@
}
else {
uri = J2EEConstants.WEB_APP_SCHEMA_LOC_4_0;
- javaeeUri = J2EEConstants.JAVAEE8_NS_URL;
+ javaeeUri = J2EEConstants.JAVAEE7_NS_URL;
}
// release the resource to make sure there is no memory leak
resource = null;
@@ -228,7 +228,7 @@
else
{
uri = J2EEConstants.WEBFRAGMENT_SCHEMA_LOC_4_0;
- javaeeUri = J2EEConstants.JAVAEE8_NS_URL;
+ javaeeUri = J2EEConstants.JAVAEE7_NS_URL;
}
// release the resource to make sure there is no memory leak
resource = null;
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/WebAppVersionType.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/WebAppVersionType.java
index cb1ccda..1a0fdd6 100644
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/WebAppVersionType.java
+++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/WebAppVersionType.java
@@ -179,14 +179,14 @@
*/
public static final int _31_VALUE = 2;
/**
- * The '<em><b>31</b></em>' literal value.
+ * The '<em><b>40</b></em>' literal value.
* <!-- begin-user-doc -->
* <p>
* If the meaning of '<em><b>31</b></em>' literal object isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @see #_31
+ * @see #_40
* @generated
* @ordered
*/
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/webapp/internal/metadata/WebappPackage.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/webapp/internal/metadata/WebappPackage.java
index c6025ef..909cc3f 100644
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/webapp/internal/metadata/WebappPackage.java
+++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/webapp/internal/metadata/WebappPackage.java
@@ -345,7 +345,7 @@
*
*
* <!-- end-model-doc -->
- * @see org.eclipse.jst.javaee.webapp.internal.metadata.WebappFactory
+ * @see org.eclipse.jst.javaee.webapp.WebappFactory
* @generated
*/
public interface WebappPackage extends EPackage {
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/webfragment/internal/metadata/WebfragmentPackage.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/webfragment/internal/metadata/WebfragmentPackage.java
index 73f83c6..143f610 100644
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/webfragment/internal/metadata/WebfragmentPackage.java
+++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/webfragment/internal/metadata/WebfragmentPackage.java
@@ -362,7 +362,7 @@
* <!-- end-user-doc -->
* @generated
*/
- String eNS_URI = "http://xmlns.jcp.org/xml/ns/javaee/webfragment"; //$NON-NLS-1$
+ String eNS_URI = J2EEConstants.WEBFRAGMENT_SCHEMA_LOC_3_0;
String eNS_URI2 = J2EEConstants.WEBFRAGMENT_SCHEMA_LOC_3_1;
String eNS_URI3 = J2EEConstants.WEBFRAGMENT_SCHEMA_LOC_4_0;
/**
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEConstants.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEConstants.java
index 9d49fc6..7ed305c 100644
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEConstants.java
+++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEConstants.java
@@ -212,7 +212,6 @@
String J2EE_NS_URL = "http://java.sun.com/xml/ns/j2ee"; //$NON-NLS-1$
String JAVAEE_NS_URL = "http://java.sun.com/xml/ns/javaee"; //$NON-NLS-1$ //EJB3
String JAVAEE7_NS_URL = "http://xmlns.jcp.org/xml/ns/javaee"; //$NON-NLS-1$
- String JAVAEE8_NS_URL = "http://xmlns.jcp.org/xml/ns/javaee"; //$NON-NLS-1$
String J2EE_1_4_XSD_SHORT_NAME = "j2ee_1_4.xsd"; //$NON-NLS-1$
String JAVAEE_5_XSD_SHORT_NAME = "javaee_5.xsd"; //$NON-NLS-1$ //EJB3
String XSI_NS_URL = "http://www.w3.org/2001/XMLSchema-instance"; //$NON-NLS-1$
diff --git a/plugins/org.eclipse.jst.j2ee.core/pom.xml b/plugins/org.eclipse.jst.j2ee.core/pom.xml
index 920c353..306955d 100644
--- a/plugins/org.eclipse.jst.j2ee.core/pom.xml
+++ b/plugins/org.eclipse.jst.j2ee.core/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.javaee</groupId>
<artifactId>org.eclipse.jst.j2ee.core</artifactId>
- <version>1.3.400-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.jst.j2ee/plugin.xml b/plugins/org.eclipse.jst.j2ee/plugin.xml
index 88c1825..d54bb7a 100644
--- a/plugins/org.eclipse.jst.j2ee/plugin.xml
+++ b/plugins/org.eclipse.jst.j2ee/plugin.xml
@@ -578,7 +578,7 @@
<project-facet-version facet="jst.appclient" version="8.0">
<constraint>
<and>
- <requires facet="jst.java" version="[1.0"/>
+ <requires facet="jst.java" version="[1.8"/>
<conflicts group="modules"/>
</and>
</constraint>
diff --git a/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/Web25ModelProvider.java b/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/Web25ModelProvider.java
index 6c83bd5..09ed1f9 100644
--- a/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/Web25ModelProvider.java
+++ b/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/Web25ModelProvider.java
@@ -78,8 +78,8 @@
}
else
{
- dd.getXMLNSPrefixMap().put("", J2EEConstants.JAVAEE8_NS_URL); //$NON-NLS-1$
- dd.getXSISchemaLocation().put(J2EEConstants.JAVAEE8_NS_URL, J2EEConstants.WEB_APP_SCHEMA_LOC_4_0);
+ dd.getXMLNSPrefixMap().put("", J2EEConstants.JAVAEE7_NS_URL); //$NON-NLS-1$
+ dd.getXSISchemaLocation().put(J2EEConstants.JAVAEE7_NS_URL, J2EEConstants.WEB_APP_SCHEMA_LOC_4_0);
// note that later EMF generations remove the _LITERAL from the enum
war.setVersion(WebAppVersionType._40);
}
diff --git a/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/WebFragment30ModelProvider.java b/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/WebFragment30ModelProvider.java
index a0bff0b..d8326e7 100644
--- a/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/WebFragment30ModelProvider.java
+++ b/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/WebFragment30ModelProvider.java
@@ -75,8 +75,8 @@
}
else
{
- dd.getXMLNSPrefixMap().put("", J2EEConstants.JAVAEE8_NS_URL); //$NON-NLS-1$
- dd.getXSISchemaLocation().put(J2EEConstants.JAVAEE8_NS_URL, J2EEConstants.WEBFRAGMENT_SCHEMA_LOC_4_0);
+ dd.getXMLNSPrefixMap().put("", J2EEConstants.JAVAEE7_NS_URL); //$NON-NLS-1$
+ dd.getXSISchemaLocation().put(J2EEConstants.JAVAEE7_NS_URL, J2EEConstants.WEBFRAGMENT_SCHEMA_LOC_4_0);
// note that later EMF generations remove the _LITERAL from the enum
webFragment.setVersion(WebAppVersionType._40);
}
diff --git a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/model/internal/AppClient5ModelProvider.java b/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/model/internal/AppClient5ModelProvider.java
index d60d9d4..13296d8 100644
--- a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/model/internal/AppClient5ModelProvider.java
+++ b/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/model/internal/AppClient5ModelProvider.java
@@ -74,8 +74,8 @@
client.setVersion(J2EEVersionConstants.VERSION_7_TEXT);
}
else {
- dd.getXMLNSPrefixMap().put("", J2EEConstants.JAVAEE8_NS_URL); //$NON-NLS-1$
- dd.getXSISchemaLocation().put(J2EEConstants.JAVAEE8_NS_URL, J2EEConstants.APP_CLIENT_SCHEMA_LOC_8);
+ dd.getXMLNSPrefixMap().put("", J2EEConstants.JAVAEE7_NS_URL); //$NON-NLS-1$
+ dd.getXSISchemaLocation().put(J2EEConstants.JAVAEE7_NS_URL, J2EEConstants.APP_CLIENT_SCHEMA_LOC_8);
client.setVersion(J2EEVersionConstants.VERSION_8_TEXT);
}
diff --git a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/model/internal/EAR5ModelProvider.java b/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/model/internal/EAR5ModelProvider.java
index 7dcafac..4d22113 100644
--- a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/model/internal/EAR5ModelProvider.java
+++ b/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/model/internal/EAR5ModelProvider.java
@@ -110,8 +110,8 @@
dd.getXSISchemaLocation().put(J2EEConstants.JAVAEE7_NS_URL, J2EEConstants.APPLICATION_SCHEMA_LOC_7);
ear.setVersion(J2EEVersionConstants.VERSION_7_TEXT);
} else {
- dd.getXMLNSPrefixMap().put("", J2EEConstants.JAVAEE8_NS_URL); //$NON-NLS-1$
- dd.getXSISchemaLocation().put(J2EEConstants.JAVAEE8_NS_URL, J2EEConstants.APPLICATION_SCHEMA_LOC_8);
+ dd.getXMLNSPrefixMap().put("", J2EEConstants.JAVAEE7_NS_URL); //$NON-NLS-1$
+ dd.getXSISchemaLocation().put(J2EEConstants.JAVAEE7_NS_URL, J2EEConstants.APPLICATION_SCHEMA_LOC_8);
ear.setVersion(J2EEVersionConstants.VERSION_8_TEXT);
}
