[518384] Update the webtools.javaee model code for Java EE 8 This patch updates the model code in the webtools.javaee component for Java EE 8. Since there were relatively minor changes to the schemas between EE 7 and 8, the model only had minor updates. Signed-off-by: John Collier <John.J.Collier@ibm.com>

diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/metadata/ApplicationPackage.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/metadata/ApplicationPackage.java
index 7c34652..f47e685 100644
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/metadata/ApplicationPackage.java
+++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/metadata/ApplicationPackage.java

@@ -36,7 +36,7 @@
  *     
  * 
  *       [
- *       This is the XML Schema for the application 7 deployment
+ *       This is the XML Schema for the application 8 deployment
  *       descriptor.  The deployment descriptor must be named
  *       "META-INF/application.xml" in the application's ear file.
  *       All application deployment descriptors must indicate
@@ -50,8 +50,8 @@
  *       <application xmlns="http://xmlns.jcp.org/xml/ns/javaee"
  *       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  *       xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee 
- *       	http://xmlns.jcp.org/xml/ns/javaee/application_7.xsd"
- *       version="7">
+ *       	http://xmlns.jcp.org/xml/ns/javaee/application_8.xsd"
+ *       version="8">
  *       ...
  *       </application>
  *       
@@ -59,7 +59,7 @@
  *       the schema using the xsi:schemaLocation attribute for Java EE
  *       namespace with the following location:
  *       
- *       http://xmlns.jcp.org/xml/ns/javaee/application_7.xsd
+ *       http://xmlns.jcp.org/xml/ns/javaee/application_8.xsd
  *       
  *       
  *     
@@ -291,7 +291,7 @@
 	String eNS_URI = J2EEConstants.APPLICATION_SCHEMA_LOC_5;
 	String eNS_URI2 = J2EEConstants.APPLICATION_SCHEMA_LOC_6;
 	String eNS_URI3 = J2EEConstants.APPLICATION_SCHEMA_LOC_7;
-
+	String eNS_URI4 = J2EEConstants.APPLICATION_SCHEMA_LOC_8;
 	/**
 	 * The package namespace name.
 	 * <!-- begin-user-doc -->

diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/ApplicationClient.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/ApplicationClient.java
index 0b5ae92..718d6fa 100644
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/ApplicationClient.java
+++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/ApplicationClient.java

@@ -39,6 +39,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getModuleName <em>Module Name</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getDescriptions <em>Descriptions</em>}</li>
@@ -65,7 +66,6 @@
  *   <li>{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#isMetadataComplete <em>Metadata Complete</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getVersion <em>Version</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage#getApplicationClient()
  * @extends JavaEEObject
@@ -523,13 +523,13 @@
 
 	/**
 	 * Returns the value of the '<em><b>Version</b></em>' attribute.
-	 * The default value is <code>"7"</code>.
+	 * The default value is <code>"8"</code>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
 	 * 
 	 * 
-	 *           The required value for the version is 7.
+	 *           The required value for the version is 8.
 	 *           
 	 *         
 	 * <!-- end-model-doc -->

diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/impl/ApplicationClientImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/impl/ApplicationClientImpl.java
index 9b011f7..8cd61fb 100644
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/impl/ApplicationClientImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/impl/ApplicationClientImpl.java

@@ -56,6 +56,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientImpl#getModuleName <em>Module Name</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientImpl#getDescriptions <em>Descriptions</em>}</li>
@@ -82,7 +83,6 @@
  *   <li>{@link org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientImpl#isMetadataComplete <em>Metadata Complete</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientImpl#getVersion <em>Version</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -374,7 +374,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final String VERSION_EDEFAULT = "7"; //$NON-NLS-1$
+	protected static final String VERSION_EDEFAULT = "8"; //$NON-NLS-1$
 
 	/**
 	 * The cached value of the '{@link #getVersion() <em>Version</em>}' attribute.

diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/metadata/ApplicationclientPackage.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/metadata/ApplicationclientPackage.java
index 7a107e3..17aec84 100644
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/metadata/ApplicationclientPackage.java
+++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/metadata/ApplicationclientPackage.java

@@ -36,7 +36,7 @@
  *     
  * 
  *       [
- *       This is the XML Schema for the application client 7
+ *       This is the XML Schema for the application client 8
  *       deployment descriptor.  The deployment descriptor must
  *       be named "META-INF/application-client.xml" in the
  *       application client's jar file.  All application client
@@ -51,8 +51,8 @@
  *       <application-client xmlns="http://xmlns.jcp.org/xml/ns/javaee"
  *       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  *       xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee 
- *       	http://xmlns.jcp.org/xml/ns/javaee/application-client_7.xsd"
- *       version="7">
+ *       	http://xmlns.jcp.org/xml/ns/javaee/application-client_8.xsd"
+ *       version="8">
  *       ...
  *       </application-client>
  *       
@@ -60,7 +60,7 @@
  *       the schema using the xsi:schemaLocation attribute for Java EE
  *       namespace with the following location:
  *       
- *       http://xmlns.jcp.org/xml/ns/javaee/application-client_7.xsd
+ *       http://xmlns.jcp.org/xml/ns/javaee/application-client_8.xsd
  *       
  *       
  *     
@@ -292,7 +292,7 @@
 	String eNS_URI = J2EEConstants.APP_CLIENT_SCHEMA_LOC_5;
 	String eNS_URI2 = J2EEConstants.APP_CLIENT_SCHEMA_LOC_6;
 	String eNS_URI3 = J2EEConstants.APP_CLIENT_SCHEMA_LOC_7;
-
+	String eNS_URI4 = J2EEConstants.APP_CLIENT_SCHEMA_LOC_8;
 	/**
 	 * The package namespace name.
 	 * <!-- begin-user-doc -->

diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/PersistenceContextSynchronizationType.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/PersistenceContextSynchronizationType.java
index 9156553..a386f0e 100644
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/PersistenceContextSynchronizationType.java
+++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/PersistenceContextSynchronizationType.java

@@ -112,6 +112,8 @@
 	 * Returns the '<em><b>Persistence Context Synchronization Type</b></em>' literal with the specified literal value.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * @param literal the literal.

+	 * @return the matching enumerator or <code>null</code>.

 	 * @generated

 	 */

 	public static PersistenceContextSynchronizationType get(String literal) {

@@ -128,6 +130,8 @@
 	 * Returns the '<em><b>Persistence Context Synchronization Type</b></em>' literal with the specified name.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * @param name the name.

+	 * @return the matching enumerator or <code>null</code>.

 	 * @generated

 	 */

 	public static PersistenceContextSynchronizationType getByName(String name) {

@@ -144,6 +148,8 @@
 	 * Returns the '<em><b>Persistence Context Synchronization Type</b></em>' literal with the specified integer value.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * @param value the integer value.

+	 * @return the matching enumerator or <code>null</code>.

 	 * @generated

 	 */

 	public static PersistenceContextSynchronizationType get(int value) {


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 d22868c..cb1ccda 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

@@ -89,7 +89,16 @@
 	 * @generated
 	 * @ordered
 	 */
-	_31(2, "_31", "3.1"); //$NON-NLS-1$ //$NON-NLS-2$
+	_31(2, "_31", "3.1"), //$NON-NLS-1$ //$NON-NLS-2$
+	/**
+	 * The '<em><b>40</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #_40_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	_40(2, "_40", "4.0"); //$NON-NLS-1$ //$NON-NLS-2$
 	/**
 	 * The '<em><b>22</b></em>' literal value.
 	 * <!-- begin-user-doc -->
@@ -169,6 +178,19 @@
 	 * @ordered
 	 */
 	public static final int _31_VALUE = 2;
+	/**
+	 * The '<em><b>31</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
+	 * @generated
+	 * @ordered
+	 */
+	public static final int _40_VALUE = 3;
 
 	/**
 	 * An array of all the '<em><b>App Version Type</b></em>' enumerators.
@@ -184,6 +206,7 @@
 			_25_LITERAL,
 			_30_LITERAL,
 			_31,
+			_40,
 		};
 
 	/**
@@ -240,6 +263,7 @@
 			case _25: return _25_LITERAL;
 			case _30: return _30_LITERAL;
 			case _31_VALUE: return _31;
+			case _40_VALUE: return _40;
 		}
 		return null;
 	}

diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WebAppImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WebAppImpl.java
index 4980ec2..8f04f48 100644
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WebAppImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WebAppImpl.java

@@ -74,6 +74,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getGroup <em>Group</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getModuleName <em>Module Name</em>}</li>
@@ -120,7 +121,6 @@
  *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#isMetadataComplete <em>Metadata Complete</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getVersion <em>Version</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -192,7 +192,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final WebAppVersionType VERSION_EDEFAULT = WebAppVersionType._31;
+	protected static final WebAppVersionType VERSION_EDEFAULT = WebAppVersionType._40;
 
 	/**
 	 * The cached value of the '{@link #getVersion() <em>Version</em>}' attribute.

diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/metadata/WebPackage.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/metadata/WebPackage.java
index 88c1318..f0129f2 100644
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/metadata/WebPackage.java
+++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/metadata/WebPackage.java

@@ -52,7 +52,7 @@
  *       <web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
  *       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  *       xsi:schemaLocation="..."
- *       version="3.1"> 
+ *       version="4.0">
  *       ...
  *       </web-app>
  *       
@@ -60,7 +60,7 @@
  *       the schema using the xsi:schemaLocation attribute for Java EE
  *       namespace with the following location:
  *       
- *       http://xmlns.jcp.org/xml/ns/javaee/web-common_3_1.xsd
+ *       http://xmlns.jcp.org/xml/ns/javaee/web-common_4_0.xsd
  *       
  * 
  *     
@@ -169,7 +169,7 @@
  *    </div>
  *   
  * 
- *    <div xmlns="http://www.w3.org/1999/xhtml" id="usage" xml:id="usage">
+ *    <div id="usage" xml:id="usage" xmlns="http://www.w3.org/1999/xhtml">
  *     <h2>
  *       <a name="usage">About this schema document</a>
  *     </h2>
@@ -215,7 +215,7 @@
  *    </div>
  *   
  * 
- *    <div xmlns="http://www.w3.org/1999/xhtml" id="nsversioning" xml:id="nsversioning">
+ *    <div id="nsversioning" xml:id="nsversioning" xmlns="http://www.w3.org/1999/xhtml">
  *     <h2>
  *       <a name="nsversioning">Versioning policy for this schema document</a>
  *     </h2>
@@ -321,6 +321,7 @@
 	String eNS_URI = J2EEConstants.WEB_APP_SCHEMA_LOC_2_5;
 	String eNS_URI2 = J2EEConstants.WEB_APP_SCHEMA_LOC_3_0;
 	String eNS_URI3 = J2EEConstants.WEB_APP_SCHEMA_LOC_3_1;
+	String eNS_URI4 = J2EEConstants.WEB_APP_SCHEMA_LOC_4_0;
 
 	/**
 	 * The package namespace name.

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 c58094b..c6025ef 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

@@ -49,7 +49,7 @@
  *       <web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
  *       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  *       xsi:schemaLocation="..."
- *       version="3.1"> 
+ *       version="4.0">
  *       ...
  *       </web-app>
  *       
@@ -57,7 +57,7 @@
  *       the schema using the xsi:schemaLocation attribute for Java EE
  *       namespace with the following location:
  *       
- *       http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd
+ *       http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd
  *       
  * 
  *     
@@ -97,7 +97,7 @@
  *       <web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
  *       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  *       xsi:schemaLocation="..."
- *       version="3.1"> 
+ *       version="4.0">
  *       ...
  *       </web-app>
  *       
@@ -105,7 +105,7 @@
  *       the schema using the xsi:schemaLocation attribute for Java EE
  *       namespace with the following location:
  *       
- *       http://xmlns.jcp.org/xml/ns/javaee/web-common_3_1.xsd
+ *       http://xmlns.jcp.org/xml/ns/javaee/web-common_4_0.xsd
  *       
  * 
  *     
@@ -214,7 +214,7 @@
  *    </div>
  *   
  * 
- *    <div xmlns="http://www.w3.org/1999/xhtml" id="usage" xml:id="usage">
+ *    <div id="usage" xml:id="usage" xmlns="http://www.w3.org/1999/xhtml">
  *     <h2>
  *       <a name="usage">About this schema document</a>
  *     </h2>
@@ -260,7 +260,7 @@
  *    </div>
  *   
  * 
- *    <div xmlns="http://www.w3.org/1999/xhtml" id="nsversioning" xml:id="nsversioning">
+ *    <div id="nsversioning" xml:id="nsversioning" xmlns="http://www.w3.org/1999/xhtml">
  *     <h2>
  *       <a name="nsversioning">Versioning policy for this schema document</a>
  *     </h2>
@@ -345,7 +345,7 @@
  * 
  *     
  * <!-- end-model-doc -->
- * @see org.eclipse.jst.javaee.webapp.WebappFactory
+ * @see org.eclipse.jst.javaee.webapp.internal.metadata.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 ac2bc06..73f83c6 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

@@ -34,7 +34,7 @@
  *     
  * 
  *       [
- *       This is the XML Schema for the Servlet 3.1 deployment descriptor.
+ *       This is the XML Schema for the Servlet 4.0 deployment descriptor.
  *       The deployment descriptor must be named "META-INF/web-fragment.xml"
  *       in the web fragment's jar file.  All Servlet deployment descriptors
  *       must indicate the web application schema by using the Java EE
@@ -48,7 +48,7 @@
  *       <web-fragment xmlns="http://xmlns.jcp.org/xml/ns/javaee"
  *       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  *       xsi:schemaLocation="..."
- *       version="3.1"> 
+ *       version="4.0">
  *       ...
  *       </web-fragment>
  *       
@@ -56,7 +56,7 @@
  *       the schema using the xsi:schemaLocation attribute for Java EE
  *       namespace with the following location:
  *       
- *       http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_1.xsd
+ *       http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd
  *       
  *       
  *     
@@ -96,7 +96,7 @@
  *       <web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
  *       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  *       xsi:schemaLocation="..."
- *       version="3.1"> 
+ *       version="4.0">
  *       ...
  *       </web-app>
  *       
@@ -104,7 +104,7 @@
  *       the schema using the xsi:schemaLocation attribute for Java EE
  *       namespace with the following location:
  *       
- *       http://xmlns.jcp.org/xml/ns/javaee/web-common_3_1.xsd
+ *       http://xmlns.jcp.org/xml/ns/javaee/web-common_4_0.xsd
  *       
  * 
  *     
@@ -213,7 +213,7 @@
  *    </div>
  *   
  * 
- *    <div xmlns="http://www.w3.org/1999/xhtml" id="usage" xml:id="usage">
+ *    <div id="usage" xml:id="usage" xmlns="http://www.w3.org/1999/xhtml">
  *     <h2>
  *       <a name="usage">About this schema document</a>
  *     </h2>
@@ -259,7 +259,7 @@
  *    </div>
  *   
  * 
- *    <div xmlns="http://www.w3.org/1999/xhtml" id="nsversioning" xml:id="nsversioning">
+ *    <div id="nsversioning" xml:id="nsversioning" xmlns="http://www.w3.org/1999/xhtml">
  *     <h2>
  *       <a name="nsversioning">Versioning policy for this schema document</a>
  *     </h2>
@@ -362,9 +362,9 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eNS_URI = J2EEConstants.WEBFRAGMENT_SCHEMA_LOC_3_0;
+	String eNS_URI = "http://xmlns.jcp.org/xml/ns/javaee/webfragment"; //$NON-NLS-1$
 	String eNS_URI2 = J2EEConstants.WEBFRAGMENT_SCHEMA_LOC_3_1;
-
+	String eNS_URI3 = J2EEConstants.WEBFRAGMENT_SCHEMA_LOC_4_0;
 	/**
 	 * The package namespace name.
 	 * <!-- begin-user-doc -->

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 a973775..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

@@ -54,6 +54,7 @@
     String APP_CLIENT_SCHEMA_5         =   "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application-client_5.xsd"; //$NON-NLS-1$
     String APP_CLIENT_SCHEMA_6         =   "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application-client_6.xsd"; //$NON-NLS-1$
     String APP_CLIENT_SCHEMA_7         =   "http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/application-client_7.xsd"; //$NON-NLS-1$
+    String APP_CLIENT_SCHEMA_8         =   "http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/application-client_8.xsd"; //$NON-NLS-1$
     
     //Application constants
     /** "Application_ID"                                                                                                    */
@@ -80,6 +81,7 @@
     String APPLICATION_SCHEMA_5         =  "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_5.xsd"; //$NON-NLS-1$
     String APPLICATION_SCHEMA_6         =  "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_6.xsd"; //$NON-NLS-1$ 
     String APPLICATION_SCHEMA_7         =  "http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/application_7.xsd"; //$NON-NLS-1$
+    String APPLICATION_SCHEMA_8         =  "http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/application_8.xsd"; //$NON-NLS-1$
     
     //EJB Jar Constants
     /** "ejb-jar_ID"                                                                                                                */
@@ -121,6 +123,7 @@
     String 	WEBFRAGMENT_DD_SHORT_NAME   =       "web-fragment.xml"; //$NON-NLS-1$
     String  WEBFRAGMENT_SCHEMA_3_0 		= 		"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd"; //$NON-NLS-1$
     String  WEBFRAGMENT_SCHEMA_3_1 		= 		"http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_1.xsd"; //$NON-NLS-1$
+    String  WEBFRAGMENT_SCHEMA_4_0 		= 		"http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd"; //$NON-NLS-1$
     
     //Web app Constants
     /** "WebApp_ID"                                                                                                                 */
@@ -144,6 +147,7 @@
     String WEBAPP_SCHEMA_2_5        =   "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd";//$NON-NLS-1$
     String WEBAPP_SCHEMA_3_0        =   "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";//$NON-NLS-1$
     String WEBAPP_SCHEMA_3_1        =   "http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd";//$NON-NLS-1$
+    String WEBAPP_SCHEMA_4_0        =   "http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd";//$NON-NLS-1$
     /** "WEB-INF/ejb-jar.xml"                                                                                              */
     String EJBJAR_IN_WAR_DD_URI                =   "WEB-INF/ejb-jar.xml"; //$NON-NLS-1$
     //J2C Resource Adapter Constants
@@ -215,10 +219,12 @@
     String APPLICATION_SCHEMA_LOC_5         = "http://java.sun.com/xml/ns/javaee/application_5.xsd"; //$NON-NLS-1$
     String APPLICATION_SCHEMA_LOC_6         = "http://java.sun.com/xml/ns/javaee/application_6.xsd"; //$NON-NLS-1$
     String APPLICATION_SCHEMA_LOC_7         = "http://xmlns.jcp.org/xml/ns/javaee/application_7.xsd"; //$NON-NLS-1$
+    String APPLICATION_SCHEMA_LOC_8         = "http://xmlns.jcp.org/xml/ns/javaee/application_8.xsd"; //$NON-NLS-1$
     String APP_CLIENT_SCHEMA_LOC_1_4        = "http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"; //$NON-NLS-1$
     String APP_CLIENT_SCHEMA_LOC_5          = "http://java.sun.com/xml/ns/javaee/application-client_5.xsd"; //$NON-NLS-1$
     String APP_CLIENT_SCHEMA_LOC_6          = "http://java.sun.com/xml/ns/javaee/application-client_6.xsd"; //$NON-NLS-1$
     String APP_CLIENT_SCHEMA_LOC_7          = "http://xmlns.jcp.org/xml/ns/javaee/application-client_7.xsd"; //$NON-NLS-1$
+    String APP_CLIENT_SCHEMA_LOC_8          = "http://xmlns.jcp.org/xml/ns/javaee/application-client_8.xsd"; //$NON-NLS-1$
     String EJB_JAR_SCHEMA_LOC_2_1           = "http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd"; //$NON-NLS-1$
     String EJB_JAR_SCHEMA_LOC_3_0    		= "http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"; //$NON-NLS-1$
     String EJB_JAR_SCHEMA_LOC_3_1    		= "http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"; //$NON-NLS-1$
@@ -230,11 +236,13 @@
     String WEB_APP_SCHEMA_LOC_2_5           = "http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"; //$NON-NLS-1$
     String WEB_APP_SCHEMA_LOC_3_0           = "http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"; //$NON-NLS-1$
     String WEB_APP_SCHEMA_LOC_3_1           = "http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"; //$NON-NLS-1$
+    String WEB_APP_SCHEMA_LOC_4_0           = "http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"; //$NON-NLS-1$
     String WEB_SERVICES_CLIENT_SCHEMA_LOC_1_1 = "http://www.ibm.com/webservices/xsd/j2ee_web_services_client_1_1.xsd"; //$NON-NLS-1$
     String JSP_SCHEMA_LOC_2_0               =  "http://java.sun.com/xml/ns/j2ee/jsp_2_0.xsd"; //$NON-NLS-1$
     String JSP_SCHEMA_LOC_2_1               =  "http://java.sun.com/xml/ns/javaee/jsp_2_1.xsd"; //$NON-NLS-1$ //EJB3
     String WEBFRAGMENT_SCHEMA_LOC_3_0       = "http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd"; //$NON-NLS-1$ //Web Fragment3
     String WEBFRAGMENT_SCHEMA_LOC_3_1       = "http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_1.xsd"; //$NON-NLS-1$ //Web Fragment3
+    String WEBFRAGMENT_SCHEMA_LOC_4_0       = "http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd"; //$NON-NLS-1$ //Web Fragment4
     
     public static final String EAR_MODEL_NAME = "EAR_VALIDATION"; //$NON-NLS-1$
 }