Attachment 149600 Details for Bug 252615 – The Java EE 5 and 6 models - 2 of 3

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] The Java EE 5 and 6 models - 2 of 3

JavaEE6modelsWTP1b.patch (text/plain), 1.11 MB, created by Carl Anderson

on 2009-10-14 17:48:02 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Carl Anderson

Created: 2009-10-14 17:48:02 EDT

Size: 1.11 MB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jst.j2ee.core
>Index: jee-models/org/eclipse/jst/javaee/web/internal/impl/WebResourceCollectionImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WebResourceCollectionImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 WebResourceCollectionImpl.java
>--- jee-models/org/eclipse/jst/javaee/web/internal/impl/WebResourceCollectionImpl.java	9 Jun 2009 19:37:06 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/web/internal/impl/WebResourceCollectionImpl.java	14 Oct 2009 21:47:33 -0000
>@@ -46,6 +46,7 @@
> * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebResourceCollectionImpl#getDescriptions Descriptions}</li>
> * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebResourceCollectionImpl#getUrlPatterns Url Patterns}</li>
> * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebResourceCollectionImpl#getHttpMethods Http Methods}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebResourceCollectionImpl#getHttpMethodOmission Http Method Omission}</li>
> * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebResourceCollectionImpl#getId Id}</li>
> * </ul>
> * 
>@@ -81,7 +82,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList descriptions = null;
>+	protected EList<Description> descriptions;
> 
> 	/**
> 	 * The cached value of the '{@link #getUrlPatterns() Url Patterns}' containment reference list.
>@@ -91,7 +92,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList urlPatterns = null;
>+	protected EList<UrlPatternType> urlPatterns;
> 
> 	/**
> 	 * The cached value of the '{@link #getHttpMethods() Http Methods}' attribute list.
>@@ -101,7 +102,17 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList httpMethods = null;
>+	protected EList<String> httpMethods;
>+
>+	/**
>+	 * The cached value of the '{@link #getHttpMethodOmission() Http Method Omission}' attribute list.
>+	 * 
>+	 * 
>+	 * @see #getHttpMethodOmission()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<String> httpMethodOmission;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -168,9 +179,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDescriptions() {
>+	public List<Description> getDescriptions() {
> 		if (descriptions == null) {
>-			descriptions = new EObjectContainmentEList(Description.class, this, WebPackage.WEB_RESOURCE_COLLECTION__DESCRIPTIONS);
>+			descriptions = new EObjectContainmentEList<Description>(Description.class, this, WebPackage.WEB_RESOURCE_COLLECTION__DESCRIPTIONS);
> 		}
> 		return descriptions;
> 	}
>@@ -180,9 +191,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getUrlPatterns() {
>+	public List<UrlPatternType> getUrlPatterns() {
> 		if (urlPatterns == null) {
>-			urlPatterns = new EObjectContainmentEList(UrlPatternType.class, this, WebPackage.WEB_RESOURCE_COLLECTION__URL_PATTERNS);
>+			urlPatterns = new EObjectContainmentEList<UrlPatternType>(UrlPatternType.class, this, WebPackage.WEB_RESOURCE_COLLECTION__URL_PATTERNS);
> 		}
> 		return urlPatterns;
> 	}
>@@ -192,9 +203,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getHttpMethods() {
>+	public List<String> getHttpMethods() {
> 		if (httpMethods == null) {
>-			httpMethods = new EDataTypeEList(String.class, this, WebPackage.WEB_RESOURCE_COLLECTION__HTTP_METHODS);
>+			httpMethods = new EDataTypeEList<String>(String.class, this, WebPackage.WEB_RESOURCE_COLLECTION__HTTP_METHODS);
> 		}
> 		return httpMethods;
> 	}
>@@ -204,6 +215,18 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public List<String> getHttpMethodOmission() {
>+		if (httpMethodOmission == null) {
>+			httpMethodOmission = new EDataTypeEList<String>(String.class, this, WebPackage.WEB_RESOURCE_COLLECTION__HTTP_METHOD_OMISSION);
>+		}
>+		return httpMethodOmission;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public String getId() {
> 		return id;
> 	}
>@@ -229,9 +252,9 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case WebPackage.WEB_RESOURCE_COLLECTION__DESCRIPTIONS:
>-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
> 			case WebPackage.WEB_RESOURCE_COLLECTION__URL_PATTERNS:
>-				return ((InternalEList)getUrlPatterns()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getUrlPatterns()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -252,6 +275,8 @@
> 				return getUrlPatterns();
> 			case WebPackage.WEB_RESOURCE_COLLECTION__HTTP_METHODS:
> 				return getHttpMethods();
>+			case WebPackage.WEB_RESOURCE_COLLECTION__HTTP_METHOD_OMISSION:
>+				return getHttpMethodOmission();
> 			case WebPackage.WEB_RESOURCE_COLLECTION__ID:
> 				return getId();
> 		}
>@@ -263,6 +288,7 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
>@@ -271,15 +297,19 @@
> 				return;
> 			case WebPackage.WEB_RESOURCE_COLLECTION__DESCRIPTIONS:
> 				getDescriptions().clear();
>-				getDescriptions().addAll((Collection)newValue);
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
> 				return;
> 			case WebPackage.WEB_RESOURCE_COLLECTION__URL_PATTERNS:
> 				getUrlPatterns().clear();
>-				getUrlPatterns().addAll((Collection)newValue);
>+				getUrlPatterns().addAll((Collection<? extends UrlPatternType>)newValue);
> 				return;
> 			case WebPackage.WEB_RESOURCE_COLLECTION__HTTP_METHODS:
> 				getHttpMethods().clear();
>-				getHttpMethods().addAll((Collection)newValue);
>+				getHttpMethods().addAll((Collection<? extends String>)newValue);
>+				return;
>+			case WebPackage.WEB_RESOURCE_COLLECTION__HTTP_METHOD_OMISSION:
>+				getHttpMethodOmission().clear();
>+				getHttpMethodOmission().addAll((Collection<? extends String>)newValue);
> 				return;
> 			case WebPackage.WEB_RESOURCE_COLLECTION__ID:
> 				setId((String)newValue);
>@@ -308,6 +338,9 @@
> 			case WebPackage.WEB_RESOURCE_COLLECTION__HTTP_METHODS:
> 				getHttpMethods().clear();
> 				return;
>+			case WebPackage.WEB_RESOURCE_COLLECTION__HTTP_METHOD_OMISSION:
>+				getHttpMethodOmission().clear();
>+				return;
> 			case WebPackage.WEB_RESOURCE_COLLECTION__ID:
> 				setId(ID_EDEFAULT);
> 				return;
>@@ -331,6 +364,8 @@
> 				return urlPatterns != null && !urlPatterns.isEmpty();
> 			case WebPackage.WEB_RESOURCE_COLLECTION__HTTP_METHODS:
> 				return httpMethods != null && !httpMethods.isEmpty();
>+			case WebPackage.WEB_RESOURCE_COLLECTION__HTTP_METHOD_OMISSION:
>+				return httpMethodOmission != null && !httpMethodOmission.isEmpty();
> 			case WebPackage.WEB_RESOURCE_COLLECTION__ID:
> 				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
> 		}
>@@ -351,6 +386,8 @@
> 		result.append(webResourceName);
> 		result.append(", httpMethods: "); //$NON-NLS-1$
> 		result.append(httpMethods);
>+		result.append(", httpMethodOmission: "); //$NON-NLS-1$
>+		result.append(httpMethodOmission);
> 		result.append(", id: "); //$NON-NLS-1$
> 		result.append(id);
> 		result.append(')');
>Index: jee-models/org/eclipse/jst/javaee/web/internal/impl/FilterImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/FilterImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 FilterImpl.java
>--- jee-models/org/eclipse/jst/javaee/web/internal/impl/FilterImpl.java	9 Jun 2009 19:37:06 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/web/internal/impl/FilterImpl.java	14 Oct 2009 21:47:32 -0000
>@@ -48,6 +48,7 @@
> * <li>{@link org.eclipse.jst.javaee.web.internal.impl.FilterImpl#getIcons Icons}</li>
> * <li>{@link org.eclipse.jst.javaee.web.internal.impl.FilterImpl#getFilterName Filter Name}</li>
> * <li>{@link org.eclipse.jst.javaee.web.internal.impl.FilterImpl#getFilterClass Filter Class}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.FilterImpl#isAsyncSupported Async Supported}</li>
> * <li>{@link org.eclipse.jst.javaee.web.internal.impl.FilterImpl#getInitParams Init Params}</li>
> * <li>{@link org.eclipse.jst.javaee.web.internal.impl.FilterImpl#getId Id}</li>
> * </ul>
>@@ -64,7 +65,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList descriptions = null;
>+	protected EList<Description> descriptions;
> 
> 	/**
> 	 * The cached value of the '{@link #getDisplayNames() Display Names}' containment reference list.
>@@ -74,7 +75,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList displayNames = null;
>+	protected EList<DisplayName> displayNames;
> 
> 	/**
> 	 * The cached value of the '{@link #getIcons() Icons}' containment reference list.
>@@ -84,7 +85,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList icons = null;
>+	protected EList<Icon> icons;
> 
> 	/**
> 	 * The default value of the '{@link #getFilterName() Filter Name}' attribute.
>@@ -127,6 +128,35 @@
> 	protected String filterClass = FILTER_CLASS_EDEFAULT;
> 
> 	/**
>+	 * The default value of the '{@link #isAsyncSupported() Async Supported}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isAsyncSupported()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final boolean ASYNC_SUPPORTED_EDEFAULT = false;
>+
>+	/**
>+	 * The cached value of the '{@link #isAsyncSupported() Async Supported}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isAsyncSupported()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean asyncSupported = ASYNC_SUPPORTED_EDEFAULT;
>+
>+	/**
>+	 * This is true if the Async Supported attribute has been set.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean asyncSupportedESet;
>+
>+	/**
> 	 * The cached value of the '{@link #getInitParams() Init Params}' containment reference list.
> 	 * 
> 	 * 
>@@ -134,7 +164,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList initParams = null;
>+	protected EList<ParamValue> initParams;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -180,9 +210,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDescriptions() {
>+	public List<Description> getDescriptions() {
> 		if (descriptions == null) {
>-			descriptions = new EObjectContainmentEList(Description.class, this, WebPackage.FILTER__DESCRIPTIONS);
>+			descriptions = new EObjectContainmentEList<Description>(Description.class, this, WebPackage.FILTER__DESCRIPTIONS);
> 		}
> 		return descriptions;
> 	}
>@@ -192,9 +222,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDisplayNames() {
>+	public List<DisplayName> getDisplayNames() {
> 		if (displayNames == null) {
>-			displayNames = new EObjectContainmentEList(DisplayName.class, this, WebPackage.FILTER__DISPLAY_NAMES);
>+			displayNames = new EObjectContainmentEList<DisplayName>(DisplayName.class, this, WebPackage.FILTER__DISPLAY_NAMES);
> 		}
> 		return displayNames;
> 	}
>@@ -204,9 +234,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getIcons() {
>+	public List<Icon> getIcons() {
> 		if (icons == null) {
>-			icons = new EObjectContainmentEList(Icon.class, this, WebPackage.FILTER__ICONS);
>+			icons = new EObjectContainmentEList<Icon>(Icon.class, this, WebPackage.FILTER__ICONS);
> 		}
> 		return icons;
> 	}
>@@ -258,9 +288,55 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getInitParams() {
>+	public boolean isAsyncSupported() {
>+		return asyncSupported;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setAsyncSupported(boolean newAsyncSupported) {
>+		boolean oldAsyncSupported = asyncSupported;
>+		asyncSupported = newAsyncSupported;
>+		boolean oldAsyncSupportedESet = asyncSupportedESet;
>+		asyncSupportedESet = true;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.FILTER__ASYNC_SUPPORTED, oldAsyncSupported, asyncSupported, !oldAsyncSupportedESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void unsetAsyncSupported() {
>+		boolean oldAsyncSupported = asyncSupported;
>+		boolean oldAsyncSupportedESet = asyncSupportedESet;
>+		asyncSupported = ASYNC_SUPPORTED_EDEFAULT;
>+		asyncSupportedESet = false;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.UNSET, WebPackage.FILTER__ASYNC_SUPPORTED, oldAsyncSupported, ASYNC_SUPPORTED_EDEFAULT, oldAsyncSupportedESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isSetAsyncSupported() {
>+		return asyncSupportedESet;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<ParamValue> getInitParams() {
> 		if (initParams == null) {
>-			initParams = new EObjectContainmentEList(ParamValue.class, this, WebPackage.FILTER__INIT_PARAMS);
>+			initParams = new EObjectContainmentEList<ParamValue>(ParamValue.class, this, WebPackage.FILTER__INIT_PARAMS);
> 		}
> 		return initParams;
> 	}
>@@ -295,13 +371,13 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case WebPackage.FILTER__DESCRIPTIONS:
>-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
> 			case WebPackage.FILTER__DISPLAY_NAMES:
>-				return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDisplayNames()).basicRemove(otherEnd, msgs);
> 			case WebPackage.FILTER__ICONS:
>-				return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getIcons()).basicRemove(otherEnd, msgs);
> 			case WebPackage.FILTER__INIT_PARAMS:
>-				return ((InternalEList)getInitParams()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getInitParams()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -324,6 +400,8 @@
> 				return getFilterName();
> 			case WebPackage.FILTER__FILTER_CLASS:
> 				return getFilterClass();
>+			case WebPackage.FILTER__ASYNC_SUPPORTED:
>+				return isAsyncSupported();
> 			case WebPackage.FILTER__INIT_PARAMS:
> 				return getInitParams();
> 			case WebPackage.FILTER__ID:
>@@ -337,20 +415,21 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case WebPackage.FILTER__DESCRIPTIONS:
> 				getDescriptions().clear();
>-				getDescriptions().addAll((Collection)newValue);
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
> 				return;
> 			case WebPackage.FILTER__DISPLAY_NAMES:
> 				getDisplayNames().clear();
>-				getDisplayNames().addAll((Collection)newValue);
>+				getDisplayNames().addAll((Collection<? extends DisplayName>)newValue);
> 				return;
> 			case WebPackage.FILTER__ICONS:
> 				getIcons().clear();
>-				getIcons().addAll((Collection)newValue);
>+				getIcons().addAll((Collection<? extends Icon>)newValue);
> 				return;
> 			case WebPackage.FILTER__FILTER_NAME:
> 				setFilterName((String)newValue);
>@@ -358,9 +437,12 @@
> 			case WebPackage.FILTER__FILTER_CLASS:
> 				setFilterClass((String)newValue);
> 				return;
>+			case WebPackage.FILTER__ASYNC_SUPPORTED:
>+				setAsyncSupported((Boolean)newValue);
>+				return;
> 			case WebPackage.FILTER__INIT_PARAMS:
> 				getInitParams().clear();
>-				getInitParams().addAll((Collection)newValue);
>+				getInitParams().addAll((Collection<? extends ParamValue>)newValue);
> 				return;
> 			case WebPackage.FILTER__ID:
> 				setId((String)newValue);
>@@ -392,6 +474,9 @@
> 			case WebPackage.FILTER__FILTER_CLASS:
> 				setFilterClass(FILTER_CLASS_EDEFAULT);
> 				return;
>+			case WebPackage.FILTER__ASYNC_SUPPORTED:
>+				unsetAsyncSupported();
>+				return;
> 			case WebPackage.FILTER__INIT_PARAMS:
> 				getInitParams().clear();
> 				return;
>@@ -420,6 +505,8 @@
> 				return FILTER_NAME_EDEFAULT == null ? filterName != null : !FILTER_NAME_EDEFAULT.equals(filterName);
> 			case WebPackage.FILTER__FILTER_CLASS:
> 				return FILTER_CLASS_EDEFAULT == null ? filterClass != null : !FILTER_CLASS_EDEFAULT.equals(filterClass);
>+			case WebPackage.FILTER__ASYNC_SUPPORTED:
>+				return isSetAsyncSupported();
> 			case WebPackage.FILTER__INIT_PARAMS:
> 				return initParams != null && !initParams.isEmpty();
> 			case WebPackage.FILTER__ID:
>@@ -442,6 +529,8 @@
> 		result.append(filterName);
> 		result.append(", filterClass: "); //$NON-NLS-1$
> 		result.append(filterClass);
>+		result.append(", asyncSupported: "); //$NON-NLS-1$
>+		if (asyncSupportedESet) result.append(asyncSupported); else result.append("<unset>"); //$NON-NLS-1$
> 		result.append(", id: "); //$NON-NLS-1$
> 		result.append(id);
> 		result.append(')');
>Index: jee-models/org/eclipse/jst/javaee/web/internal/impl/SessionConfigImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/SessionConfigImpl.java,v
>retrieving revision 1.4
>diff -u -r1.4 SessionConfigImpl.java
>--- jee-models/org/eclipse/jst/javaee/web/internal/impl/SessionConfigImpl.java	9 Jun 2009 19:37:06 -0000	1.4
>+++ jee-models/org/eclipse/jst/javaee/web/internal/impl/SessionConfigImpl.java	14 Oct 2009 21:47:32 -0000
>@@ -12,15 +12,23 @@
> 
> import java.math.BigInteger;
> 
>+import java.util.Collection;
>+import java.util.List;
> import org.eclipse.emf.common.notify.Notification;
> 
>+import org.eclipse.emf.common.notify.NotificationChain;
>+import org.eclipse.emf.common.util.EList;
> import org.eclipse.emf.ecore.EClass;
> 
>+import org.eclipse.emf.ecore.InternalEObject;
> import org.eclipse.emf.ecore.impl.ENotificationImpl;
> import org.eclipse.emf.ecore.impl.EObjectImpl;
> 
>+import org.eclipse.emf.ecore.util.EDataTypeEList;
>+import org.eclipse.jst.javaee.web.CookieConfigType;
> import org.eclipse.jst.javaee.web.SessionConfig;
> 
>+import org.eclipse.jst.javaee.web.TrackingModeType;
> import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
> 
> /**
>@@ -31,6 +39,8 @@
> * The following features are implemented:
> * <ul>
> * <li>{@link org.eclipse.jst.javaee.web.internal.impl.SessionConfigImpl#getSessionTimeout Session Timeout}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.SessionConfigImpl#getCookieConfig Cookie Config}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.SessionConfigImpl#getTrackingMode Tracking Mode}</li>
> * <li>{@link org.eclipse.jst.javaee.web.internal.impl.SessionConfigImpl#getId Id}</li>
> * </ul>
> * 
>@@ -59,6 +69,26 @@
> 	protected BigInteger sessionTimeout = SESSION_TIMEOUT_EDEFAULT;
> 
> 	/**
>+	 * The cached value of the '{@link #getCookieConfig() Cookie Config}' containment reference.
>+	 * 
>+	 * 
>+	 * @see #getCookieConfig()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected CookieConfigType cookieConfig;
>+
>+	/**
>+	 * The cached value of the '{@link #getTrackingMode() Tracking Mode}' attribute list.
>+	 * 
>+	 * 
>+	 * @see #getTrackingMode()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<TrackingModeType> trackingMode;
>+
>+	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
> 	 * 
> 	 * 
>@@ -123,6 +153,61 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public CookieConfigType getCookieConfig() {
>+		return cookieConfig;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public NotificationChain basicSetCookieConfig(CookieConfigType newCookieConfig, NotificationChain msgs) {
>+		CookieConfigType oldCookieConfig = cookieConfig;
>+		cookieConfig = newCookieConfig;
>+		if (eNotificationRequired()) {
>+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WebPackage.SESSION_CONFIG__COOKIE_CONFIG, oldCookieConfig, newCookieConfig);
>+			if (msgs == null) msgs = notification; else msgs.add(notification);
>+		}
>+		return msgs;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setCookieConfig(CookieConfigType newCookieConfig) {
>+		if (newCookieConfig != cookieConfig) {
>+			NotificationChain msgs = null;
>+			if (cookieConfig != null)
>+				msgs = ((InternalEObject)cookieConfig).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WebPackage.SESSION_CONFIG__COOKIE_CONFIG, null, msgs);
>+			if (newCookieConfig != null)
>+				msgs = ((InternalEObject)newCookieConfig).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WebPackage.SESSION_CONFIG__COOKIE_CONFIG, null, msgs);
>+			msgs = basicSetCookieConfig(newCookieConfig, msgs);
>+			if (msgs != null) msgs.dispatch();
>+		}
>+		else if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.SESSION_CONFIG__COOKIE_CONFIG, newCookieConfig, newCookieConfig));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<TrackingModeType> getTrackingMode() {
>+		if (trackingMode == null) {
>+			trackingMode = new EDataTypeEList<TrackingModeType>(TrackingModeType.class, this, WebPackage.SESSION_CONFIG__TRACKING_MODE);
>+		}
>+		return trackingMode;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public String getId() {
> 		return id;
> 	}
>@@ -145,10 +230,28 @@
> 	 * @generated
> 	 */
> 	@Override
>+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
>+		switch (featureID) {
>+			case WebPackage.SESSION_CONFIG__COOKIE_CONFIG:
>+				return basicSetCookieConfig(null, msgs);
>+		}
>+		return super.eInverseRemove(otherEnd, featureID, msgs);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
> 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
> 		switch (featureID) {
> 			case WebPackage.SESSION_CONFIG__SESSION_TIMEOUT:
> 				return getSessionTimeout();
>+			case WebPackage.SESSION_CONFIG__COOKIE_CONFIG:
>+				return getCookieConfig();
>+			case WebPackage.SESSION_CONFIG__TRACKING_MODE:
>+				return getTrackingMode();
> 			case WebPackage.SESSION_CONFIG__ID:
> 				return getId();
> 		}
>@@ -160,6 +263,7 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
>@@ -173,6 +277,13 @@
> 					// do nothing if value is not Integer or BigInteger.
> 				}
> 				return;
>+			case WebPackage.SESSION_CONFIG__COOKIE_CONFIG:
>+				setCookieConfig((CookieConfigType)newValue);
>+				return;
>+			case WebPackage.SESSION_CONFIG__TRACKING_MODE:
>+				getTrackingMode().clear();
>+				getTrackingMode().addAll((Collection<? extends TrackingModeType>)newValue);
>+				return;
> 			case WebPackage.SESSION_CONFIG__ID:
> 				setId((String)newValue);
> 				return;
>@@ -191,6 +302,12 @@
> 			case WebPackage.SESSION_CONFIG__SESSION_TIMEOUT:
> 				setSessionTimeout(SESSION_TIMEOUT_EDEFAULT);
> 				return;
>+			case WebPackage.SESSION_CONFIG__COOKIE_CONFIG:
>+				setCookieConfig((CookieConfigType)null);
>+				return;
>+			case WebPackage.SESSION_CONFIG__TRACKING_MODE:
>+				getTrackingMode().clear();
>+				return;
> 			case WebPackage.SESSION_CONFIG__ID:
> 				setId(ID_EDEFAULT);
> 				return;
>@@ -208,6 +325,10 @@
> 		switch (featureID) {
> 			case WebPackage.SESSION_CONFIG__SESSION_TIMEOUT:
> 				return SESSION_TIMEOUT_EDEFAULT == null ? sessionTimeout != null : !SESSION_TIMEOUT_EDEFAULT.equals(sessionTimeout);
>+			case WebPackage.SESSION_CONFIG__COOKIE_CONFIG:
>+				return cookieConfig != null;
>+			case WebPackage.SESSION_CONFIG__TRACKING_MODE:
>+				return trackingMode != null && !trackingMode.isEmpty();
> 			case WebPackage.SESSION_CONFIG__ID:
> 				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
> 		}
>@@ -226,6 +347,8 @@
> 		StringBuffer result = new StringBuffer(super.toString());
> 		result.append(" (sessionTimeout: "); //$NON-NLS-1$
> 		result.append(sessionTimeout);
>+		result.append(", trackingMode: "); //$NON-NLS-1$
>+		result.append(trackingMode);
> 		result.append(", id: "); //$NON-NLS-1$
> 		result.append(id);
> 		result.append(')');
>Index: jee-models/org/eclipse/jst/javaee/web/internal/impl/LocaleEncodingMappingListImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/LocaleEncodingMappingListImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 LocaleEncodingMappingListImpl.java
>--- jee-models/org/eclipse/jst/javaee/web/internal/impl/LocaleEncodingMappingListImpl.java	9 Jun 2009 19:37:06 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/web/internal/impl/LocaleEncodingMappingListImpl.java	14 Oct 2009 21:47:32 -0000
>@@ -55,7 +55,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList localEncodingMappings = null;
>+	protected EList<LocaleEncodingMapping> localEncodingMappings;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -101,9 +101,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getLocalEncodingMappings() {
>+	public List<LocaleEncodingMapping> getLocalEncodingMappings() {
> 		if (localEncodingMappings == null) {
>-			localEncodingMappings = new EObjectContainmentEList(LocaleEncodingMapping.class, this, WebPackage.LOCALE_ENCODING_MAPPING_LIST__LOCAL_ENCODING_MAPPINGS);
>+			localEncodingMappings = new EObjectContainmentEList<LocaleEncodingMapping>(LocaleEncodingMapping.class, this, WebPackage.LOCALE_ENCODING_MAPPING_LIST__LOCAL_ENCODING_MAPPINGS);
> 		}
> 		return localEncodingMappings;
> 	}
>@@ -138,7 +138,7 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case WebPackage.LOCALE_ENCODING_MAPPING_LIST__LOCAL_ENCODING_MAPPINGS:
>-				return ((InternalEList)getLocalEncodingMappings()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getLocalEncodingMappings()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -164,12 +164,13 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case WebPackage.LOCALE_ENCODING_MAPPING_LIST__LOCAL_ENCODING_MAPPINGS:
> 				getLocalEncodingMappings().clear();
>-				getLocalEncodingMappings().addAll((Collection)newValue);
>+				getLocalEncodingMappings().addAll((Collection<? extends LocaleEncodingMapping>)newValue);
> 				return;
> 			case WebPackage.LOCALE_ENCODING_MAPPING_LIST__ID:
> 				setId((String)newValue);
>Index: jee-models/org/eclipse/jst/javaee/web/internal/impl/FilterMappingImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/FilterMappingImpl.java,v
>retrieving revision 1.4
>diff -u -r1.4 FilterMappingImpl.java
>--- jee-models/org/eclipse/jst/javaee/web/internal/impl/FilterMappingImpl.java	9 Jun 2009 22:38:38 -0000	1.4
>+++ jee-models/org/eclipse/jst/javaee/web/internal/impl/FilterMappingImpl.java	14 Oct 2009 21:47:32 -0000
>@@ -29,6 +29,7 @@
> import org.eclipse.emf.ecore.util.FeatureMap;
> import org.eclipse.emf.ecore.util.InternalEList;
> 
>+import org.eclipse.jst.javaee.core.UrlPatternType;
> import org.eclipse.jst.javaee.web.DispatcherType;
> import org.eclipse.jst.javaee.web.FilterMapping;
> 
>@@ -81,7 +82,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected FeatureMap group = null;
>+	protected FeatureMap group;
> 
> 	/**
> 	 * The cached value of the '{@link #getDispatchers() Dispatchers}' attribute list.
>@@ -91,7 +92,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList dispatchers = null;
>+	protected EList<DispatcherType> dispatchers;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -170,8 +171,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getUrlPatterns() {
>-		return (getGroup()).list(WebPackage.Literals.FILTER_MAPPING__URL_PATTERNS);
>+	public List<UrlPatternType> getUrlPatterns() {
>+		return getGroup().list(WebPackage.Literals.FILTER_MAPPING__URL_PATTERNS);
> 	}
> 
> 	/**
>@@ -179,8 +180,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getServletNames() {
>-		return (getGroup()).list(WebPackage.Literals.FILTER_MAPPING__SERVLET_NAMES);
>+	public List<String> getServletNames() {
>+		return getGroup().list(WebPackage.Literals.FILTER_MAPPING__SERVLET_NAMES);
> 	}
> 
> 	/**
>@@ -188,9 +189,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDispatchers() {
>+	public List<DispatcherType> getDispatchers() {
> 		if (dispatchers == null) {
>-			dispatchers = new EDataTypeEList(DispatcherType.class, this, WebPackage.FILTER_MAPPING__DISPATCHERS);
>+			dispatchers = new EDataTypeEList<DispatcherType>(DispatcherType.class, this, WebPackage.FILTER_MAPPING__DISPATCHERS);
> 		}
> 		return dispatchers;
> 	}
>@@ -225,9 +226,9 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case WebPackage.FILTER_MAPPING__GROUP:
>-				return ((InternalEList)getGroup()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getGroup()).basicRemove(otherEnd, msgs);
> 			case WebPackage.FILTER_MAPPING__URL_PATTERNS:
>-				return ((InternalEList)getUrlPatterns()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getUrlPatterns()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -262,6 +263,7 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
>@@ -273,15 +275,15 @@
> 				return;
> 			case WebPackage.FILTER_MAPPING__URL_PATTERNS:
> 				getUrlPatterns().clear();
>-				getUrlPatterns().addAll((Collection)newValue);
>+				getUrlPatterns().addAll((Collection<? extends UrlPatternType>)newValue);
> 				return;
> 			case WebPackage.FILTER_MAPPING__SERVLET_NAMES:
> 				getServletNames().clear();
>-				getServletNames().addAll((Collection)newValue);
>+				getServletNames().addAll((Collection<? extends String>)newValue);
> 				return;
> 			case WebPackage.FILTER_MAPPING__DISPATCHERS:
> 				getDispatchers().clear();
>-				getDispatchers().addAll((Collection)newValue);
>+				getDispatchers().addAll((Collection<? extends DispatcherType>)newValue);
> 				return;
> 			case WebPackage.FILTER_MAPPING__ID:
> 				setId((String)newValue);
>Index: jee-models/org/eclipse/jst/javaee/web/internal/impl/WebFactoryImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WebFactoryImpl.java,v
>retrieving revision 1.4
>diff -u -r1.4 WebFactoryImpl.java
>--- jee-models/org/eclipse/jst/javaee/web/internal/impl/WebFactoryImpl.java	9 Jun 2009 22:38:39 -0000	1.4
>+++ jee-models/org/eclipse/jst/javaee/web/internal/impl/WebFactoryImpl.java	14 Oct 2009 21:47:32 -0000
>@@ -74,7 +74,13 @@
> 	@Override
> 	public EObject create(EClass eClass) {
> 		switch (eClass.getClassifierID()) {
>+			case WebPackage.ABSOLUTE_ORDERING_TYPE: return (EObject)createAbsoluteOrderingType();
> 			case WebPackage.AUTH_CONSTRAINT: return (EObject)createAuthConstraint();
>+			case WebPackage.COOKIE_COMMENT_TYPE: return (EObject)createCookieCommentType();
>+			case WebPackage.COOKIE_CONFIG_TYPE: return (EObject)createCookieConfigType();
>+			case WebPackage.COOKIE_DOMAIN_TYPE: return (EObject)createCookieDomainType();
>+			case WebPackage.COOKIE_NAME_TYPE: return (EObject)createCookieNameType();
>+			case WebPackage.COOKIE_PATH_TYPE: return (EObject)createCookiePathType();
> 			case WebPackage.ERROR_PAGE: return (EObject)createErrorPage();
> 			case WebPackage.FILTER: return (EObject)createFilter();
> 			case WebPackage.FILTER_MAPPING: return (EObject)createFilterMapping();
>@@ -83,6 +89,10 @@
> 			case WebPackage.LOCALE_ENCODING_MAPPING_LIST: return (EObject)createLocaleEncodingMappingList();
> 			case WebPackage.LOGIN_CONFIG: return (EObject)createLoginConfig();
> 			case WebPackage.MIME_MAPPING: return (EObject)createMimeMapping();
>+			case WebPackage.MULTIPART_CONFIG_TYPE: return (EObject)createMultipartConfigType();
>+			case WebPackage.ORDERING_ORDERING_TYPE: return (EObject)createOrderingOrderingType();
>+			case WebPackage.ORDERING_OTHERS_TYPE: return (EObject)createOrderingOthersType();
>+			case WebPackage.ORDERING_TYPE: return (EObject)createOrderingType();
> 			case WebPackage.SECURITY_CONSTRAINT: return (EObject)createSecurityConstraint();
> 			case WebPackage.SERVLET: return (EObject)createServlet();
> 			case WebPackage.SERVLET_MAPPING: return (EObject)createServletMapping();
>@@ -90,6 +100,7 @@
> 			case WebPackage.USER_DATA_CONSTRAINT: return (EObject)createUserDataConstraint();
> 			case WebPackage.WEB_APP: return (EObject)createWebApp();
> 			case WebPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR: return (EObject)createWebAppDeploymentDescriptor();
>+			case WebPackage.WEB_FRAGMENT: return (EObject)createWebFragment();
> 			case WebPackage.WEB_RESOURCE_COLLECTION: return (EObject)createWebResourceCollection();
> 			case WebPackage.WELCOME_FILE_LIST: return (EObject)createWelcomeFileList();
> 			default:
>@@ -109,6 +120,8 @@
> 				return createDispatcherTypeFromString(eDataType, initialValue);
> 			case WebPackage.NULL_CHAR_TYPE:
> 				return createNullCharTypeFromString(eDataType, initialValue);
>+			case WebPackage.TRACKING_MODE_TYPE:
>+				return createTrackingModeTypeFromString(eDataType, initialValue);
> 			case WebPackage.TRANSPORT_GUARANTEE_TYPE:
> 				return createTransportGuaranteeTypeFromString(eDataType, initialValue);
> 			case WebPackage.WEB_APP_VERSION_TYPE:
>@@ -137,6 +150,8 @@
> 				return createNullCharTypeObjectFromString(eDataType, initialValue);
> 			case WebPackage.SERVLET_NAME_TYPE:
> 				return createServletNameTypeFromString(eDataType, initialValue);
>+			case WebPackage.TRACKING_MODE_TYPE_OBJECT:
>+				return createTrackingModeTypeObjectFromString(eDataType, initialValue);
> 			case WebPackage.TRANSPORT_GUARANTEE_TYPE_OBJECT:
> 				return createTransportGuaranteeTypeObjectFromString(eDataType, initialValue);
> 			case WebPackage.WAR_PATH_TYPE:
>@@ -160,6 +175,8 @@
> 				return convertDispatcherTypeToString(eDataType, instanceValue);
> 			case WebPackage.NULL_CHAR_TYPE:
> 				return convertNullCharTypeToString(eDataType, instanceValue);
>+			case WebPackage.TRACKING_MODE_TYPE:
>+				return convertTrackingModeTypeToString(eDataType, instanceValue);
> 			case WebPackage.TRANSPORT_GUARANTEE_TYPE:
> 				return convertTransportGuaranteeTypeToString(eDataType, instanceValue);
> 			case WebPackage.WEB_APP_VERSION_TYPE:
>@@ -188,6 +205,8 @@
> 				return convertNullCharTypeObjectToString(eDataType, instanceValue);
> 			case WebPackage.SERVLET_NAME_TYPE:
> 				return convertServletNameTypeToString(eDataType, instanceValue);
>+			case WebPackage.TRACKING_MODE_TYPE_OBJECT:
>+				return convertTrackingModeTypeObjectToString(eDataType, instanceValue);
> 			case WebPackage.TRANSPORT_GUARANTEE_TYPE_OBJECT:
> 				return convertTransportGuaranteeTypeObjectToString(eDataType, instanceValue);
> 			case WebPackage.WAR_PATH_TYPE:
>@@ -204,6 +223,16 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public AbsoluteOrderingType createAbsoluteOrderingType() {
>+		AbsoluteOrderingTypeImpl absoluteOrderingType = new AbsoluteOrderingTypeImpl();
>+		return absoluteOrderingType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public AuthConstraint createAuthConstraint() {
> 		AuthConstraintImpl authConstraint = new AuthConstraintImpl();
> 		return authConstraint;
>@@ -214,6 +243,56 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public CookieCommentType createCookieCommentType() {
>+		CookieCommentTypeImpl cookieCommentType = new CookieCommentTypeImpl();
>+		return cookieCommentType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public CookieConfigType createCookieConfigType() {
>+		CookieConfigTypeImpl cookieConfigType = new CookieConfigTypeImpl();
>+		return cookieConfigType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public CookieDomainType createCookieDomainType() {
>+		CookieDomainTypeImpl cookieDomainType = new CookieDomainTypeImpl();
>+		return cookieDomainType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public CookieNameType createCookieNameType() {
>+		CookieNameTypeImpl cookieNameType = new CookieNameTypeImpl();
>+		return cookieNameType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public CookiePathType createCookiePathType() {
>+		CookiePathTypeImpl cookiePathType = new CookiePathTypeImpl();
>+		return cookiePathType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public ErrorPage createErrorPage() {
> 		ErrorPageImpl errorPage = new ErrorPageImpl();
> 		return errorPage;
>@@ -294,6 +373,46 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public MultipartConfigType createMultipartConfigType() {
>+		MultipartConfigTypeImpl multipartConfigType = new MultipartConfigTypeImpl();
>+		return multipartConfigType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public OrderingOrderingType createOrderingOrderingType() {
>+		OrderingOrderingTypeImpl orderingOrderingType = new OrderingOrderingTypeImpl();
>+		return orderingOrderingType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public OrderingOthersType createOrderingOthersType() {
>+		OrderingOthersTypeImpl orderingOthersType = new OrderingOthersTypeImpl();
>+		return orderingOthersType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public OrderingType createOrderingType() {
>+		OrderingTypeImpl orderingType = new OrderingTypeImpl();
>+		return orderingType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public SecurityConstraint createSecurityConstraint() {
> 		SecurityConstraintImpl securityConstraint = new SecurityConstraintImpl();
> 		return securityConstraint;
>@@ -364,6 +483,16 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public WebFragment createWebFragment() {
>+		WebFragmentImpl webFragment = new WebFragmentImpl();
>+		return webFragment;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public WebResourceCollection createWebResourceCollection() {
> 		WebResourceCollectionImpl webResourceCollection = new WebResourceCollectionImpl();
> 		return webResourceCollection;
>@@ -424,6 +553,26 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public TrackingModeType createTrackingModeTypeFromString(EDataType eDataType, String initialValue) {
>+		TrackingModeType result = TrackingModeType.get(initialValue);
>+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
>+		return result;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String convertTrackingModeTypeToString(EDataType eDataType, Object instanceValue) {
>+		return instanceValue == null ? null : instanceValue.toString();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public TransportGuaranteeType createTransportGuaranteeTypeFromString(EDataType eDataType, String initialValue) {
> 		TransportGuaranteeType result = TransportGuaranteeType.get(initialValue);
> 		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
>@@ -721,6 +870,24 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public TrackingModeType createTrackingModeTypeObjectFromString(EDataType eDataType, String initialValue) {
>+		return createTrackingModeTypeFromString(WebPackage.Literals.TRACKING_MODE_TYPE, initialValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String convertTrackingModeTypeObjectToString(EDataType eDataType, Object instanceValue) {
>+		return convertTrackingModeTypeToString(WebPackage.Literals.TRACKING_MODE_TYPE, instanceValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public TransportGuaranteeType createTransportGuaranteeTypeObjectFromString(EDataType eDataType, String initialValue) {
> 		return createTransportGuaranteeTypeFromString(WebPackage.Literals.TRANSPORT_GUARANTEE_TYPE, initialValue);
> 	}
>@@ -785,6 +952,7 @@
> 	 * @deprecated
> 	 * @generated
> 	 */
>+	@Deprecated
> 	public static WebPackage getPackage() {
> 		return WebPackage.eINSTANCE;
> 	}
>Index: jee-models/org/eclipse/jst/javaee/web/internal/impl/AuthConstraintImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/AuthConstraintImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 AuthConstraintImpl.java
>--- jee-models/org/eclipse/jst/javaee/web/internal/impl/AuthConstraintImpl.java	9 Jun 2009 19:37:06 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/web/internal/impl/AuthConstraintImpl.java	14 Oct 2009 21:47:32 -0000
>@@ -58,7 +58,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList descriptions = null;
>+	protected EList<Description> descriptions;
> 
> 	/**
> 	 * The cached value of the '{@link #getRoleNames() Role Names}' attribute list.
>@@ -68,7 +68,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList roleNames = null;
>+	protected EList<String> roleNames;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -114,9 +114,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDescriptions() {
>+	public List<Description> getDescriptions() {
> 		if (descriptions == null) {
>-			descriptions = new EObjectContainmentEList(Description.class, this, WebPackage.AUTH_CONSTRAINT__DESCRIPTIONS);
>+			descriptions = new EObjectContainmentEList<Description>(Description.class, this, WebPackage.AUTH_CONSTRAINT__DESCRIPTIONS);
> 		}
> 		return descriptions;
> 	}
>@@ -126,9 +126,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getRoleNames() {
>+	public List<String> getRoleNames() {
> 		if (roleNames == null) {
>-			roleNames = new EDataTypeEList(String.class, this, WebPackage.AUTH_CONSTRAINT__ROLE_NAMES);
>+			roleNames = new EDataTypeEList<String>(String.class, this, WebPackage.AUTH_CONSTRAINT__ROLE_NAMES);
> 		}
> 		return roleNames;
> 	}
>@@ -163,7 +163,7 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case WebPackage.AUTH_CONSTRAINT__DESCRIPTIONS:
>-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -191,16 +191,17 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case WebPackage.AUTH_CONSTRAINT__DESCRIPTIONS:
> 				getDescriptions().clear();
>-				getDescriptions().addAll((Collection)newValue);
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
> 				return;
> 			case WebPackage.AUTH_CONSTRAINT__ROLE_NAMES:
> 				getRoleNames().clear();
>-				getRoleNames().addAll((Collection)newValue);
>+				getRoleNames().addAll((Collection<? extends String>)newValue);
> 				return;
> 			case WebPackage.AUTH_CONSTRAINT__ID:
> 				setId((String)newValue);
>Index: jee-models/org/eclipse/jst/javaee/web/internal/impl/ServletImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/ServletImpl.java,v
>retrieving revision 1.4
>diff -u -r1.4 ServletImpl.java
>--- jee-models/org/eclipse/jst/javaee/web/internal/impl/ServletImpl.java	9 Jun 2009 22:38:39 -0000	1.4
>+++ jee-models/org/eclipse/jst/javaee/web/internal/impl/ServletImpl.java	14 Oct 2009 21:47:32 -0000
>@@ -34,6 +34,7 @@
> import org.eclipse.jst.javaee.core.RunAs;
> import org.eclipse.jst.javaee.core.SecurityRoleRef;
> 
>+import org.eclipse.jst.javaee.web.MultipartConfigType;
> import org.eclipse.jst.javaee.web.Servlet;
> 
> import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
>@@ -53,8 +54,11 @@
> * <li>{@link org.eclipse.jst.javaee.web.internal.impl.ServletImpl#getJspFile Jsp File}</li>
> * <li>{@link org.eclipse.jst.javaee.web.internal.impl.ServletImpl#getInitParams Init Params}</li>
> * <li>{@link org.eclipse.jst.javaee.web.internal.impl.ServletImpl#getLoadOnStartup Load On Startup}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.ServletImpl#isEnabled Enabled}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.ServletImpl#isAsyncSupported Async Supported}</li>
> * <li>{@link org.eclipse.jst.javaee.web.internal.impl.ServletImpl#getRunAs Run As}</li>
> * <li>{@link org.eclipse.jst.javaee.web.internal.impl.ServletImpl#getSecurityRoleRefs Security Role Refs}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.ServletImpl#getMultipartConfig Multipart Config}</li>
> * <li>{@link org.eclipse.jst.javaee.web.internal.impl.ServletImpl#getId Id}</li>
> * </ul>
> * 
>@@ -70,7 +74,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList descriptions = null;
>+	protected EList<Description> descriptions;
> 
> 	/**
> 	 * The cached value of the '{@link #getDisplayNames() Display Names}' containment reference list.
>@@ -80,7 +84,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList displayNames = null;
>+	protected EList<DisplayName> displayNames;
> 
> 	/**
> 	 * The cached value of the '{@link #getIcons() Icons}' containment reference list.
>@@ -90,7 +94,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList icons = null;
>+	protected EList<Icon> icons;
> 
> 	/**
> 	 * The default value of the '{@link #getServletName() Servlet Name}' attribute.
>@@ -160,7 +164,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList initParams = null;
>+	protected EList<ParamValue> initParams;
> 
> 	/**
> 	 * The default value of the '{@link #getLoadOnStartup() Load On Startup}' attribute.
>@@ -183,6 +187,64 @@
> 	protected Object loadOnStartup = LOAD_ON_STARTUP_EDEFAULT;
> 
> 	/**
>+	 * The default value of the '{@link #isEnabled() Enabled}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isEnabled()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final boolean ENABLED_EDEFAULT = false;
>+
>+	/**
>+	 * The cached value of the '{@link #isEnabled() Enabled}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isEnabled()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean enabled = ENABLED_EDEFAULT;
>+
>+	/**
>+	 * This is true if the Enabled attribute has been set.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean enabledESet;
>+
>+	/**
>+	 * The default value of the '{@link #isAsyncSupported() Async Supported}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isAsyncSupported()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final boolean ASYNC_SUPPORTED_EDEFAULT = false;
>+
>+	/**
>+	 * The cached value of the '{@link #isAsyncSupported() Async Supported}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isAsyncSupported()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean asyncSupported = ASYNC_SUPPORTED_EDEFAULT;
>+
>+	/**
>+	 * This is true if the Async Supported attribute has been set.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean asyncSupportedESet;
>+
>+	/**
> 	 * The cached value of the '{@link #getRunAs() Run As}' containment reference.
> 	 * 
> 	 * 
>@@ -190,7 +252,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected RunAs runAs = null;
>+	protected RunAs runAs;
> 
> 	/**
> 	 * The cached value of the '{@link #getSecurityRoleRefs() Security Role Refs}' containment reference list.
>@@ -200,7 +262,17 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList securityRoleRefs = null;
>+	protected EList<SecurityRoleRef> securityRoleRefs;
>+
>+	/**
>+	 * The cached value of the '{@link #getMultipartConfig() Multipart Config}' containment reference.
>+	 * 
>+	 * 
>+	 * @see #getMultipartConfig()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected MultipartConfigType multipartConfig;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -246,9 +318,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDescriptions() {
>+	public List<Description> getDescriptions() {
> 		if (descriptions == null) {
>-			descriptions = new EObjectContainmentEList(Description.class, this, WebPackage.SERVLET__DESCRIPTIONS);
>+			descriptions = new EObjectContainmentEList<Description>(Description.class, this, WebPackage.SERVLET__DESCRIPTIONS);
> 		}
> 		return descriptions;
> 	}
>@@ -258,9 +330,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDisplayNames() {
>+	public List<DisplayName> getDisplayNames() {
> 		if (displayNames == null) {
>-			displayNames = new EObjectContainmentEList(DisplayName.class, this, WebPackage.SERVLET__DISPLAY_NAMES);
>+			displayNames = new EObjectContainmentEList<DisplayName>(DisplayName.class, this, WebPackage.SERVLET__DISPLAY_NAMES);
> 		}
> 		return displayNames;
> 	}
>@@ -270,9 +342,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getIcons() {
>+	public List<Icon> getIcons() {
> 		if (icons == null) {
>-			icons = new EObjectContainmentEList(Icon.class, this, WebPackage.SERVLET__ICONS);
>+			icons = new EObjectContainmentEList<Icon>(Icon.class, this, WebPackage.SERVLET__ICONS);
> 		}
> 		return icons;
> 	}
>@@ -345,9 +417,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getInitParams() {
>+	public List<ParamValue> getInitParams() {
> 		if (initParams == null) {
>-			initParams = new EObjectContainmentEList(ParamValue.class, this, WebPackage.SERVLET__INIT_PARAMS);
>+			initParams = new EObjectContainmentEList<ParamValue>(ParamValue.class, this, WebPackage.SERVLET__INIT_PARAMS);
> 		}
> 		return initParams;
> 	}
>@@ -378,6 +450,98 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public boolean isEnabled() {
>+		return enabled;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setEnabled(boolean newEnabled) {
>+		boolean oldEnabled = enabled;
>+		enabled = newEnabled;
>+		boolean oldEnabledESet = enabledESet;
>+		enabledESet = true;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.SERVLET__ENABLED, oldEnabled, enabled, !oldEnabledESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void unsetEnabled() {
>+		boolean oldEnabled = enabled;
>+		boolean oldEnabledESet = enabledESet;
>+		enabled = ENABLED_EDEFAULT;
>+		enabledESet = false;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.UNSET, WebPackage.SERVLET__ENABLED, oldEnabled, ENABLED_EDEFAULT, oldEnabledESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isSetEnabled() {
>+		return enabledESet;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isAsyncSupported() {
>+		return asyncSupported;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setAsyncSupported(boolean newAsyncSupported) {
>+		boolean oldAsyncSupported = asyncSupported;
>+		asyncSupported = newAsyncSupported;
>+		boolean oldAsyncSupportedESet = asyncSupportedESet;
>+		asyncSupportedESet = true;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.SERVLET__ASYNC_SUPPORTED, oldAsyncSupported, asyncSupported, !oldAsyncSupportedESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void unsetAsyncSupported() {
>+		boolean oldAsyncSupported = asyncSupported;
>+		boolean oldAsyncSupportedESet = asyncSupportedESet;
>+		asyncSupported = ASYNC_SUPPORTED_EDEFAULT;
>+		asyncSupportedESet = false;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.UNSET, WebPackage.SERVLET__ASYNC_SUPPORTED, oldAsyncSupported, ASYNC_SUPPORTED_EDEFAULT, oldAsyncSupportedESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isSetAsyncSupported() {
>+		return asyncSupportedESet;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public RunAs getRunAs() {
> 		return runAs;
> 	}
>@@ -421,9 +585,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getSecurityRoleRefs() {
>+	public List<SecurityRoleRef> getSecurityRoleRefs() {
> 		if (securityRoleRefs == null) {
>-			securityRoleRefs = new EObjectContainmentEList(SecurityRoleRef.class, this, WebPackage.SERVLET__SECURITY_ROLE_REFS);
>+			securityRoleRefs = new EObjectContainmentEList<SecurityRoleRef>(SecurityRoleRef.class, this, WebPackage.SERVLET__SECURITY_ROLE_REFS);
> 		}
> 		return securityRoleRefs;
> 	}
>@@ -433,6 +597,49 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public MultipartConfigType getMultipartConfig() {
>+		return multipartConfig;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public NotificationChain basicSetMultipartConfig(MultipartConfigType newMultipartConfig, NotificationChain msgs) {
>+		MultipartConfigType oldMultipartConfig = multipartConfig;
>+		multipartConfig = newMultipartConfig;
>+		if (eNotificationRequired()) {
>+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WebPackage.SERVLET__MULTIPART_CONFIG, oldMultipartConfig, newMultipartConfig);
>+			if (msgs == null) msgs = notification; else msgs.add(notification);
>+		}
>+		return msgs;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setMultipartConfig(MultipartConfigType newMultipartConfig) {
>+		if (newMultipartConfig != multipartConfig) {
>+			NotificationChain msgs = null;
>+			if (multipartConfig != null)
>+				msgs = ((InternalEObject)multipartConfig).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WebPackage.SERVLET__MULTIPART_CONFIG, null, msgs);
>+			if (newMultipartConfig != null)
>+				msgs = ((InternalEObject)newMultipartConfig).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WebPackage.SERVLET__MULTIPART_CONFIG, null, msgs);
>+			msgs = basicSetMultipartConfig(newMultipartConfig, msgs);
>+			if (msgs != null) msgs.dispatch();
>+		}
>+		else if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.SERVLET__MULTIPART_CONFIG, newMultipartConfig, newMultipartConfig));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public String getId() {
> 		return id;
> 	}
>@@ -458,17 +665,19 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case WebPackage.SERVLET__DESCRIPTIONS:
>-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
> 			case WebPackage.SERVLET__DISPLAY_NAMES:
>-				return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDisplayNames()).basicRemove(otherEnd, msgs);
> 			case WebPackage.SERVLET__ICONS:
>-				return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getIcons()).basicRemove(otherEnd, msgs);
> 			case WebPackage.SERVLET__INIT_PARAMS:
>-				return ((InternalEList)getInitParams()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getInitParams()).basicRemove(otherEnd, msgs);
> 			case WebPackage.SERVLET__RUN_AS:
> 				return basicSetRunAs(null, msgs);
> 			case WebPackage.SERVLET__SECURITY_ROLE_REFS:
>-				return ((InternalEList)getSecurityRoleRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getSecurityRoleRefs()).basicRemove(otherEnd, msgs);
>+			case WebPackage.SERVLET__MULTIPART_CONFIG:
>+				return basicSetMultipartConfig(null, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -497,10 +706,16 @@
> 				return getInitParams();
> 			case WebPackage.SERVLET__LOAD_ON_STARTUP:
> 				return getLoadOnStartup();
>+			case WebPackage.SERVLET__ENABLED:
>+				return isEnabled();
>+			case WebPackage.SERVLET__ASYNC_SUPPORTED:
>+				return isAsyncSupported();
> 			case WebPackage.SERVLET__RUN_AS:
> 				return getRunAs();
> 			case WebPackage.SERVLET__SECURITY_ROLE_REFS:
> 				return getSecurityRoleRefs();
>+			case WebPackage.SERVLET__MULTIPART_CONFIG:
>+				return getMultipartConfig();
> 			case WebPackage.SERVLET__ID:
> 				return getId();
> 		}
>@@ -512,20 +727,21 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case WebPackage.SERVLET__DESCRIPTIONS:
> 				getDescriptions().clear();
>-				getDescriptions().addAll((Collection)newValue);
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
> 				return;
> 			case WebPackage.SERVLET__DISPLAY_NAMES:
> 				getDisplayNames().clear();
>-				getDisplayNames().addAll((Collection)newValue);
>+				getDisplayNames().addAll((Collection<? extends DisplayName>)newValue);
> 				return;
> 			case WebPackage.SERVLET__ICONS:
> 				getIcons().clear();
>-				getIcons().addAll((Collection)newValue);
>+				getIcons().addAll((Collection<? extends Icon>)newValue);
> 				return;
> 			case WebPackage.SERVLET__SERVLET_NAME:
> 				setServletName((String)newValue);
>@@ -538,17 +754,26 @@
> 				return;
> 			case WebPackage.SERVLET__INIT_PARAMS:
> 				getInitParams().clear();
>-				getInitParams().addAll((Collection)newValue);
>+				getInitParams().addAll((Collection<? extends ParamValue>)newValue);
> 				return;
> 			case WebPackage.SERVLET__LOAD_ON_STARTUP:
> 				setLoadOnStartup(newValue);
> 				return;
>+			case WebPackage.SERVLET__ENABLED:
>+				setEnabled((Boolean)newValue);
>+				return;
>+			case WebPackage.SERVLET__ASYNC_SUPPORTED:
>+				setAsyncSupported((Boolean)newValue);
>+				return;
> 			case WebPackage.SERVLET__RUN_AS:
> 				setRunAs((RunAs)newValue);
> 				return;
> 			case WebPackage.SERVLET__SECURITY_ROLE_REFS:
> 				getSecurityRoleRefs().clear();
>-				getSecurityRoleRefs().addAll((Collection)newValue);
>+				getSecurityRoleRefs().addAll((Collection<? extends SecurityRoleRef>)newValue);
>+				return;
>+			case WebPackage.SERVLET__MULTIPART_CONFIG:
>+				setMultipartConfig((MultipartConfigType)newValue);
> 				return;
> 			case WebPackage.SERVLET__ID:
> 				setId((String)newValue);
>@@ -589,12 +814,21 @@
> 			case WebPackage.SERVLET__LOAD_ON_STARTUP:
> 				setLoadOnStartup(LOAD_ON_STARTUP_EDEFAULT);
> 				return;
>+			case WebPackage.SERVLET__ENABLED:
>+				unsetEnabled();
>+				return;
>+			case WebPackage.SERVLET__ASYNC_SUPPORTED:
>+				unsetAsyncSupported();
>+				return;
> 			case WebPackage.SERVLET__RUN_AS:
> 				setRunAs((RunAs)null);
> 				return;
> 			case WebPackage.SERVLET__SECURITY_ROLE_REFS:
> 				getSecurityRoleRefs().clear();
> 				return;
>+			case WebPackage.SERVLET__MULTIPART_CONFIG:
>+				setMultipartConfig((MultipartConfigType)null);
>+				return;
> 			case WebPackage.SERVLET__ID:
> 				setId(ID_EDEFAULT);
> 				return;
>@@ -626,10 +860,16 @@
> 				return initParams != null && !initParams.isEmpty();
> 			case WebPackage.SERVLET__LOAD_ON_STARTUP:
> 				return LOAD_ON_STARTUP_EDEFAULT == null ? loadOnStartup != null : !LOAD_ON_STARTUP_EDEFAULT.equals(loadOnStartup);
>+			case WebPackage.SERVLET__ENABLED:
>+				return isSetEnabled();
>+			case WebPackage.SERVLET__ASYNC_SUPPORTED:
>+				return isSetAsyncSupported();
> 			case WebPackage.SERVLET__RUN_AS:
> 				return runAs != null;
> 			case WebPackage.SERVLET__SECURITY_ROLE_REFS:
> 				return securityRoleRefs != null && !securityRoleRefs.isEmpty();
>+			case WebPackage.SERVLET__MULTIPART_CONFIG:
>+				return multipartConfig != null;
> 			case WebPackage.SERVLET__ID:
> 				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
> 		}
>@@ -654,6 +894,10 @@
> 		result.append(jspFile);
> 		result.append(", loadOnStartup: "); //$NON-NLS-1$
> 		result.append(loadOnStartup);
>+		result.append(", enabled: "); //$NON-NLS-1$
>+		if (enabledESet) result.append(enabled); else result.append("<unset>"); //$NON-NLS-1$
>+		result.append(", asyncSupported: "); //$NON-NLS-1$
>+		if (asyncSupportedESet) result.append(asyncSupported); else result.append("<unset>"); //$NON-NLS-1$
> 		result.append(", id: "); //$NON-NLS-1$
> 		result.append(id);
> 		result.append(')');
>Index: jee-models/org/eclipse/jst/javaee/web/internal/impl/WebAppImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WebAppImpl.java,v
>retrieving revision 1.4
>diff -u -r1.4 WebAppImpl.java
>--- jee-models/org/eclipse/jst/javaee/web/internal/impl/WebAppImpl.java	9 Jun 2009 22:38:38 -0000	1.4
>+++ jee-models/org/eclipse/jst/javaee/web/internal/impl/WebAppImpl.java	14 Oct 2009 21:47:32 -0000
>@@ -26,9 +26,41 @@
> import org.eclipse.emf.ecore.util.FeatureMap;
> import org.eclipse.emf.ecore.util.InternalEList;
> 
>+import org.eclipse.jst.javaee.core.DataSourceType;
>+import org.eclipse.jst.javaee.core.Description;
>+import org.eclipse.jst.javaee.core.DisplayName;
>+import org.eclipse.jst.javaee.core.EjbLocalRef;
>+import org.eclipse.jst.javaee.core.EjbRef;
>+import org.eclipse.jst.javaee.core.EmptyType;
>+import org.eclipse.jst.javaee.core.EnvEntry;
>+import org.eclipse.jst.javaee.core.Icon;
>+import org.eclipse.jst.javaee.core.LifecycleCallback;
>+import org.eclipse.jst.javaee.core.Listener;
>+import org.eclipse.jst.javaee.core.MessageDestination;
>+import org.eclipse.jst.javaee.core.MessageDestinationRef;
>+import org.eclipse.jst.javaee.core.ParamValue;
>+import org.eclipse.jst.javaee.core.PersistenceContextRef;
>+import org.eclipse.jst.javaee.core.PersistenceUnitRef;
>+import org.eclipse.jst.javaee.core.ResourceEnvRef;
>+import org.eclipse.jst.javaee.core.ResourceRef;
>+import org.eclipse.jst.javaee.core.SecurityRole;
>+import org.eclipse.jst.javaee.core.ServiceRef;
>+import org.eclipse.jst.javaee.jsp.JspConfig;
>+import org.eclipse.jst.javaee.web.AbsoluteOrderingType;
>+import org.eclipse.jst.javaee.web.ErrorPage;
>+import org.eclipse.jst.javaee.web.Filter;
>+import org.eclipse.jst.javaee.web.FilterMapping;
>+import org.eclipse.jst.javaee.web.LocaleEncodingMappingList;
>+import org.eclipse.jst.javaee.web.LoginConfig;
>+import org.eclipse.jst.javaee.web.MimeMapping;
>+import org.eclipse.jst.javaee.web.SecurityConstraint;
>+import org.eclipse.jst.javaee.web.Servlet;
>+import org.eclipse.jst.javaee.web.ServletMapping;
>+import org.eclipse.jst.javaee.web.SessionConfig;
> import org.eclipse.jst.javaee.web.WebApp;
> import org.eclipse.jst.javaee.web.WebAppVersionType;
> 
>+import org.eclipse.jst.javaee.web.WelcomeFileList;
> import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
> 
> /**
>@@ -42,6 +74,7 @@
> * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getDescriptions Descriptions}</li>
> * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getDisplayNames Display Names}</li>
> * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getIcons Icons}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getName Name}</li>
> * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getDistributables Distributables}</li>
> * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getContextParams Context Params}</li>
> * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getFilters Filters}</li>
>@@ -68,8 +101,11 @@
> * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getPersistenceUnitRefs Persistence Unit Refs}</li>
> * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getPostConstructs Post Constructs}</li>
> * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getPreDestroys Pre Destroys}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getDataSource Data Source}</li>
> * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getMessageDestinations Message Destinations}</li>
> * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getLocalEncodingMappingsLists Local Encoding Mappings Lists}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getModuleName Module Name}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getAbsoluteOrdering Absolute Ordering}</li>
> * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getId Id}</li>
> * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#isMetadataComplete Metadata Complete}</li>
> * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getVersion Version}</li>
>@@ -87,7 +123,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected FeatureMap group = null;
>+	protected FeatureMap group;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -136,7 +172,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected boolean metadataCompleteESet = false;
>+	protected boolean metadataCompleteESet;
> 
> 	/**
> 	 * The default value of the '{@link #getVersion() Version}' attribute.
>@@ -165,7 +201,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected boolean versionESet = false;
>+	protected boolean versionESet;
> 
> 	/**
> 	 * 
>@@ -203,8 +239,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDescriptions() {
>-		return (getGroup()).list(WebPackage.Literals.WEB_APP__DESCRIPTIONS);
>+	public List<Description> getDescriptions() {
>+		return getGroup().list(WebPackage.Literals.WEB_APP__DESCRIPTIONS);
> 	}
> 
> 	/**
>@@ -212,8 +248,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDisplayNames() {
>-		return (getGroup()).list(WebPackage.Literals.WEB_APP__DISPLAY_NAMES);
>+	public List<DisplayName> getDisplayNames() {
>+		return getGroup().list(WebPackage.Literals.WEB_APP__DISPLAY_NAMES);
> 	}
> 
> 	/**
>@@ -221,8 +257,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getIcons() {
>-		return (getGroup()).list(WebPackage.Literals.WEB_APP__ICONS);
>+	public List<Icon> getIcons() {
>+		return getGroup().list(WebPackage.Literals.WEB_APP__ICONS);
> 	}
> 
> 	/**
>@@ -230,8 +266,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDistributables() {
>-		return (getGroup()).list(WebPackage.Literals.WEB_APP__DISTRIBUTABLES);
>+	public List<String> getName() {
>+		return getGroup().list(WebPackage.Literals.WEB_APP__NAME);
> 	}
> 
> 	/**
>@@ -239,8 +275,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getContextParams() {
>-		return (getGroup()).list(WebPackage.Literals.WEB_APP__CONTEXT_PARAMS);
>+	public List<EmptyType> getDistributables() {
>+		return getGroup().list(WebPackage.Literals.WEB_APP__DISTRIBUTABLES);
> 	}
> 
> 	/**
>@@ -248,8 +284,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getFilters() {
>-		return (getGroup()).list(WebPackage.Literals.WEB_APP__FILTERS);
>+	public List<ParamValue> getContextParams() {
>+		return getGroup().list(WebPackage.Literals.WEB_APP__CONTEXT_PARAMS);
> 	}
> 
> 	/**
>@@ -257,8 +293,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getFilterMappings() {
>-		return (getGroup()).list(WebPackage.Literals.WEB_APP__FILTER_MAPPINGS);
>+	public List<Filter> getFilters() {
>+		return getGroup().list(WebPackage.Literals.WEB_APP__FILTERS);
> 	}
> 
> 	/**
>@@ -266,8 +302,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getListeners() {
>-		return (getGroup()).list(WebPackage.Literals.WEB_APP__LISTENERS);
>+	public List<FilterMapping> getFilterMappings() {
>+		return getGroup().list(WebPackage.Literals.WEB_APP__FILTER_MAPPINGS);
> 	}
> 
> 	/**
>@@ -275,8 +311,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getServlets() {
>-		return (getGroup()).list(WebPackage.Literals.WEB_APP__SERVLETS);
>+	public List<Listener> getListeners() {
>+		return getGroup().list(WebPackage.Literals.WEB_APP__LISTENERS);
> 	}
> 
> 	/**
>@@ -284,8 +320,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getServletMappings() {
>-		return (getGroup()).list(WebPackage.Literals.WEB_APP__SERVLET_MAPPINGS);
>+	public List<Servlet> getServlets() {
>+		return getGroup().list(WebPackage.Literals.WEB_APP__SERVLETS);
> 	}
> 
> 	/**
>@@ -293,8 +329,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getSessionConfigs() {
>-		return (getGroup()).list(WebPackage.Literals.WEB_APP__SESSION_CONFIGS);
>+	public List<ServletMapping> getServletMappings() {
>+		return getGroup().list(WebPackage.Literals.WEB_APP__SERVLET_MAPPINGS);
> 	}
> 
> 	/**
>@@ -302,8 +338,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getMimeMappings() {
>-		return (getGroup()).list(WebPackage.Literals.WEB_APP__MIME_MAPPINGS);
>+	public List<SessionConfig> getSessionConfigs() {
>+		return getGroup().list(WebPackage.Literals.WEB_APP__SESSION_CONFIGS);
> 	}
> 
> 	/**
>@@ -311,8 +347,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getWelcomeFileLists() {
>-		return (getGroup()).list(WebPackage.Literals.WEB_APP__WELCOME_FILE_LISTS);
>+	public List<MimeMapping> getMimeMappings() {
>+		return getGroup().list(WebPackage.Literals.WEB_APP__MIME_MAPPINGS);
> 	}
> 
> 	/**
>@@ -320,8 +356,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getErrorPages() {
>-		return (getGroup()).list(WebPackage.Literals.WEB_APP__ERROR_PAGES);
>+	public List<WelcomeFileList> getWelcomeFileLists() {
>+		return getGroup().list(WebPackage.Literals.WEB_APP__WELCOME_FILE_LISTS);
> 	}
> 
> 	/**
>@@ -329,8 +365,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getJspConfigs() {
>-		return (getGroup()).list(WebPackage.Literals.WEB_APP__JSP_CONFIGS);
>+	public List<ErrorPage> getErrorPages() {
>+		return getGroup().list(WebPackage.Literals.WEB_APP__ERROR_PAGES);
> 	}
> 
> 	/**
>@@ -338,8 +374,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getSecurityConstraints() {
>-		return (getGroup()).list(WebPackage.Literals.WEB_APP__SECURITY_CONSTRAINTS);
>+	public List<JspConfig> getJspConfigs() {
>+		return getGroup().list(WebPackage.Literals.WEB_APP__JSP_CONFIGS);
> 	}
> 
> 	/**
>@@ -347,8 +383,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getLoginConfigs() {
>-		return (getGroup()).list(WebPackage.Literals.WEB_APP__LOGIN_CONFIGS);
>+	public List<SecurityConstraint> getSecurityConstraints() {
>+		return getGroup().list(WebPackage.Literals.WEB_APP__SECURITY_CONSTRAINTS);
> 	}
> 
> 	/**
>@@ -356,8 +392,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getSecurityRoles() {
>-		return (getGroup()).list(WebPackage.Literals.WEB_APP__SECURITY_ROLES);
>+	public List<LoginConfig> getLoginConfigs() {
>+		return getGroup().list(WebPackage.Literals.WEB_APP__LOGIN_CONFIGS);
> 	}
> 
> 	/**
>@@ -365,8 +401,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getEnvEntries() {
>-		return (getGroup()).list(WebPackage.Literals.WEB_APP__ENV_ENTRIES);
>+	public List<SecurityRole> getSecurityRoles() {
>+		return getGroup().list(WebPackage.Literals.WEB_APP__SECURITY_ROLES);
> 	}
> 
> 	/**
>@@ -374,8 +410,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getEjbRefs() {
>-		return (getGroup()).list(WebPackage.Literals.WEB_APP__EJB_REFS);
>+	public List<EnvEntry> getEnvEntries() {
>+		return getGroup().list(WebPackage.Literals.WEB_APP__ENV_ENTRIES);
> 	}
> 
> 	/**
>@@ -383,8 +419,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getEjbLocalRefs() {
>-		return (getGroup()).list(WebPackage.Literals.WEB_APP__EJB_LOCAL_REFS);
>+	public List<EjbRef> getEjbRefs() {
>+		return getGroup().list(WebPackage.Literals.WEB_APP__EJB_REFS);
> 	}
> 
> 	/**
>@@ -392,8 +428,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getServiceRefs() {
>-		return (getGroup()).list(WebPackage.Literals.WEB_APP__SERVICE_REFS);
>+	public List<EjbLocalRef> getEjbLocalRefs() {
>+		return getGroup().list(WebPackage.Literals.WEB_APP__EJB_LOCAL_REFS);
> 	}
> 
> 	/**
>@@ -401,8 +437,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getResourceRefs() {
>-		return (getGroup()).list(WebPackage.Literals.WEB_APP__RESOURCE_REFS);
>+	public List<ServiceRef> getServiceRefs() {
>+		return getGroup().list(WebPackage.Literals.WEB_APP__SERVICE_REFS);
> 	}
> 
> 	/**
>@@ -410,8 +446,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getResourceEnvRefs() {
>-		return (getGroup()).list(WebPackage.Literals.WEB_APP__RESOURCE_ENV_REFS);
>+	public List<ResourceRef> getResourceRefs() {
>+		return getGroup().list(WebPackage.Literals.WEB_APP__RESOURCE_REFS);
> 	}
> 
> 	/**
>@@ -419,8 +455,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getMessageDestinationRefs() {
>-		return (getGroup()).list(WebPackage.Literals.WEB_APP__MESSAGE_DESTINATION_REFS);
>+	public List<ResourceEnvRef> getResourceEnvRefs() {
>+		return getGroup().list(WebPackage.Literals.WEB_APP__RESOURCE_ENV_REFS);
> 	}
> 
> 	/**
>@@ -428,8 +464,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getPersistenceContextRefs() {
>-		return (getGroup()).list(WebPackage.Literals.WEB_APP__PERSISTENCE_CONTEXT_REFS);
>+	public List<MessageDestinationRef> getMessageDestinationRefs() {
>+		return getGroup().list(WebPackage.Literals.WEB_APP__MESSAGE_DESTINATION_REFS);
> 	}
> 
> 	/**
>@@ -437,8 +473,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getPersistenceUnitRefs() {
>-		return (getGroup()).list(WebPackage.Literals.WEB_APP__PERSISTENCE_UNIT_REFS);
>+	public List<PersistenceContextRef> getPersistenceContextRefs() {
>+		return getGroup().list(WebPackage.Literals.WEB_APP__PERSISTENCE_CONTEXT_REFS);
> 	}
> 
> 	/**
>@@ -446,8 +482,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getPostConstructs() {
>-		return (getGroup()).list(WebPackage.Literals.WEB_APP__POST_CONSTRUCTS);
>+	public List<PersistenceUnitRef> getPersistenceUnitRefs() {
>+		return getGroup().list(WebPackage.Literals.WEB_APP__PERSISTENCE_UNIT_REFS);
> 	}
> 
> 	/**
>@@ -455,8 +491,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getPreDestroys() {
>-		return (getGroup()).list(WebPackage.Literals.WEB_APP__PRE_DESTROYS);
>+	public List<LifecycleCallback> getPostConstructs() {
>+		return getGroup().list(WebPackage.Literals.WEB_APP__POST_CONSTRUCTS);
> 	}
> 
> 	/**
>@@ -464,8 +500,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getMessageDestinations() {
>-		return (getGroup()).list(WebPackage.Literals.WEB_APP__MESSAGE_DESTINATIONS);
>+	public List<LifecycleCallback> getPreDestroys() {
>+		return getGroup().list(WebPackage.Literals.WEB_APP__PRE_DESTROYS);
> 	}
> 
> 	/**
>@@ -473,8 +509,44 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getLocalEncodingMappingsLists() {
>-		return (getGroup()).list(WebPackage.Literals.WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS);
>+	public List<DataSourceType> getDataSource() {
>+		return getGroup().list(WebPackage.Literals.WEB_APP__DATA_SOURCE);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<MessageDestination> getMessageDestinations() {
>+		return getGroup().list(WebPackage.Literals.WEB_APP__MESSAGE_DESTINATIONS);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<LocaleEncodingMappingList> getLocalEncodingMappingsLists() {
>+		return getGroup().list(WebPackage.Literals.WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<String> getModuleName() {
>+		return getGroup().list(WebPackage.Literals.WEB_APP__MODULE_NAME);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<AbsoluteOrderingType> getAbsoluteOrdering() {
>+		return getGroup().list(WebPackage.Literals.WEB_APP__ABSOLUTE_ORDERING);
> 	}
> 
> 	/**
>@@ -599,69 +671,73 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case WebPackage.WEB_APP__GROUP:
>-				return ((InternalEList)getGroup()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getGroup()).basicRemove(otherEnd, msgs);
> 			case WebPackage.WEB_APP__DESCRIPTIONS:
>-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
> 			case WebPackage.WEB_APP__DISPLAY_NAMES:
>-				return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDisplayNames()).basicRemove(otherEnd, msgs);
> 			case WebPackage.WEB_APP__ICONS:
>-				return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getIcons()).basicRemove(otherEnd, msgs);
> 			case WebPackage.WEB_APP__DISTRIBUTABLES:
>-				return ((InternalEList)getDistributables()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDistributables()).basicRemove(otherEnd, msgs);
> 			case WebPackage.WEB_APP__CONTEXT_PARAMS:
>-				return ((InternalEList)getContextParams()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getContextParams()).basicRemove(otherEnd, msgs);
> 			case WebPackage.WEB_APP__FILTERS:
>-				return ((InternalEList)getFilters()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getFilters()).basicRemove(otherEnd, msgs);
> 			case WebPackage.WEB_APP__FILTER_MAPPINGS:
>-				return ((InternalEList)getFilterMappings()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getFilterMappings()).basicRemove(otherEnd, msgs);
> 			case WebPackage.WEB_APP__LISTENERS:
>-				return ((InternalEList)getListeners()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getListeners()).basicRemove(otherEnd, msgs);
> 			case WebPackage.WEB_APP__SERVLETS:
>-				return ((InternalEList)getServlets()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getServlets()).basicRemove(otherEnd, msgs);
> 			case WebPackage.WEB_APP__SERVLET_MAPPINGS:
>-				return ((InternalEList)getServletMappings()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getServletMappings()).basicRemove(otherEnd, msgs);
> 			case WebPackage.WEB_APP__SESSION_CONFIGS:
>-				return ((InternalEList)getSessionConfigs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getSessionConfigs()).basicRemove(otherEnd, msgs);
> 			case WebPackage.WEB_APP__MIME_MAPPINGS:
>-				return ((InternalEList)getMimeMappings()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getMimeMappings()).basicRemove(otherEnd, msgs);
> 			case WebPackage.WEB_APP__WELCOME_FILE_LISTS:
>-				return ((InternalEList)getWelcomeFileLists()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getWelcomeFileLists()).basicRemove(otherEnd, msgs);
> 			case WebPackage.WEB_APP__ERROR_PAGES:
>-				return ((InternalEList)getErrorPages()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getErrorPages()).basicRemove(otherEnd, msgs);
> 			case WebPackage.WEB_APP__JSP_CONFIGS:
>-				return ((InternalEList)getJspConfigs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getJspConfigs()).basicRemove(otherEnd, msgs);
> 			case WebPackage.WEB_APP__SECURITY_CONSTRAINTS:
>-				return ((InternalEList)getSecurityConstraints()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getSecurityConstraints()).basicRemove(otherEnd, msgs);
> 			case WebPackage.WEB_APP__LOGIN_CONFIGS:
>-				return ((InternalEList)getLoginConfigs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getLoginConfigs()).basicRemove(otherEnd, msgs);
> 			case WebPackage.WEB_APP__SECURITY_ROLES:
>-				return ((InternalEList)getSecurityRoles()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getSecurityRoles()).basicRemove(otherEnd, msgs);
> 			case WebPackage.WEB_APP__ENV_ENTRIES:
>-				return ((InternalEList)getEnvEntries()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getEnvEntries()).basicRemove(otherEnd, msgs);
> 			case WebPackage.WEB_APP__EJB_REFS:
>-				return ((InternalEList)getEjbRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getEjbRefs()).basicRemove(otherEnd, msgs);
> 			case WebPackage.WEB_APP__EJB_LOCAL_REFS:
>-				return ((InternalEList)getEjbLocalRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getEjbLocalRefs()).basicRemove(otherEnd, msgs);
> 			case WebPackage.WEB_APP__SERVICE_REFS:
>-				return ((InternalEList)getServiceRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getServiceRefs()).basicRemove(otherEnd, msgs);
> 			case WebPackage.WEB_APP__RESOURCE_REFS:
>-				return ((InternalEList)getResourceRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getResourceRefs()).basicRemove(otherEnd, msgs);
> 			case WebPackage.WEB_APP__RESOURCE_ENV_REFS:
>-				return ((InternalEList)getResourceEnvRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getResourceEnvRefs()).basicRemove(otherEnd, msgs);
> 			case WebPackage.WEB_APP__MESSAGE_DESTINATION_REFS:
>-				return ((InternalEList)getMessageDestinationRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getMessageDestinationRefs()).basicRemove(otherEnd, msgs);
> 			case WebPackage.WEB_APP__PERSISTENCE_CONTEXT_REFS:
>-				return ((InternalEList)getPersistenceContextRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getPersistenceContextRefs()).basicRemove(otherEnd, msgs);
> 			case WebPackage.WEB_APP__PERSISTENCE_UNIT_REFS:
>-				return ((InternalEList)getPersistenceUnitRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getPersistenceUnitRefs()).basicRemove(otherEnd, msgs);
> 			case WebPackage.WEB_APP__POST_CONSTRUCTS:
>-				return ((InternalEList)getPostConstructs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getPostConstructs()).basicRemove(otherEnd, msgs);
> 			case WebPackage.WEB_APP__PRE_DESTROYS:
>-				return ((InternalEList)getPreDestroys()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getPreDestroys()).basicRemove(otherEnd, msgs);
>+			case WebPackage.WEB_APP__DATA_SOURCE:
>+				return ((InternalEList<?>)getDataSource()).basicRemove(otherEnd, msgs);
> 			case WebPackage.WEB_APP__MESSAGE_DESTINATIONS:
>-				return ((InternalEList)getMessageDestinations()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getMessageDestinations()).basicRemove(otherEnd, msgs);
> 			case WebPackage.WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS:
>-				return ((InternalEList)getLocalEncodingMappingsLists()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getLocalEncodingMappingsLists()).basicRemove(otherEnd, msgs);
>+			case WebPackage.WEB_APP__ABSOLUTE_ORDERING:
>+				return ((InternalEList<?>)getAbsoluteOrdering()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -683,6 +759,8 @@
> 				return getDisplayNames();
> 			case WebPackage.WEB_APP__ICONS:
> 				return getIcons();
>+			case WebPackage.WEB_APP__NAME:
>+				return getName();
> 			case WebPackage.WEB_APP__DISTRIBUTABLES:
> 				return getDistributables();
> 			case WebPackage.WEB_APP__CONTEXT_PARAMS:
>@@ -735,14 +813,20 @@
> 				return getPostConstructs();
> 			case WebPackage.WEB_APP__PRE_DESTROYS:
> 				return getPreDestroys();
>+			case WebPackage.WEB_APP__DATA_SOURCE:
>+				return getDataSource();
> 			case WebPackage.WEB_APP__MESSAGE_DESTINATIONS:
> 				return getMessageDestinations();
> 			case WebPackage.WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS:
> 				return getLocalEncodingMappingsLists();
>+			case WebPackage.WEB_APP__MODULE_NAME:
>+				return getModuleName();
>+			case WebPackage.WEB_APP__ABSOLUTE_ORDERING:
>+				return getAbsoluteOrdering();
> 			case WebPackage.WEB_APP__ID:
> 				return getId();
> 			case WebPackage.WEB_APP__METADATA_COMPLETE:
>-				return isMetadataComplete() ? Boolean.TRUE : Boolean.FALSE;
>+				return isMetadataComplete();
> 			case WebPackage.WEB_APP__VERSION:
> 				return getVersion();
> 		}
>@@ -754,6 +838,7 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
>@@ -762,133 +847,149 @@
> 				return;
> 			case WebPackage.WEB_APP__DESCRIPTIONS:
> 				getDescriptions().clear();
>-				getDescriptions().addAll((Collection)newValue);
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
> 				return;
> 			case WebPackage.WEB_APP__DISPLAY_NAMES:
> 				getDisplayNames().clear();
>-				getDisplayNames().addAll((Collection)newValue);
>+				getDisplayNames().addAll((Collection<? extends DisplayName>)newValue);
> 				return;
> 			case WebPackage.WEB_APP__ICONS:
> 				getIcons().clear();
>-				getIcons().addAll((Collection)newValue);
>+				getIcons().addAll((Collection<? extends Icon>)newValue);
>+				return;
>+			case WebPackage.WEB_APP__NAME:
>+				getName().clear();
>+				getName().addAll((Collection<? extends String>)newValue);
> 				return;
> 			case WebPackage.WEB_APP__DISTRIBUTABLES:
> 				getDistributables().clear();
>-				getDistributables().addAll((Collection)newValue);
>+				getDistributables().addAll((Collection<? extends EmptyType>)newValue);
> 				return;
> 			case WebPackage.WEB_APP__CONTEXT_PARAMS:
> 				getContextParams().clear();
>-				getContextParams().addAll((Collection)newValue);
>+				getContextParams().addAll((Collection<? extends ParamValue>)newValue);
> 				return;
> 			case WebPackage.WEB_APP__FILTERS:
> 				getFilters().clear();
>-				getFilters().addAll((Collection)newValue);
>+				getFilters().addAll((Collection<? extends Filter>)newValue);
> 				return;
> 			case WebPackage.WEB_APP__FILTER_MAPPINGS:
> 				getFilterMappings().clear();
>-				getFilterMappings().addAll((Collection)newValue);
>+				getFilterMappings().addAll((Collection<? extends FilterMapping>)newValue);
> 				return;
> 			case WebPackage.WEB_APP__LISTENERS:
> 				getListeners().clear();
>-				getListeners().addAll((Collection)newValue);
>+				getListeners().addAll((Collection<? extends Listener>)newValue);
> 				return;
> 			case WebPackage.WEB_APP__SERVLETS:
> 				getServlets().clear();
>-				getServlets().addAll((Collection)newValue);
>+				getServlets().addAll((Collection<? extends Servlet>)newValue);
> 				return;
> 			case WebPackage.WEB_APP__SERVLET_MAPPINGS:
> 				getServletMappings().clear();
>-				getServletMappings().addAll((Collection)newValue);
>+				getServletMappings().addAll((Collection<? extends ServletMapping>)newValue);
> 				return;
> 			case WebPackage.WEB_APP__SESSION_CONFIGS:
> 				getSessionConfigs().clear();
>-				getSessionConfigs().addAll((Collection)newValue);
>+				getSessionConfigs().addAll((Collection<? extends SessionConfig>)newValue);
> 				return;
> 			case WebPackage.WEB_APP__MIME_MAPPINGS:
> 				getMimeMappings().clear();
>-				getMimeMappings().addAll((Collection)newValue);
>+				getMimeMappings().addAll((Collection<? extends MimeMapping>)newValue);
> 				return;
> 			case WebPackage.WEB_APP__WELCOME_FILE_LISTS:
> 				getWelcomeFileLists().clear();
>-				getWelcomeFileLists().addAll((Collection)newValue);
>+				getWelcomeFileLists().addAll((Collection<? extends WelcomeFileList>)newValue);
> 				return;
> 			case WebPackage.WEB_APP__ERROR_PAGES:
> 				getErrorPages().clear();
>-				getErrorPages().addAll((Collection)newValue);
>+				getErrorPages().addAll((Collection<? extends ErrorPage>)newValue);
> 				return;
> 			case WebPackage.WEB_APP__JSP_CONFIGS:
> 				getJspConfigs().clear();
>-				getJspConfigs().addAll((Collection)newValue);
>+				getJspConfigs().addAll((Collection<? extends JspConfig>)newValue);
> 				return;
> 			case WebPackage.WEB_APP__SECURITY_CONSTRAINTS:
> 				getSecurityConstraints().clear();
>-				getSecurityConstraints().addAll((Collection)newValue);
>+				getSecurityConstraints().addAll((Collection<? extends SecurityConstraint>)newValue);
> 				return;
> 			case WebPackage.WEB_APP__LOGIN_CONFIGS:
> 				getLoginConfigs().clear();
>-				getLoginConfigs().addAll((Collection)newValue);
>+				getLoginConfigs().addAll((Collection<? extends LoginConfig>)newValue);
> 				return;
> 			case WebPackage.WEB_APP__SECURITY_ROLES:
> 				getSecurityRoles().clear();
>-				getSecurityRoles().addAll((Collection)newValue);
>+				getSecurityRoles().addAll((Collection<? extends SecurityRole>)newValue);
> 				return;
> 			case WebPackage.WEB_APP__ENV_ENTRIES:
> 				getEnvEntries().clear();
>-				getEnvEntries().addAll((Collection)newValue);
>+				getEnvEntries().addAll((Collection<? extends EnvEntry>)newValue);
> 				return;
> 			case WebPackage.WEB_APP__EJB_REFS:
> 				getEjbRefs().clear();
>-				getEjbRefs().addAll((Collection)newValue);
>+				getEjbRefs().addAll((Collection<? extends EjbRef>)newValue);
> 				return;
> 			case WebPackage.WEB_APP__EJB_LOCAL_REFS:
> 				getEjbLocalRefs().clear();
>-				getEjbLocalRefs().addAll((Collection)newValue);
>+				getEjbLocalRefs().addAll((Collection<? extends EjbLocalRef>)newValue);
> 				return;
> 			case WebPackage.WEB_APP__SERVICE_REFS:
> 				getServiceRefs().clear();
>-				getServiceRefs().addAll((Collection)newValue);
>+				getServiceRefs().addAll((Collection<? extends ServiceRef>)newValue);
> 				return;
> 			case WebPackage.WEB_APP__RESOURCE_REFS:
> 				getResourceRefs().clear();
>-				getResourceRefs().addAll((Collection)newValue);
>+				getResourceRefs().addAll((Collection<? extends ResourceRef>)newValue);
> 				return;
> 			case WebPackage.WEB_APP__RESOURCE_ENV_REFS:
> 				getResourceEnvRefs().clear();
>-				getResourceEnvRefs().addAll((Collection)newValue);
>+				getResourceEnvRefs().addAll((Collection<? extends ResourceEnvRef>)newValue);
> 				return;
> 			case WebPackage.WEB_APP__MESSAGE_DESTINATION_REFS:
> 				getMessageDestinationRefs().clear();
>-				getMessageDestinationRefs().addAll((Collection)newValue);
>+				getMessageDestinationRefs().addAll((Collection<? extends MessageDestinationRef>)newValue);
> 				return;
> 			case WebPackage.WEB_APP__PERSISTENCE_CONTEXT_REFS:
> 				getPersistenceContextRefs().clear();
>-				getPersistenceContextRefs().addAll((Collection)newValue);
>+				getPersistenceContextRefs().addAll((Collection<? extends PersistenceContextRef>)newValue);
> 				return;
> 			case WebPackage.WEB_APP__PERSISTENCE_UNIT_REFS:
> 				getPersistenceUnitRefs().clear();
>-				getPersistenceUnitRefs().addAll((Collection)newValue);
>+				getPersistenceUnitRefs().addAll((Collection<? extends PersistenceUnitRef>)newValue);
> 				return;
> 			case WebPackage.WEB_APP__POST_CONSTRUCTS:
> 				getPostConstructs().clear();
>-				getPostConstructs().addAll((Collection)newValue);
>+				getPostConstructs().addAll((Collection<? extends LifecycleCallback>)newValue);
> 				return;
> 			case WebPackage.WEB_APP__PRE_DESTROYS:
> 				getPreDestroys().clear();
>-				getPreDestroys().addAll((Collection)newValue);
>+				getPreDestroys().addAll((Collection<? extends LifecycleCallback>)newValue);
>+				return;
>+			case WebPackage.WEB_APP__DATA_SOURCE:
>+				getDataSource().clear();
>+				getDataSource().addAll((Collection<? extends DataSourceType>)newValue);
> 				return;
> 			case WebPackage.WEB_APP__MESSAGE_DESTINATIONS:
> 				getMessageDestinations().clear();
>-				getMessageDestinations().addAll((Collection)newValue);
>+				getMessageDestinations().addAll((Collection<? extends MessageDestination>)newValue);
> 				return;
> 			case WebPackage.WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS:
> 				getLocalEncodingMappingsLists().clear();
>-				getLocalEncodingMappingsLists().addAll((Collection)newValue);
>+				getLocalEncodingMappingsLists().addAll((Collection<? extends LocaleEncodingMappingList>)newValue);
>+				return;
>+			case WebPackage.WEB_APP__MODULE_NAME:
>+				getModuleName().clear();
>+				getModuleName().addAll((Collection<? extends String>)newValue);
>+				return;
>+			case WebPackage.WEB_APP__ABSOLUTE_ORDERING:
>+				getAbsoluteOrdering().clear();
>+				getAbsoluteOrdering().addAll((Collection<? extends AbsoluteOrderingType>)newValue);
> 				return;
> 			case WebPackage.WEB_APP__ID:
> 				setId((String)newValue);
> 				return;
> 			case WebPackage.WEB_APP__METADATA_COMPLETE:
>-				setMetadataComplete(((Boolean)newValue).booleanValue());
>+				setMetadataComplete((Boolean)newValue);
> 				return;
> 			case WebPackage.WEB_APP__VERSION:
> 				setVersion((WebAppVersionType)newValue);
>@@ -917,6 +1018,9 @@
> 			case WebPackage.WEB_APP__ICONS:
> 				getIcons().clear();
> 				return;
>+			case WebPackage.WEB_APP__NAME:
>+				getName().clear();
>+				return;
> 			case WebPackage.WEB_APP__DISTRIBUTABLES:
> 				getDistributables().clear();
> 				return;
>@@ -995,12 +1099,21 @@
> 			case WebPackage.WEB_APP__PRE_DESTROYS:
> 				getPreDestroys().clear();
> 				return;
>+			case WebPackage.WEB_APP__DATA_SOURCE:
>+				getDataSource().clear();
>+				return;
> 			case WebPackage.WEB_APP__MESSAGE_DESTINATIONS:
> 				getMessageDestinations().clear();
> 				return;
> 			case WebPackage.WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS:
> 				getLocalEncodingMappingsLists().clear();
> 				return;
>+			case WebPackage.WEB_APP__MODULE_NAME:
>+				getModuleName().clear();
>+				return;
>+			case WebPackage.WEB_APP__ABSOLUTE_ORDERING:
>+				getAbsoluteOrdering().clear();
>+				return;
> 			case WebPackage.WEB_APP__ID:
> 				setId(ID_EDEFAULT);
> 				return;
>@@ -1030,6 +1143,8 @@
> 				return !getDisplayNames().isEmpty();
> 			case WebPackage.WEB_APP__ICONS:
> 				return !getIcons().isEmpty();
>+			case WebPackage.WEB_APP__NAME:
>+				return !getName().isEmpty();
> 			case WebPackage.WEB_APP__DISTRIBUTABLES:
> 				return !getDistributables().isEmpty();
> 			case WebPackage.WEB_APP__CONTEXT_PARAMS:
>@@ -1082,10 +1197,16 @@
> 				return !getPostConstructs().isEmpty();
> 			case WebPackage.WEB_APP__PRE_DESTROYS:
> 				return !getPreDestroys().isEmpty();
>+			case WebPackage.WEB_APP__DATA_SOURCE:
>+				return !getDataSource().isEmpty();
> 			case WebPackage.WEB_APP__MESSAGE_DESTINATIONS:
> 				return !getMessageDestinations().isEmpty();
> 			case WebPackage.WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS:
> 				return !getLocalEncodingMappingsLists().isEmpty();
>+			case WebPackage.WEB_APP__MODULE_NAME:
>+				return !getModuleName().isEmpty();
>+			case WebPackage.WEB_APP__ABSOLUTE_ORDERING:
>+				return !getAbsoluteOrdering().isEmpty();
> 			case WebPackage.WEB_APP__ID:
> 				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
> 			case WebPackage.WEB_APP__METADATA_COMPLETE:
>Index: jee-models/org/eclipse/jst/javaee/web/internal/impl/SecurityConstraintImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/SecurityConstraintImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 SecurityConstraintImpl.java
>--- jee-models/org/eclipse/jst/javaee/web/internal/impl/SecurityConstraintImpl.java	9 Jun 2009 19:37:06 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/web/internal/impl/SecurityConstraintImpl.java	14 Oct 2009 21:47:32 -0000
>@@ -62,7 +62,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList displayNames = null;
>+	protected EList<DisplayName> displayNames;
> 
> 	/**
> 	 * The cached value of the '{@link #getWebResourceCollections() Web Resource Collections}' containment reference list.
>@@ -72,7 +72,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList webResourceCollections = null;
>+	protected EList<WebResourceCollection> webResourceCollections;
> 
> 	/**
> 	 * The cached value of the '{@link #getAuthConstraint() Auth Constraint}' containment reference.
>@@ -82,7 +82,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected AuthConstraint authConstraint = null;
>+	protected AuthConstraint authConstraint;
> 
> 	/**
> 	 * The cached value of the '{@link #getUserDataConstraint() User Data Constraint}' containment reference.
>@@ -92,7 +92,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected UserDataConstraint userDataConstraint = null;
>+	protected UserDataConstraint userDataConstraint;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -138,9 +138,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDisplayNames() {
>+	public List<DisplayName> getDisplayNames() {
> 		if (displayNames == null) {
>-			displayNames = new EObjectContainmentEList(DisplayName.class, this, WebPackage.SECURITY_CONSTRAINT__DISPLAY_NAMES);
>+			displayNames = new EObjectContainmentEList<DisplayName>(DisplayName.class, this, WebPackage.SECURITY_CONSTRAINT__DISPLAY_NAMES);
> 		}
> 		return displayNames;
> 	}
>@@ -150,9 +150,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getWebResourceCollections() {
>+	public List<WebResourceCollection> getWebResourceCollections() {
> 		if (webResourceCollections == null) {
>-			webResourceCollections = new EObjectContainmentEList(WebResourceCollection.class, this, WebPackage.SECURITY_CONSTRAINT__WEB_RESOURCE_COLLECTIONS);
>+			webResourceCollections = new EObjectContainmentEList<WebResourceCollection>(WebResourceCollection.class, this, WebPackage.SECURITY_CONSTRAINT__WEB_RESOURCE_COLLECTIONS);
> 		}
> 		return webResourceCollections;
> 	}
>@@ -273,9 +273,9 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case WebPackage.SECURITY_CONSTRAINT__DISPLAY_NAMES:
>-				return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDisplayNames()).basicRemove(otherEnd, msgs);
> 			case WebPackage.SECURITY_CONSTRAINT__WEB_RESOURCE_COLLECTIONS:
>-				return ((InternalEList)getWebResourceCollections()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getWebResourceCollections()).basicRemove(otherEnd, msgs);
> 			case WebPackage.SECURITY_CONSTRAINT__AUTH_CONSTRAINT:
> 				return basicSetAuthConstraint(null, msgs);
> 			case WebPackage.SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT:
>@@ -311,16 +311,17 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case WebPackage.SECURITY_CONSTRAINT__DISPLAY_NAMES:
> 				getDisplayNames().clear();
>-				getDisplayNames().addAll((Collection)newValue);
>+				getDisplayNames().addAll((Collection<? extends DisplayName>)newValue);
> 				return;
> 			case WebPackage.SECURITY_CONSTRAINT__WEB_RESOURCE_COLLECTIONS:
> 				getWebResourceCollections().clear();
>-				getWebResourceCollections().addAll((Collection)newValue);
>+				getWebResourceCollections().addAll((Collection<? extends WebResourceCollection>)newValue);
> 				return;
> 			case WebPackage.SECURITY_CONSTRAINT__AUTH_CONSTRAINT:
> 				setAuthConstraint((AuthConstraint)newValue);
>Index: jee-models/org/eclipse/jst/javaee/web/internal/impl/WelcomeFileListImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WelcomeFileListImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 WelcomeFileListImpl.java
>--- jee-models/org/eclipse/jst/javaee/web/internal/impl/WelcomeFileListImpl.java	9 Jun 2009 19:37:06 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/web/internal/impl/WelcomeFileListImpl.java	14 Oct 2009 21:47:33 -0000
>@@ -51,7 +51,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList welcomeFiles = null;
>+	protected EList<String> welcomeFiles;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -97,9 +97,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getWelcomeFiles() {
>+	public List<String> getWelcomeFiles() {
> 		if (welcomeFiles == null) {
>-			welcomeFiles = new EDataTypeEList(String.class, this, WebPackage.WELCOME_FILE_LIST__WELCOME_FILES);
>+			welcomeFiles = new EDataTypeEList<String>(String.class, this, WebPackage.WELCOME_FILE_LIST__WELCOME_FILES);
> 		}
> 		return welcomeFiles;
> 	}
>@@ -146,12 +146,13 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case WebPackage.WELCOME_FILE_LIST__WELCOME_FILES:
> 				getWelcomeFiles().clear();
>-				getWelcomeFiles().addAll((Collection)newValue);
>+				getWelcomeFiles().addAll((Collection<? extends String>)newValue);
> 				return;
> 			case WebPackage.WELCOME_FILE_LIST__ID:
> 				setId((String)newValue);
>Index: jee-models/org/eclipse/jst/javaee/web/internal/impl/LoginConfigImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/LoginConfigImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 LoginConfigImpl.java
>--- jee-models/org/eclipse/jst/javaee/web/internal/impl/LoginConfigImpl.java	9 Jun 2009 19:37:06 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/web/internal/impl/LoginConfigImpl.java	14 Oct 2009 21:47:32 -0000
>@@ -89,7 +89,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected FormLoginConfig formLoginConfig = null;
>+	protected FormLoginConfig formLoginConfig;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>Index: jee-models/org/eclipse/jst/javaee/web/internal/impl/UserDataConstraintImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/UserDataConstraintImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 UserDataConstraintImpl.java
>--- jee-models/org/eclipse/jst/javaee/web/internal/impl/UserDataConstraintImpl.java	9 Jun 2009 19:37:06 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/web/internal/impl/UserDataConstraintImpl.java	14 Oct 2009 21:47:32 -0000
>@@ -58,7 +58,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList descriptions = null;
>+	protected EList<Description> descriptions;
> 
> 	/**
> 	 * The default value of the '{@link #getTransportGuarantee() Transport Guarantee}' attribute.
>@@ -87,7 +87,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected boolean transportGuaranteeESet = false;
>+	protected boolean transportGuaranteeESet;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -133,9 +133,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDescriptions() {
>+	public List<Description> getDescriptions() {
> 		if (descriptions == null) {
>-			descriptions = new EObjectContainmentEList(Description.class, this, WebPackage.USER_DATA_CONSTRAINT__DESCRIPTIONS);
>+			descriptions = new EObjectContainmentEList<Description>(Description.class, this, WebPackage.USER_DATA_CONSTRAINT__DESCRIPTIONS);
> 		}
> 		return descriptions;
> 	}
>@@ -216,7 +216,7 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case WebPackage.USER_DATA_CONSTRAINT__DESCRIPTIONS:
>-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -244,12 +244,13 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case WebPackage.USER_DATA_CONSTRAINT__DESCRIPTIONS:
> 				getDescriptions().clear();
>-				getDescriptions().addAll((Collection)newValue);
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
> 				return;
> 			case WebPackage.USER_DATA_CONSTRAINT__TRANSPORT_GUARANTEE:
> 				setTransportGuarantee((TransportGuaranteeType)newValue);
>Index: jee-models/org/eclipse/jst/javaee/web/internal/impl/WebPackageImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WebPackageImpl.java,v
>retrieving revision 1.2
>diff -u -r1.2 WebPackageImpl.java
>--- jee-models/org/eclipse/jst/javaee/web/internal/impl/WebPackageImpl.java	26 Jul 2007 16:56:14 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/web/internal/impl/WebPackageImpl.java	14 Oct 2009 21:47:33 -0000
>@@ -42,11 +42,19 @@
> 
> import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
> 
>+import org.eclipse.jst.javaee.jca.internal.impl.JcaPackageImpl;
>+import org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage;
> import org.eclipse.jst.javaee.jsp.internal.impl.JspPackageImpl;
> 
> import org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage;
> 
>+import org.eclipse.jst.javaee.web.AbsoluteOrderingType;
> import org.eclipse.jst.javaee.web.AuthConstraint;
>+import org.eclipse.jst.javaee.web.CookieCommentType;
>+import org.eclipse.jst.javaee.web.CookieConfigType;
>+import org.eclipse.jst.javaee.web.CookieDomainType;
>+import org.eclipse.jst.javaee.web.CookieNameType;
>+import org.eclipse.jst.javaee.web.CookiePathType;
> import org.eclipse.jst.javaee.web.DispatcherType;
> import org.eclipse.jst.javaee.web.ErrorPage;
> import org.eclipse.jst.javaee.web.Filter;
>@@ -56,16 +64,22 @@
> import org.eclipse.jst.javaee.web.LocaleEncodingMappingList;
> import org.eclipse.jst.javaee.web.LoginConfig;
> import org.eclipse.jst.javaee.web.MimeMapping;
>+import org.eclipse.jst.javaee.web.MultipartConfigType;
> import org.eclipse.jst.javaee.web.NullCharType;
>+import org.eclipse.jst.javaee.web.OrderingOrderingType;
>+import org.eclipse.jst.javaee.web.OrderingOthersType;
>+import org.eclipse.jst.javaee.web.OrderingType;
> import org.eclipse.jst.javaee.web.SecurityConstraint;
> import org.eclipse.jst.javaee.web.Servlet;
> import org.eclipse.jst.javaee.web.ServletMapping;
> import org.eclipse.jst.javaee.web.SessionConfig;
>+import org.eclipse.jst.javaee.web.TrackingModeType;
> import org.eclipse.jst.javaee.web.TransportGuaranteeType;
> import org.eclipse.jst.javaee.web.UserDataConstraint;
> import org.eclipse.jst.javaee.web.WebApp;
> import org.eclipse.jst.javaee.web.WebAppDeploymentDescriptor;
> import org.eclipse.jst.javaee.web.WebAppVersionType;
>+import org.eclipse.jst.javaee.web.WebFragment;
> import org.eclipse.jst.javaee.web.WebFactory;
> import org.eclipse.jst.javaee.web.WebResourceCollection;
> import org.eclipse.jst.javaee.web.WelcomeFileList;
>@@ -73,6 +87,10 @@
> import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
> 
> import org.eclipse.jst.javaee.web.internal.util.WebValidator;
>+import org.eclipse.jst.javaee.webapp.internal.impl.WebappPackageImpl;
>+import org.eclipse.jst.javaee.webapp.internal.metadata.WebappPackage;
>+import org.eclipse.jst.javaee.webfragment.internal.impl.WebfragmentPackageImpl;
>+import org.eclipse.jst.javaee.webfragment.internal.metadata.WebfragmentPackage;
> 
> /**
> * 
>@@ -86,6 +104,13 @@
> 	 * 
> 	 * @generated
> 	 */
>+	private EClass absoluteOrderingTypeEClass = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	private EClass authConstraintEClass = null;
> 
> 	/**
>@@ -93,6 +118,41 @@
> 	 * 
> 	 * @generated
> 	 */
>+	private EClass cookieCommentTypeEClass = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private EClass cookieConfigTypeEClass = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private EClass cookieDomainTypeEClass = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private EClass cookieNameTypeEClass = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private EClass cookiePathTypeEClass = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	private EClass errorPageEClass = null;
> 
> 	/**
>@@ -149,6 +209,34 @@
> 	 * 
> 	 * @generated
> 	 */
>+	private EClass multipartConfigTypeEClass = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private EClass orderingOrderingTypeEClass = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private EClass orderingOthersTypeEClass = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private EClass orderingTypeEClass = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	private EClass securityConstraintEClass = null;
> 
> 	/**
>@@ -198,6 +286,13 @@
> 	 * 
> 	 * @generated
> 	 */
>+	private EClass webFragmentEClass = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	private EClass webResourceCollectionEClass = null;
> 
> 	/**
>@@ -226,6 +321,13 @@
> 	 * 
> 	 * @generated
> 	 */
>+	private EEnum trackingModeTypeEEnum = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	private EEnum transportGuaranteeTypeEEnum = null;
> 
> 	/**
>@@ -324,6 +426,13 @@
> 	 * 
> 	 * @generated
> 	 */
>+	private EDataType trackingModeTypeObjectEDataType = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	private EDataType transportGuaranteeTypeObjectEDataType = null;
> 
> 	/**
>@@ -367,20 +476,10 @@
> 	private static boolean isInited = false;
> 
> 	/**
>-	 * Creates, registers, and initializes the Package for this
>-	 * model, and for any others upon which it depends. Simple
>-	 * dependencies are satisfied by calling this method on all
>-	 * dependent packages before doing anything else. This method drives
>-	 * initialization for interdependent packages directly, in parallel
>-	 * with this package, itself.
>-	 * Of this package and its interdependencies, all packages which
>-	 * have not yet been registered by their URI values are first created
>-	 * and registered. The packages are then initialized in two steps:
>-	 * meta-model objects for all of the packages are created before any
>-	 * are initialized, since one package's meta-model objects may refer to
>-	 * those of another.
>-	 * Invocation of this method will not affect any packages that have
>-	 * already been initialized.
>+	 * Creates, registers, and initializes the Package for this model, and for any others upon which it depends.
>+	 * 
>+	 * This method is used to initialize {@link WebPackage#eINSTANCE} when that field is accessed.
>+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
> 	 * 
> 	 * 
> 	 * @see #eNS_URI
>@@ -392,7 +491,7 @@
> 		if (isInited) return (WebPackage)EPackage.Registry.INSTANCE.getEPackage(WebPackage.eNS_URI);
> 
> 		// Obtain or create and register package
>-		WebPackageImpl theWebPackage = (WebPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof WebPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new WebPackageImpl());
>+		WebPackageImpl theWebPackage = (WebPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof WebPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new WebPackageImpl());
> 
> 		isInited = true;
> 
>@@ -403,25 +502,34 @@
> 		// Obtain or create and register interdependencies
> 		ApplicationPackageImpl theApplicationPackage = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) instanceof ApplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) : ApplicationPackage.eINSTANCE);
> 		JavaeePackageImpl theJavaeePackage = (JavaeePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JavaeePackage.eNS_URI) instanceof JavaeePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JavaeePackage.eNS_URI) : JavaeePackage.eINSTANCE);
>-		EjbPackageImpl theEjbPackage = (EjbPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) instanceof EjbPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) : EjbPackage.eINSTANCE);
> 		ApplicationclientPackageImpl theApplicationclientPackage = (ApplicationclientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationclientPackage.eNS_URI) instanceof ApplicationclientPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationclientPackage.eNS_URI) : ApplicationclientPackage.eINSTANCE);
>+		JcaPackageImpl theJcaPackage = (JcaPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) instanceof JcaPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) : JcaPackage.eINSTANCE);
>+		EjbPackageImpl theEjbPackage = (EjbPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) instanceof EjbPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) : EjbPackage.eINSTANCE);
> 		JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) instanceof JspPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) : JspPackage.eINSTANCE);
>+		WebappPackageImpl theWebappPackage = (WebappPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebappPackage.eNS_URI) instanceof WebappPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebappPackage.eNS_URI) : WebappPackage.eINSTANCE);
>+		WebfragmentPackageImpl theWebfragmentPackage = (WebfragmentPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebfragmentPackage.eNS_URI) instanceof WebfragmentPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebfragmentPackage.eNS_URI) : WebfragmentPackage.eINSTANCE);
> 
> 		// Create package meta-data objects
> 		theWebPackage.createPackageContents();
> 		theApplicationPackage.createPackageContents();
> 		theJavaeePackage.createPackageContents();
>-		theEjbPackage.createPackageContents();
> 		theApplicationclientPackage.createPackageContents();
>+		theJcaPackage.createPackageContents();
>+		theEjbPackage.createPackageContents();
> 		theJspPackage.createPackageContents();
>+		theWebappPackage.createPackageContents();
>+		theWebfragmentPackage.createPackageContents();
> 
> 		// Initialize created meta-data
> 		theWebPackage.initializePackageContents();
> 		theApplicationPackage.initializePackageContents();
> 		theJavaeePackage.initializePackageContents();
>-		theEjbPackage.initializePackageContents();
> 		theApplicationclientPackage.initializePackageContents();
>+		theJcaPackage.initializePackageContents();
>+		theEjbPackage.initializePackageContents();
> 		theJspPackage.initializePackageContents();
>+		theWebappPackage.initializePackageContents();
>+		theWebfragmentPackage.initializePackageContents();
> 
> 		// Register package validator
> 		EValidator.Registry.INSTANCE.put
>@@ -435,6 +543,9 @@
> 		// Mark meta-data to indicate it can't be changed
> 		theWebPackage.freeze();
> 
>+ 
>+		// Update the registry and return the package
>+		EPackage.Registry.INSTANCE.put(WebPackage.eNS_URI, theWebPackage);
> 		return theWebPackage;
> 	}
> 
>@@ -443,6 +554,42 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EClass getAbsoluteOrderingType() {
>+		return absoluteOrderingTypeEClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getAbsoluteOrderingType_Group() {
>+		return (EAttribute)absoluteOrderingTypeEClass.getEStructuralFeatures().get(0);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getAbsoluteOrderingType_Name() {
>+		return (EAttribute)absoluteOrderingTypeEClass.getEStructuralFeatures().get(1);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getAbsoluteOrderingType_Others() {
>+		return (EReference)absoluteOrderingTypeEClass.getEStructuralFeatures().get(2);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EClass getAuthConstraint() {
> 		return authConstraintEClass;
> 	}
>@@ -479,6 +626,159 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EClass getCookieCommentType() {
>+		return cookieCommentTypeEClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getCookieCommentType_Value() {
>+		return (EAttribute)cookieCommentTypeEClass.getEStructuralFeatures().get(0);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EClass getCookieConfigType() {
>+		return cookieConfigTypeEClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getCookieConfigType_Name() {
>+		return (EReference)cookieConfigTypeEClass.getEStructuralFeatures().get(0);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getCookieConfigType_Domain() {
>+		return (EReference)cookieConfigTypeEClass.getEStructuralFeatures().get(1);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getCookieConfigType_Path() {
>+		return (EReference)cookieConfigTypeEClass.getEStructuralFeatures().get(2);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getCookieConfigType_Comment() {
>+		return (EReference)cookieConfigTypeEClass.getEStructuralFeatures().get(3);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getCookieConfigType_HttpOnly() {
>+		return (EAttribute)cookieConfigTypeEClass.getEStructuralFeatures().get(4);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getCookieConfigType_Secure() {
>+		return (EAttribute)cookieConfigTypeEClass.getEStructuralFeatures().get(5);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getCookieConfigType_MaxAge() {
>+		return (EAttribute)cookieConfigTypeEClass.getEStructuralFeatures().get(6);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getCookieConfigType_Id() {
>+		return (EAttribute)cookieConfigTypeEClass.getEStructuralFeatures().get(7);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EClass getCookieDomainType() {
>+		return cookieDomainTypeEClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getCookieDomainType_Value() {
>+		return (EAttribute)cookieDomainTypeEClass.getEStructuralFeatures().get(0);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EClass getCookieNameType() {
>+		return cookieNameTypeEClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getCookieNameType_Value() {
>+		return (EAttribute)cookieNameTypeEClass.getEStructuralFeatures().get(0);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EClass getCookiePathType() {
>+		return cookiePathTypeEClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getCookiePathType_Value() {
>+		return (EAttribute)cookiePathTypeEClass.getEStructuralFeatures().get(0);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EClass getErrorPage() {
> 		return errorPageEClass;
> 	}
>@@ -578,8 +878,17 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EAttribute getFilter_AsyncSupported() {
>+		return (EAttribute)filterEClass.getEStructuralFeatures().get(5);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EReference getFilter_InitParams() {
>-		return (EReference)filterEClass.getEStructuralFeatures().get(5);
>+		return (EReference)filterEClass.getEStructuralFeatures().get(6);
> 	}
> 
> 	/**
>@@ -588,7 +897,7 @@
> 	 * @generated
> 	 */
> 	public EAttribute getFilter_Id() {
>-		return (EAttribute)filterEClass.getEStructuralFeatures().get(6);
>+		return (EAttribute)filterEClass.getEStructuralFeatures().get(7);
> 	}
> 
> 	/**
>@@ -839,8 +1148,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EClass getSecurityConstraint() {
>-		return securityConstraintEClass;
>+	public EClass getMultipartConfigType() {
>+		return multipartConfigTypeEClass;
> 	}
> 
> 	/**
>@@ -848,8 +1157,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getSecurityConstraint_DisplayNames() {
>-		return (EReference)securityConstraintEClass.getEStructuralFeatures().get(0);
>+	public EAttribute getMultipartConfigType_Location() {
>+		return (EAttribute)multipartConfigTypeEClass.getEStructuralFeatures().get(0);
> 	}
> 
> 	/**
>@@ -857,8 +1166,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getSecurityConstraint_WebResourceCollections() {
>-		return (EReference)securityConstraintEClass.getEStructuralFeatures().get(1);
>+	public EAttribute getMultipartConfigType_MaxFileSize() {
>+		return (EAttribute)multipartConfigTypeEClass.getEStructuralFeatures().get(1);
> 	}
> 
> 	/**
>@@ -866,8 +1175,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getSecurityConstraint_AuthConstraint() {
>-		return (EReference)securityConstraintEClass.getEStructuralFeatures().get(2);
>+	public EAttribute getMultipartConfigType_MaxRequestSize() {
>+		return (EAttribute)multipartConfigTypeEClass.getEStructuralFeatures().get(2);
> 	}
> 
> 	/**
>@@ -875,8 +1184,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getSecurityConstraint_UserDataConstraint() {
>-		return (EReference)securityConstraintEClass.getEStructuralFeatures().get(3);
>+	public EAttribute getMultipartConfigType_FileSizeThreshold() {
>+		return (EAttribute)multipartConfigTypeEClass.getEStructuralFeatures().get(3);
> 	}
> 
> 	/**
>@@ -884,8 +1193,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EAttribute getSecurityConstraint_Id() {
>-		return (EAttribute)securityConstraintEClass.getEStructuralFeatures().get(4);
>+	public EClass getOrderingOrderingType() {
>+		return orderingOrderingTypeEClass;
> 	}
> 
> 	/**
>@@ -893,8 +1202,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EClass getServlet() {
>-		return servletEClass;
>+	public EAttribute getOrderingOrderingType_Name() {
>+		return (EAttribute)orderingOrderingTypeEClass.getEStructuralFeatures().get(0);
> 	}
> 
> 	/**
>@@ -902,8 +1211,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getServlet_Descriptions() {
>-		return (EReference)servletEClass.getEStructuralFeatures().get(0);
>+	public EReference getOrderingOrderingType_Others() {
>+		return (EReference)orderingOrderingTypeEClass.getEStructuralFeatures().get(1);
> 	}
> 
> 	/**
>@@ -911,8 +1220,125 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getServlet_DisplayNames() {
>-		return (EReference)servletEClass.getEStructuralFeatures().get(1);
>+	public EClass getOrderingOthersType() {
>+		return orderingOthersTypeEClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getOrderingOthersType_Id() {
>+		return (EAttribute)orderingOthersTypeEClass.getEStructuralFeatures().get(0);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EClass getOrderingType() {
>+		return orderingTypeEClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getOrderingType_After() {
>+		return (EReference)orderingTypeEClass.getEStructuralFeatures().get(0);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getOrderingType_Before() {
>+		return (EReference)orderingTypeEClass.getEStructuralFeatures().get(1);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EClass getSecurityConstraint() {
>+		return securityConstraintEClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getSecurityConstraint_DisplayNames() {
>+		return (EReference)securityConstraintEClass.getEStructuralFeatures().get(0);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getSecurityConstraint_WebResourceCollections() {
>+		return (EReference)securityConstraintEClass.getEStructuralFeatures().get(1);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getSecurityConstraint_AuthConstraint() {
>+		return (EReference)securityConstraintEClass.getEStructuralFeatures().get(2);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getSecurityConstraint_UserDataConstraint() {
>+		return (EReference)securityConstraintEClass.getEStructuralFeatures().get(3);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getSecurityConstraint_Id() {
>+		return (EAttribute)securityConstraintEClass.getEStructuralFeatures().get(4);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EClass getServlet() {
>+		return servletEClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getServlet_Descriptions() {
>+		return (EReference)servletEClass.getEStructuralFeatures().get(0);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getServlet_DisplayNames() {
>+		return (EReference)servletEClass.getEStructuralFeatures().get(1);
> 	}
> 
> 	/**
>@@ -974,8 +1400,26 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EAttribute getServlet_Enabled() {
>+		return (EAttribute)servletEClass.getEStructuralFeatures().get(8);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getServlet_AsyncSupported() {
>+		return (EAttribute)servletEClass.getEStructuralFeatures().get(9);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EReference getServlet_RunAs() {
>-		return (EReference)servletEClass.getEStructuralFeatures().get(8);
>+		return (EReference)servletEClass.getEStructuralFeatures().get(10);
> 	}
> 
> 	/**
>@@ -984,7 +1428,16 @@
> 	 * @generated
> 	 */
> 	public EReference getServlet_SecurityRoleRefs() {
>-		return (EReference)servletEClass.getEStructuralFeatures().get(9);
>+		return (EReference)servletEClass.getEStructuralFeatures().get(11);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getServlet_MultipartConfig() {
>+		return (EReference)servletEClass.getEStructuralFeatures().get(12);
> 	}
> 
> 	/**
>@@ -993,7 +1446,7 @@
> 	 * @generated
> 	 */
> 	public EAttribute getServlet_Id() {
>-		return (EAttribute)servletEClass.getEStructuralFeatures().get(10);
>+		return (EAttribute)servletEClass.getEStructuralFeatures().get(13);
> 	}
> 
> 	/**
>@@ -1055,8 +1508,26 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EReference getSessionConfig_CookieConfig() {
>+		return (EReference)sessionConfigEClass.getEStructuralFeatures().get(1);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getSessionConfig_TrackingMode() {
>+		return (EAttribute)sessionConfigEClass.getEStructuralFeatures().get(2);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EAttribute getSessionConfig_Id() {
>-		return (EAttribute)sessionConfigEClass.getEStructuralFeatures().get(1);
>+		return (EAttribute)sessionConfigEClass.getEStructuralFeatures().get(3);
> 	}
> 
> 	/**
>@@ -1145,8 +1616,17 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EAttribute getWebApp_Name() {
>+		return (EAttribute)webAppEClass.getEStructuralFeatures().get(4);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EReference getWebApp_Distributables() {
>-		return (EReference)webAppEClass.getEStructuralFeatures().get(4);
>+		return (EReference)webAppEClass.getEStructuralFeatures().get(5);
> 	}
> 
> 	/**
>@@ -1155,7 +1635,7 @@
> 	 * @generated
> 	 */
> 	public EReference getWebApp_ContextParams() {
>-		return (EReference)webAppEClass.getEStructuralFeatures().get(5);
>+		return (EReference)webAppEClass.getEStructuralFeatures().get(6);
> 	}
> 
> 	/**
>@@ -1164,7 +1644,7 @@
> 	 * @generated
> 	 */
> 	public EReference getWebApp_Filters() {
>-		return (EReference)webAppEClass.getEStructuralFeatures().get(6);
>+		return (EReference)webAppEClass.getEStructuralFeatures().get(7);
> 	}
> 
> 	/**
>@@ -1173,7 +1653,7 @@
> 	 * @generated
> 	 */
> 	public EReference getWebApp_FilterMappings() {
>-		return (EReference)webAppEClass.getEStructuralFeatures().get(7);
>+		return (EReference)webAppEClass.getEStructuralFeatures().get(8);
> 	}
> 
> 	/**
>@@ -1182,7 +1662,7 @@
> 	 * @generated
> 	 */
> 	public EReference getWebApp_Listeners() {
>-		return (EReference)webAppEClass.getEStructuralFeatures().get(8);
>+		return (EReference)webAppEClass.getEStructuralFeatures().get(9);
> 	}
> 
> 	/**
>@@ -1191,7 +1671,7 @@
> 	 * @generated
> 	 */
> 	public EReference getWebApp_Servlets() {
>-		return (EReference)webAppEClass.getEStructuralFeatures().get(9);
>+		return (EReference)webAppEClass.getEStructuralFeatures().get(10);
> 	}
> 
> 	/**
>@@ -1200,7 +1680,7 @@
> 	 * @generated
> 	 */
> 	public EReference getWebApp_ServletMappings() {
>-		return (EReference)webAppEClass.getEStructuralFeatures().get(10);
>+		return (EReference)webAppEClass.getEStructuralFeatures().get(11);
> 	}
> 
> 	/**
>@@ -1209,7 +1689,7 @@
> 	 * @generated
> 	 */
> 	public EReference getWebApp_SessionConfigs() {
>-		return (EReference)webAppEClass.getEStructuralFeatures().get(11);
>+		return (EReference)webAppEClass.getEStructuralFeatures().get(12);
> 	}
> 
> 	/**
>@@ -1218,7 +1698,7 @@
> 	 * @generated
> 	 */
> 	public EReference getWebApp_MimeMappings() {
>-		return (EReference)webAppEClass.getEStructuralFeatures().get(12);
>+		return (EReference)webAppEClass.getEStructuralFeatures().get(13);
> 	}
> 
> 	/**
>@@ -1227,7 +1707,7 @@
> 	 * @generated
> 	 */
> 	public EReference getWebApp_WelcomeFileLists() {
>-		return (EReference)webAppEClass.getEStructuralFeatures().get(13);
>+		return (EReference)webAppEClass.getEStructuralFeatures().get(14);
> 	}
> 
> 	/**
>@@ -1236,7 +1716,7 @@
> 	 * @generated
> 	 */
> 	public EReference getWebApp_ErrorPages() {
>-		return (EReference)webAppEClass.getEStructuralFeatures().get(14);
>+		return (EReference)webAppEClass.getEStructuralFeatures().get(15);
> 	}
> 
> 	/**
>@@ -1245,7 +1725,7 @@
> 	 * @generated
> 	 */
> 	public EReference getWebApp_JspConfigs() {
>-		return (EReference)webAppEClass.getEStructuralFeatures().get(15);
>+		return (EReference)webAppEClass.getEStructuralFeatures().get(16);
> 	}
> 
> 	/**
>@@ -1254,7 +1734,7 @@
> 	 * @generated
> 	 */
> 	public EReference getWebApp_SecurityConstraints() {
>-		return (EReference)webAppEClass.getEStructuralFeatures().get(16);
>+		return (EReference)webAppEClass.getEStructuralFeatures().get(17);
> 	}
> 
> 	/**
>@@ -1263,7 +1743,7 @@
> 	 * @generated
> 	 */
> 	public EReference getWebApp_LoginConfigs() {
>-		return (EReference)webAppEClass.getEStructuralFeatures().get(17);
>+		return (EReference)webAppEClass.getEStructuralFeatures().get(18);
> 	}
> 
> 	/**
>@@ -1272,7 +1752,7 @@
> 	 * @generated
> 	 */
> 	public EReference getWebApp_SecurityRoles() {
>-		return (EReference)webAppEClass.getEStructuralFeatures().get(18);
>+		return (EReference)webAppEClass.getEStructuralFeatures().get(19);
> 	}
> 
> 	/**
>@@ -1281,7 +1761,7 @@
> 	 * @generated
> 	 */
> 	public EReference getWebApp_EnvEntries() {
>-		return (EReference)webAppEClass.getEStructuralFeatures().get(19);
>+		return (EReference)webAppEClass.getEStructuralFeatures().get(20);
> 	}
> 
> 	/**
>@@ -1290,7 +1770,7 @@
> 	 * @generated
> 	 */
> 	public EReference getWebApp_EjbRefs() {
>-		return (EReference)webAppEClass.getEStructuralFeatures().get(20);
>+		return (EReference)webAppEClass.getEStructuralFeatures().get(21);
> 	}
> 
> 	/**
>@@ -1299,7 +1779,7 @@
> 	 * @generated
> 	 */
> 	public EReference getWebApp_EjbLocalRefs() {
>-		return (EReference)webAppEClass.getEStructuralFeatures().get(21);
>+		return (EReference)webAppEClass.getEStructuralFeatures().get(22);
> 	}
> 
> 	/**
>@@ -1308,7 +1788,7 @@
> 	 * @generated
> 	 */
> 	public EReference getWebApp_ServiceRefs() {
>-		return (EReference)webAppEClass.getEStructuralFeatures().get(22);
>+		return (EReference)webAppEClass.getEStructuralFeatures().get(23);
> 	}
> 
> 	/**
>@@ -1317,7 +1797,7 @@
> 	 * @generated
> 	 */
> 	public EReference getWebApp_ResourceRefs() {
>-		return (EReference)webAppEClass.getEStructuralFeatures().get(23);
>+		return (EReference)webAppEClass.getEStructuralFeatures().get(24);
> 	}
> 
> 	/**
>@@ -1326,7 +1806,7 @@
> 	 * @generated
> 	 */
> 	public EReference getWebApp_ResourceEnvRefs() {
>-		return (EReference)webAppEClass.getEStructuralFeatures().get(24);
>+		return (EReference)webAppEClass.getEStructuralFeatures().get(25);
> 	}
> 
> 	/**
>@@ -1335,7 +1815,7 @@
> 	 * @generated
> 	 */
> 	public EReference getWebApp_MessageDestinationRefs() {
>-		return (EReference)webAppEClass.getEStructuralFeatures().get(25);
>+		return (EReference)webAppEClass.getEStructuralFeatures().get(26);
> 	}
> 
> 	/**
>@@ -1344,7 +1824,7 @@
> 	 * @generated
> 	 */
> 	public EReference getWebApp_PersistenceContextRefs() {
>-		return (EReference)webAppEClass.getEStructuralFeatures().get(26);
>+		return (EReference)webAppEClass.getEStructuralFeatures().get(27);
> 	}
> 
> 	/**
>@@ -1353,7 +1833,7 @@
> 	 * @generated
> 	 */
> 	public EReference getWebApp_PersistenceUnitRefs() {
>-		return (EReference)webAppEClass.getEStructuralFeatures().get(27);
>+		return (EReference)webAppEClass.getEStructuralFeatures().get(28);
> 	}
> 
> 	/**
>@@ -1362,7 +1842,7 @@
> 	 * @generated
> 	 */
> 	public EReference getWebApp_PostConstructs() {
>-		return (EReference)webAppEClass.getEStructuralFeatures().get(28);
>+		return (EReference)webAppEClass.getEStructuralFeatures().get(29);
> 	}
> 
> 	/**
>@@ -1371,7 +1851,16 @@
> 	 * @generated
> 	 */
> 	public EReference getWebApp_PreDestroys() {
>-		return (EReference)webAppEClass.getEStructuralFeatures().get(29);
>+		return (EReference)webAppEClass.getEStructuralFeatures().get(30);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getWebApp_DataSource() {
>+		return (EReference)webAppEClass.getEStructuralFeatures().get(31);
> 	}
> 
> 	/**
>@@ -1380,7 +1869,7 @@
> 	 * @generated
> 	 */
> 	public EReference getWebApp_MessageDestinations() {
>-		return (EReference)webAppEClass.getEStructuralFeatures().get(30);
>+		return (EReference)webAppEClass.getEStructuralFeatures().get(32);
> 	}
> 
> 	/**
>@@ -1389,7 +1878,25 @@
> 	 * @generated
> 	 */
> 	public EReference getWebApp_LocalEncodingMappingsLists() {
>-		return (EReference)webAppEClass.getEStructuralFeatures().get(31);
>+		return (EReference)webAppEClass.getEStructuralFeatures().get(33);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getWebApp_ModuleName() {
>+		return (EAttribute)webAppEClass.getEStructuralFeatures().get(34);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getWebApp_AbsoluteOrdering() {
>+		return (EReference)webAppEClass.getEStructuralFeatures().get(35);
> 	}
> 
> 	/**
>@@ -1398,7 +1905,7 @@
> 	 * @generated
> 	 */
> 	public EAttribute getWebApp_Id() {
>-		return (EAttribute)webAppEClass.getEStructuralFeatures().get(32);
>+		return (EAttribute)webAppEClass.getEStructuralFeatures().get(36);
> 	}
> 
> 	/**
>@@ -1407,7 +1914,7 @@
> 	 * @generated
> 	 */
> 	public EAttribute getWebApp_MetadataComplete() {
>-		return (EAttribute)webAppEClass.getEStructuralFeatures().get(33);
>+		return (EAttribute)webAppEClass.getEStructuralFeatures().get(37);
> 	}
> 
> 	/**
>@@ -1416,7 +1923,7 @@
> 	 * @generated
> 	 */
> 	public EAttribute getWebApp_Version() {
>-		return (EAttribute)webAppEClass.getEStructuralFeatures().get(34);
>+		return (EAttribute)webAppEClass.getEStructuralFeatures().get(38);
> 	}
> 
> 	/**
>@@ -1469,8 +1976,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EClass getWebResourceCollection() {
>-		return webResourceCollectionEClass;
>+	public EClass getWebFragment() {
>+		return webFragmentEClass;
> 	}
> 
> 	/**
>@@ -1478,8 +1985,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EAttribute getWebResourceCollection_WebResourceName() {
>-		return (EAttribute)webResourceCollectionEClass.getEStructuralFeatures().get(0);
>+	public EAttribute getWebFragment_Group() {
>+		return (EAttribute)webFragmentEClass.getEStructuralFeatures().get(0);
> 	}
> 
> 	/**
>@@ -1487,8 +1994,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getWebResourceCollection_Descriptions() {
>-		return (EReference)webResourceCollectionEClass.getEStructuralFeatures().get(1);
>+	public EReference getWebFragment_Descriptions() {
>+		return (EReference)webFragmentEClass.getEStructuralFeatures().get(1);
> 	}
> 
> 	/**
>@@ -1496,8 +2003,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getWebResourceCollection_UrlPatterns() {
>-		return (EReference)webResourceCollectionEClass.getEStructuralFeatures().get(2);
>+	public EReference getWebFragment_DisplayNames() {
>+		return (EReference)webFragmentEClass.getEStructuralFeatures().get(2);
> 	}
> 
> 	/**
>@@ -1505,8 +2012,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EAttribute getWebResourceCollection_HttpMethods() {
>-		return (EAttribute)webResourceCollectionEClass.getEStructuralFeatures().get(3);
>+	public EReference getWebFragment_Icons() {
>+		return (EReference)webFragmentEClass.getEStructuralFeatures().get(3);
> 	}
> 
> 	/**
>@@ -1514,8 +2021,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EAttribute getWebResourceCollection_Id() {
>-		return (EAttribute)webResourceCollectionEClass.getEStructuralFeatures().get(4);
>+	public EAttribute getWebFragment_Name() {
>+		return (EAttribute)webFragmentEClass.getEStructuralFeatures().get(4);
> 	}
> 
> 	/**
>@@ -1523,8 +2030,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EClass getWelcomeFileList() {
>-		return welcomeFileListEClass;
>+	public EReference getWebFragment_Distributables() {
>+		return (EReference)webFragmentEClass.getEStructuralFeatures().get(5);
> 	}
> 
> 	/**
>@@ -1532,8 +2039,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EAttribute getWelcomeFileList_WelcomeFiles() {
>-		return (EAttribute)welcomeFileListEClass.getEStructuralFeatures().get(0);
>+	public EReference getWebFragment_ContextParams() {
>+		return (EReference)webFragmentEClass.getEStructuralFeatures().get(6);
> 	}
> 
> 	/**
>@@ -1541,8 +2048,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EAttribute getWelcomeFileList_Id() {
>-		return (EAttribute)welcomeFileListEClass.getEStructuralFeatures().get(1);
>+	public EReference getWebFragment_Filters() {
>+		return (EReference)webFragmentEClass.getEStructuralFeatures().get(7);
> 	}
> 
> 	/**
>@@ -1550,8 +2057,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EEnum getDispatcherType() {
>-		return dispatcherTypeEEnum;
>+	public EReference getWebFragment_FilterMappings() {
>+		return (EReference)webFragmentEClass.getEStructuralFeatures().get(8);
> 	}
> 
> 	/**
>@@ -1559,8 +2066,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EEnum getNullCharType() {
>-		return nullCharTypeEEnum;
>+	public EReference getWebFragment_Listeners() {
>+		return (EReference)webFragmentEClass.getEStructuralFeatures().get(9);
> 	}
> 
> 	/**
>@@ -1568,8 +2075,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EEnum getTransportGuaranteeType() {
>-		return transportGuaranteeTypeEEnum;
>+	public EReference getWebFragment_Servlets() {
>+		return (EReference)webFragmentEClass.getEStructuralFeatures().get(10);
> 	}
> 
> 	/**
>@@ -1577,8 +2084,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EEnum getWebAppVersionType() {
>-		return webAppVersionTypeEEnum;
>+	public EReference getWebFragment_ServletMappings() {
>+		return (EReference)webFragmentEClass.getEStructuralFeatures().get(11);
> 	}
> 
> 	/**
>@@ -1586,8 +2093,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EDataType getAuthMethodType() {
>-		return authMethodTypeEDataType;
>+	public EReference getWebFragment_SessionConfigs() {
>+		return (EReference)webFragmentEClass.getEStructuralFeatures().get(12);
> 	}
> 
> 	/**
>@@ -1595,8 +2102,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EDataType getDispatcherTypeObject() {
>-		return dispatcherTypeObjectEDataType;
>+	public EReference getWebFragment_MimeMappings() {
>+		return (EReference)webFragmentEClass.getEStructuralFeatures().get(13);
> 	}
> 
> 	/**
>@@ -1604,8 +2111,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EDataType getEncodingType() {
>-		return encodingTypeEDataType;
>+	public EReference getWebFragment_WelcomeFileLists() {
>+		return (EReference)webFragmentEClass.getEStructuralFeatures().get(14);
> 	}
> 
> 	/**
>@@ -1613,8 +2120,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EDataType getErrorCodeType() {
>-		return errorCodeTypeEDataType;
>+	public EReference getWebFragment_ErrorPages() {
>+		return (EReference)webFragmentEClass.getEStructuralFeatures().get(15);
> 	}
> 
> 	/**
>@@ -1622,8 +2129,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EDataType getFilterNameType() {
>-		return filterNameTypeEDataType;
>+	public EReference getWebFragment_JspConfigs() {
>+		return (EReference)webFragmentEClass.getEStructuralFeatures().get(16);
> 	}
> 
> 	/**
>@@ -1631,8 +2138,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EDataType getHttpMethodType() {
>-		return httpMethodTypeEDataType;
>+	public EReference getWebFragment_SecurityConstraints() {
>+		return (EReference)webFragmentEClass.getEStructuralFeatures().get(17);
> 	}
> 
> 	/**
>@@ -1640,8 +2147,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EDataType getLoadOnStartupType() {
>-		return loadOnStartupTypeEDataType;
>+	public EReference getWebFragment_LoginConfigs() {
>+		return (EReference)webFragmentEClass.getEStructuralFeatures().get(18);
> 	}
> 
> 	/**
>@@ -1649,8 +2156,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EDataType getLocaleType() {
>-		return localeTypeEDataType;
>+	public EReference getWebFragment_SecurityRoles() {
>+		return (EReference)webFragmentEClass.getEStructuralFeatures().get(19);
> 	}
> 
> 	/**
>@@ -1658,8 +2165,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EDataType getMimeTypeType() {
>-		return mimeTypeTypeEDataType;
>+	public EReference getWebFragment_EnvEntries() {
>+		return (EReference)webFragmentEClass.getEStructuralFeatures().get(20);
> 	}
> 
> 	/**
>@@ -1667,8 +2174,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EDataType getNonEmptyStringType() {
>-		return nonEmptyStringTypeEDataType;
>+	public EReference getWebFragment_EjbRefs() {
>+		return (EReference)webFragmentEClass.getEStructuralFeatures().get(21);
> 	}
> 
> 	/**
>@@ -1676,8 +2183,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EDataType getNullCharTypeObject() {
>-		return nullCharTypeObjectEDataType;
>+	public EReference getWebFragment_EjbLocalRefs() {
>+		return (EReference)webFragmentEClass.getEStructuralFeatures().get(22);
> 	}
> 
> 	/**
>@@ -1685,8 +2192,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EDataType getServletNameType() {
>-		return servletNameTypeEDataType;
>+	public EReference getWebFragment_ServiceRefs() {
>+		return (EReference)webFragmentEClass.getEStructuralFeatures().get(23);
> 	}
> 
> 	/**
>@@ -1694,8 +2201,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EDataType getTransportGuaranteeTypeObject() {
>-		return transportGuaranteeTypeObjectEDataType;
>+	public EReference getWebFragment_ResourceRefs() {
>+		return (EReference)webFragmentEClass.getEStructuralFeatures().get(24);
> 	}
> 
> 	/**
>@@ -1703,8 +2210,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EDataType getWarPathType() {
>-		return warPathTypeEDataType;
>+	public EReference getWebFragment_ResourceEnvRefs() {
>+		return (EReference)webFragmentEClass.getEStructuralFeatures().get(25);
> 	}
> 
> 	/**
>@@ -1712,8 +2219,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EDataType getWebAppVersionTypeObject() {
>-		return webAppVersionTypeObjectEDataType;
>+	public EReference getWebFragment_MessageDestinationRefs() {
>+		return (EReference)webFragmentEClass.getEStructuralFeatures().get(26);
> 	}
> 
> 	/**
>@@ -1721,8 +2228,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public WebFactory getWebFactory() {
>-		return (WebFactory)getEFactoryInstance();
>+	public EReference getWebFragment_PersistenceContextRefs() {
>+		return (EReference)webFragmentEClass.getEStructuralFeatures().get(27);
> 	}
> 
> 	/**
>@@ -1730,183 +2237,89 @@
> 	 * 
> 	 * @generated
> 	 */
>-	private boolean isCreated = false;
>+	public EReference getWebFragment_PersistenceUnitRefs() {
>+		return (EReference)webFragmentEClass.getEStructuralFeatures().get(28);
>+	}
> 
> 	/**
>-	 * Creates the meta-model objects for the package. This method is
>-	 * guarded to have no affect on any invocation but its first.
> 	 * 
> 	 * 
> 	 * @generated
> 	 */
>-	public void createPackageContents() {
>-		if (isCreated) return;
>-		isCreated = true;
>-
>-		// Create classes and their features
>-		authConstraintEClass = createEClass(AUTH_CONSTRAINT);
>-		createEReference(authConstraintEClass, AUTH_CONSTRAINT__DESCRIPTIONS);
>-		createEAttribute(authConstraintEClass, AUTH_CONSTRAINT__ROLE_NAMES);
>-		createEAttribute(authConstraintEClass, AUTH_CONSTRAINT__ID);
>-
>-		errorPageEClass = createEClass(ERROR_PAGE);
>-		createEAttribute(errorPageEClass, ERROR_PAGE__ERROR_CODE);
>-		createEAttribute(errorPageEClass, ERROR_PAGE__EXCEPTION_TYPE);
>-		createEAttribute(errorPageEClass, ERROR_PAGE__LOCATION);
>-		createEAttribute(errorPageEClass, ERROR_PAGE__ID);
>-
>-		filterEClass = createEClass(FILTER);
>-		createEReference(filterEClass, FILTER__DESCRIPTIONS);
>-		createEReference(filterEClass, FILTER__DISPLAY_NAMES);
>-		createEReference(filterEClass, FILTER__ICONS);
>-		createEAttribute(filterEClass, FILTER__FILTER_NAME);
>-		createEAttribute(filterEClass, FILTER__FILTER_CLASS);
>-		createEReference(filterEClass, FILTER__INIT_PARAMS);
>-		createEAttribute(filterEClass, FILTER__ID);
>-
>-		filterMappingEClass = createEClass(FILTER_MAPPING);
>-		createEAttribute(filterMappingEClass, FILTER_MAPPING__FILTER_NAME);
>-		createEAttribute(filterMappingEClass, FILTER_MAPPING__GROUP);
>-		createEReference(filterMappingEClass, FILTER_MAPPING__URL_PATTERNS);
>-		createEAttribute(filterMappingEClass, FILTER_MAPPING__SERVLET_NAMES);
>-		createEAttribute(filterMappingEClass, FILTER_MAPPING__DISPATCHERS);
>-		createEAttribute(filterMappingEClass, FILTER_MAPPING__ID);
>-
>-		formLoginConfigEClass = createEClass(FORM_LOGIN_CONFIG);
>-		createEAttribute(formLoginConfigEClass, FORM_LOGIN_CONFIG__FORM_LOGIN_PAGE);
>-		createEAttribute(formLoginConfigEClass, FORM_LOGIN_CONFIG__FORM_ERROR_PAGE);
>-		createEAttribute(formLoginConfigEClass, FORM_LOGIN_CONFIG__ID);
>-
>-		localeEncodingMappingEClass = createEClass(LOCALE_ENCODING_MAPPING);
>-		createEAttribute(localeEncodingMappingEClass, LOCALE_ENCODING_MAPPING__LOCALE);
>-		createEAttribute(localeEncodingMappingEClass, LOCALE_ENCODING_MAPPING__ENCODING);
>-		createEAttribute(localeEncodingMappingEClass, LOCALE_ENCODING_MAPPING__ID);
>-
>-		localeEncodingMappingListEClass = createEClass(LOCALE_ENCODING_MAPPING_LIST);
>-		createEReference(localeEncodingMappingListEClass, LOCALE_ENCODING_MAPPING_LIST__LOCAL_ENCODING_MAPPINGS);
>-		createEAttribute(localeEncodingMappingListEClass, LOCALE_ENCODING_MAPPING_LIST__ID);
>-
>-		loginConfigEClass = createEClass(LOGIN_CONFIG);
>-		createEAttribute(loginConfigEClass, LOGIN_CONFIG__AUTH_METHOD);
>-		createEAttribute(loginConfigEClass, LOGIN_CONFIG__REALM_NAME);
>-		createEReference(loginConfigEClass, LOGIN_CONFIG__FORM_LOGIN_CONFIG);
>-		createEAttribute(loginConfigEClass, LOGIN_CONFIG__ID);
>-
>-		mimeMappingEClass = createEClass(MIME_MAPPING);
>-		createEAttribute(mimeMappingEClass, MIME_MAPPING__EXTENSION);
>-		createEAttribute(mimeMappingEClass, MIME_MAPPING__MIME_TYPE);
>-		createEAttribute(mimeMappingEClass, MIME_MAPPING__ID);
>-
>-		securityConstraintEClass = createEClass(SECURITY_CONSTRAINT);
>-		createEReference(securityConstraintEClass, SECURITY_CONSTRAINT__DISPLAY_NAMES);
>-		createEReference(securityConstraintEClass, SECURITY_CONSTRAINT__WEB_RESOURCE_COLLECTIONS);
>-		createEReference(securityConstraintEClass, SECURITY_CONSTRAINT__AUTH_CONSTRAINT);
>-		createEReference(securityConstraintEClass, SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT);
>-		createEAttribute(securityConstraintEClass, SECURITY_CONSTRAINT__ID);
>-
>-		servletEClass = createEClass(SERVLET);
>-		createEReference(servletEClass, SERVLET__DESCRIPTIONS);
>-		createEReference(servletEClass, SERVLET__DISPLAY_NAMES);
>-		createEReference(servletEClass, SERVLET__ICONS);
>-		createEAttribute(servletEClass, SERVLET__SERVLET_NAME);
>-		createEAttribute(servletEClass, SERVLET__SERVLET_CLASS);
>-		createEAttribute(servletEClass, SERVLET__JSP_FILE);
>-		createEReference(servletEClass, SERVLET__INIT_PARAMS);
>-		createEAttribute(servletEClass, SERVLET__LOAD_ON_STARTUP);
>-		createEReference(servletEClass, SERVLET__RUN_AS);
>-		createEReference(servletEClass, SERVLET__SECURITY_ROLE_REFS);
>-		createEAttribute(servletEClass, SERVLET__ID);
>-
>-		servletMappingEClass = createEClass(SERVLET_MAPPING);
>-		createEAttribute(servletMappingEClass, SERVLET_MAPPING__SERVLET_NAME);
>-		createEReference(servletMappingEClass, SERVLET_MAPPING__URL_PATTERNS);
>-		createEAttribute(servletMappingEClass, SERVLET_MAPPING__ID);
>+	public EReference getWebFragment_PostConstructs() {
>+		return (EReference)webFragmentEClass.getEStructuralFeatures().get(29);
>+	}
> 
>-		sessionConfigEClass = createEClass(SESSION_CONFIG);
>-		createEAttribute(sessionConfigEClass, SESSION_CONFIG__SESSION_TIMEOUT);
>-		createEAttribute(sessionConfigEClass, SESSION_CONFIG__ID);
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getWebFragment_PreDestroys() {
>+		return (EReference)webFragmentEClass.getEStructuralFeatures().get(30);
>+	}
> 
>-		userDataConstraintEClass = createEClass(USER_DATA_CONSTRAINT);
>-		createEReference(userDataConstraintEClass, USER_DATA_CONSTRAINT__DESCRIPTIONS);
>-		createEAttribute(userDataConstraintEClass, USER_DATA_CONSTRAINT__TRANSPORT_GUARANTEE);
>-		createEAttribute(userDataConstraintEClass, USER_DATA_CONSTRAINT__ID);
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getWebFragment_DataSource() {
>+		return (EReference)webFragmentEClass.getEStructuralFeatures().get(31);
>+	}
> 
>-		webAppEClass = createEClass(WEB_APP);
>-		createEAttribute(webAppEClass, WEB_APP__GROUP);
>-		createEReference(webAppEClass, WEB_APP__DESCRIPTIONS);
>-		createEReference(webAppEClass, WEB_APP__DISPLAY_NAMES);
>-		createEReference(webAppEClass, WEB_APP__ICONS);
>-		createEReference(webAppEClass, WEB_APP__DISTRIBUTABLES);
>-		createEReference(webAppEClass, WEB_APP__CONTEXT_PARAMS);
>-		createEReference(webAppEClass, WEB_APP__FILTERS);
>-		createEReference(webAppEClass, WEB_APP__FILTER_MAPPINGS);
>-		createEReference(webAppEClass, WEB_APP__LISTENERS);
>-		createEReference(webAppEClass, WEB_APP__SERVLETS);
>-		createEReference(webAppEClass, WEB_APP__SERVLET_MAPPINGS);
>-		createEReference(webAppEClass, WEB_APP__SESSION_CONFIGS);
>-		createEReference(webAppEClass, WEB_APP__MIME_MAPPINGS);
>-		createEReference(webAppEClass, WEB_APP__WELCOME_FILE_LISTS);
>-		createEReference(webAppEClass, WEB_APP__ERROR_PAGES);
>-		createEReference(webAppEClass, WEB_APP__JSP_CONFIGS);
>-		createEReference(webAppEClass, WEB_APP__SECURITY_CONSTRAINTS);
>-		createEReference(webAppEClass, WEB_APP__LOGIN_CONFIGS);
>-		createEReference(webAppEClass, WEB_APP__SECURITY_ROLES);
>-		createEReference(webAppEClass, WEB_APP__ENV_ENTRIES);
>-		createEReference(webAppEClass, WEB_APP__EJB_REFS);
>-		createEReference(webAppEClass, WEB_APP__EJB_LOCAL_REFS);
>-		createEReference(webAppEClass, WEB_APP__SERVICE_REFS);
>-		createEReference(webAppEClass, WEB_APP__RESOURCE_REFS);
>-		createEReference(webAppEClass, WEB_APP__RESOURCE_ENV_REFS);
>-		createEReference(webAppEClass, WEB_APP__MESSAGE_DESTINATION_REFS);
>-		createEReference(webAppEClass, WEB_APP__PERSISTENCE_CONTEXT_REFS);
>-		createEReference(webAppEClass, WEB_APP__PERSISTENCE_UNIT_REFS);
>-		createEReference(webAppEClass, WEB_APP__POST_CONSTRUCTS);
>-		createEReference(webAppEClass, WEB_APP__PRE_DESTROYS);
>-		createEReference(webAppEClass, WEB_APP__MESSAGE_DESTINATIONS);
>-		createEReference(webAppEClass, WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS);
>-		createEAttribute(webAppEClass, WEB_APP__ID);
>-		createEAttribute(webAppEClass, WEB_APP__METADATA_COMPLETE);
>-		createEAttribute(webAppEClass, WEB_APP__VERSION);
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getWebFragment_MessageDestinations() {
>+		return (EReference)webFragmentEClass.getEStructuralFeatures().get(32);
>+	}
> 
>-		webAppDeploymentDescriptorEClass = createEClass(WEB_APP_DEPLOYMENT_DESCRIPTOR);
>-		createEAttribute(webAppDeploymentDescriptorEClass, WEB_APP_DEPLOYMENT_DESCRIPTOR__MIXED);
>-		createEReference(webAppDeploymentDescriptorEClass, WEB_APP_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP);
>-		createEReference(webAppDeploymentDescriptorEClass, WEB_APP_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION);
>-		createEReference(webAppDeploymentDescriptorEClass, WEB_APP_DEPLOYMENT_DESCRIPTOR__WEB_APP);
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getWebFragment_LocalEncodingMappingsLists() {
>+		return (EReference)webFragmentEClass.getEStructuralFeatures().get(33);
>+	}
> 
>-		webResourceCollectionEClass = createEClass(WEB_RESOURCE_COLLECTION);
>-		createEAttribute(webResourceCollectionEClass, WEB_RESOURCE_COLLECTION__WEB_RESOURCE_NAME);
>-		createEReference(webResourceCollectionEClass, WEB_RESOURCE_COLLECTION__DESCRIPTIONS);
>-		createEReference(webResourceCollectionEClass, WEB_RESOURCE_COLLECTION__URL_PATTERNS);
>-		createEAttribute(webResourceCollectionEClass, WEB_RESOURCE_COLLECTION__HTTP_METHODS);
>-		createEAttribute(webResourceCollectionEClass, WEB_RESOURCE_COLLECTION__ID);
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getWebFragment_Ordering() {
>+		return (EReference)webFragmentEClass.getEStructuralFeatures().get(34);
>+	}
> 
>-		welcomeFileListEClass = createEClass(WELCOME_FILE_LIST);
>-		createEAttribute(welcomeFileListEClass, WELCOME_FILE_LIST__WELCOME_FILES);
>-		createEAttribute(welcomeFileListEClass, WELCOME_FILE_LIST__ID);
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getWebFragment_Id() {
>+		return (EAttribute)webFragmentEClass.getEStructuralFeatures().get(35);
>+	}
> 
>-		// Create enums
>-		dispatcherTypeEEnum = createEEnum(DISPATCHER_TYPE);
>-		nullCharTypeEEnum = createEEnum(NULL_CHAR_TYPE);
>-		transportGuaranteeTypeEEnum = createEEnum(TRANSPORT_GUARANTEE_TYPE);
>-		webAppVersionTypeEEnum = createEEnum(WEB_APP_VERSION_TYPE);
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getWebFragment_MetadataComplete() {
>+		return (EAttribute)webFragmentEClass.getEStructuralFeatures().get(36);
>+	}
> 
>-		// Create data types
>-		authMethodTypeEDataType = createEDataType(AUTH_METHOD_TYPE);
>-		dispatcherTypeObjectEDataType = createEDataType(DISPATCHER_TYPE_OBJECT);
>-		encodingTypeEDataType = createEDataType(ENCODING_TYPE);
>-		errorCodeTypeEDataType = createEDataType(ERROR_CODE_TYPE);
>-		filterNameTypeEDataType = createEDataType(FILTER_NAME_TYPE);
>-		httpMethodTypeEDataType = createEDataType(HTTP_METHOD_TYPE);
>-		loadOnStartupTypeEDataType = createEDataType(LOAD_ON_STARTUP_TYPE);
>-		localeTypeEDataType = createEDataType(LOCALE_TYPE);
>-		mimeTypeTypeEDataType = createEDataType(MIME_TYPE_TYPE);
>-		nonEmptyStringTypeEDataType = createEDataType(NON_EMPTY_STRING_TYPE);
>-		nullCharTypeObjectEDataType = createEDataType(NULL_CHAR_TYPE_OBJECT);
>-		servletNameTypeEDataType = createEDataType(SERVLET_NAME_TYPE);
>-		transportGuaranteeTypeObjectEDataType = createEDataType(TRANSPORT_GUARANTEE_TYPE_OBJECT);
>-		warPathTypeEDataType = createEDataType(WAR_PATH_TYPE);
>-		webAppVersionTypeObjectEDataType = createEDataType(WEB_APP_VERSION_TYPE_OBJECT);
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getWebFragment_Version() {
>+		return (EAttribute)webFragmentEClass.getEStructuralFeatures().get(37);
> 	}
> 
> 	/**
>@@ -1914,337 +2327,1650 @@
> 	 * 
> 	 * @generated
> 	 */
>-	private boolean isInitialized = false;
>+	public EClass getWebResourceCollection() {
>+		return webResourceCollectionEClass;
>+	}
> 
> 	/**
>-	 * Complete the initialization of the package and its meta-model. This
>-	 * method is guarded to have no affect on any invocation but its first.
> 	 * 
> 	 * 
> 	 * @generated
> 	 */
>-	public void initializePackageContents() {
>-		if (isInitialized) return;
>-		isInitialized = true;
>+	public EAttribute getWebResourceCollection_WebResourceName() {
>+		return (EAttribute)webResourceCollectionEClass.getEStructuralFeatures().get(0);
>+	}
> 
>-		// Initialize package
>-		setName(eNAME);
>-		setNsPrefix(eNS_PREFIX);
>-		setNsURI(eNS_URI);
>-
>-		// Obtain other dependent packages
>-		JavaeePackage theJavaeePackage = (JavaeePackage)EPackage.Registry.INSTANCE.getEPackage(JavaeePackage.eNS_URI);
>-		XMLTypePackage theXMLTypePackage = (XMLTypePackage)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI);
>-		JspPackage theJspPackage = (JspPackage)EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI);
>-
>-		// Add supertypes to classes
>-
>-		// Initialize classes and features; add operations and parameters
>-		initEClass(authConstraintEClass, AuthConstraint.class, "AuthConstraint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>-		initEReference(getAuthConstraint_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, AuthConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getAuthConstraint_RoleNames(), theJavaeePackage.getRoleName(), "roleNames", null, 0, -1, AuthConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getAuthConstraint_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, AuthConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-
>-		initEClass(errorPageEClass, ErrorPage.class, "ErrorPage", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>-		initEAttribute(getErrorPage_ErrorCode(), this.getErrorCodeType(), "errorCode", null, 0, 1, ErrorPage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getErrorPage_ExceptionType(), theJavaeePackage.getFullyQualifiedClassType(), "exceptionType", null, 0, 1, ErrorPage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getErrorPage_Location(), this.getWarPathType(), "location", null, 1, 1, ErrorPage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getErrorPage_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ErrorPage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-
>-		initEClass(filterEClass, Filter.class, "Filter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>-		initEReference(getFilter_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getFilter_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getFilter_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getFilter_FilterName(), this.getFilterNameType(), "filterName", null, 1, 1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getFilter_FilterClass(), theJavaeePackage.getFullyQualifiedClassType(), "filterClass", null, 1, 1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getFilter_InitParams(), theJavaeePackage.getParamValue(), null, "initParams", null, 0, -1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getFilter_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-
>-		initEClass(filterMappingEClass, FilterMapping.class, "FilterMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>-		initEAttribute(getFilterMapping_FilterName(), this.getFilterNameType(), "filterName", null, 1, 1, FilterMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getFilterMapping_Group(), ecorePackage.getEFeatureMapEntry(), "group", null, 0, -1, FilterMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getFilterMapping_UrlPatterns(), theJavaeePackage.getUrlPatternType(), null, "urlPatterns", null, 0, -1, FilterMapping.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getFilterMapping_ServletNames(), this.getServletNameType(), "servletNames", null, 0, -1, FilterMapping.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getFilterMapping_Dispatchers(), this.getDispatcherType(), "dispatchers", "FORWARD", 0, 4, FilterMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
>-		initEAttribute(getFilterMapping_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, FilterMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-
>-		initEClass(formLoginConfigEClass, FormLoginConfig.class, "FormLoginConfig", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>-		initEAttribute(getFormLoginConfig_FormLoginPage(), this.getWarPathType(), "formLoginPage", null, 1, 1, FormLoginConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getFormLoginConfig_FormErrorPage(), this.getWarPathType(), "formErrorPage", null, 1, 1, FormLoginConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getFormLoginConfig_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, FormLoginConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-
>-		initEClass(localeEncodingMappingEClass, LocaleEncodingMapping.class, "LocaleEncodingMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>-		initEAttribute(getLocaleEncodingMapping_Locale(), this.getLocaleType(), "locale", null, 1, 1, LocaleEncodingMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getLocaleEncodingMapping_Encoding(), this.getEncodingType(), "encoding", null, 1, 1, LocaleEncodingMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getLocaleEncodingMapping_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, LocaleEncodingMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-
>-		initEClass(localeEncodingMappingListEClass, LocaleEncodingMappingList.class, "LocaleEncodingMappingList", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>-		initEReference(getLocaleEncodingMappingList_LocalEncodingMappings(), this.getLocaleEncodingMapping(), null, "localEncodingMappings", null, 1, -1, LocaleEncodingMappingList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getLocaleEncodingMappingList_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, LocaleEncodingMappingList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-
>-		initEClass(loginConfigEClass, LoginConfig.class, "LoginConfig", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>-		initEAttribute(getLoginConfig_AuthMethod(), this.getAuthMethodType(), "authMethod", null, 0, 1, LoginConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getLoginConfig_RealmName(), theXMLTypePackage.getToken(), "realmName", null, 0, 1, LoginConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getLoginConfig_FormLoginConfig(), this.getFormLoginConfig(), null, "formLoginConfig", null, 0, 1, LoginConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getLoginConfig_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, LoginConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-
>-		initEClass(mimeMappingEClass, MimeMapping.class, "MimeMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>-		initEAttribute(getMimeMapping_Extension(), theXMLTypePackage.getToken(), "extension", null, 1, 1, MimeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getMimeMapping_MimeType(), this.getMimeTypeType(), "mimeType", null, 1, 1, MimeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getMimeMapping_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, MimeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-
>-		initEClass(securityConstraintEClass, SecurityConstraint.class, "SecurityConstraint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>-		initEReference(getSecurityConstraint_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, SecurityConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getSecurityConstraint_WebResourceCollections(), this.getWebResourceCollection(), null, "webResourceCollections", null, 1, -1, SecurityConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getSecurityConstraint_AuthConstraint(), this.getAuthConstraint(), null, "authConstraint", null, 0, 1, SecurityConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getSecurityConstraint_UserDataConstraint(), this.getUserDataConstraint(), null, "userDataConstraint", null, 0, 1, SecurityConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getSecurityConstraint_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, SecurityConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-
>-		initEClass(servletEClass, Servlet.class, "Servlet", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>-		initEReference(getServlet_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getServlet_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getServlet_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getServlet_ServletName(), this.getServletNameType(), "servletName", null, 1, 1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getServlet_ServletClass(), theJavaeePackage.getFullyQualifiedClassType(), "servletClass", null, 0, 1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getServlet_JspFile(), theJspPackage.getJspFileType(), "jspFile", null, 0, 1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getServlet_InitParams(), theJavaeePackage.getParamValue(), null, "initParams", null, 0, -1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getServlet_LoadOnStartup(), this.getLoadOnStartupType(), "loadOnStartup", null, 0, 1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getServlet_RunAs(), theJavaeePackage.getRunAs(), null, "runAs", null, 0, 1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getServlet_SecurityRoleRefs(), theJavaeePackage.getSecurityRoleRef(), null, "securityRoleRefs", null, 0, -1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getServlet_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getWebResourceCollection_Descriptions() {
>+		return (EReference)webResourceCollectionEClass.getEStructuralFeatures().get(1);
>+	}
> 
>-		initEClass(servletMappingEClass, ServletMapping.class, "ServletMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>-		initEAttribute(getServletMapping_ServletName(), this.getServletNameType(), "servletName", null, 1, 1, ServletMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getServletMapping_UrlPatterns(), theJavaeePackage.getUrlPatternType(), null, "urlPatterns", null, 1, -1, ServletMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getServletMapping_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ServletMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getWebResourceCollection_UrlPatterns() {
>+		return (EReference)webResourceCollectionEClass.getEStructuralFeatures().get(2);
>+	}
> 
>-		initEClass(sessionConfigEClass, SessionConfig.class, "SessionConfig", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>-		initEAttribute(getSessionConfig_SessionTimeout(), theXMLTypePackage.getInteger(), "sessionTimeout", null, 0, 1, SessionConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getSessionConfig_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, SessionConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getWebResourceCollection_HttpMethods() {
>+		return (EAttribute)webResourceCollectionEClass.getEStructuralFeatures().get(3);
>+	}
> 
>-		initEClass(userDataConstraintEClass, UserDataConstraint.class, "UserDataConstraint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>-		initEReference(getUserDataConstraint_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, UserDataConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getUserDataConstraint_TransportGuarantee(), this.getTransportGuaranteeType(), "transportGuarantee", "NONE", 1, 1, UserDataConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
>-		initEAttribute(getUserDataConstraint_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, UserDataConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getWebResourceCollection_HttpMethodOmission() {
>+		return (EAttribute)webResourceCollectionEClass.getEStructuralFeatures().get(4);
>+	}
> 
>-		initEClass(webAppEClass, WebApp.class, "WebApp", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>-		initEAttribute(getWebApp_Group(), ecorePackage.getEFeatureMapEntry(), "group", null, 0, -1, WebApp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getWebApp_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getWebApp_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getWebApp_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getWebApp_Distributables(), theJavaeePackage.getEmptyType(), null, "distributables", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getWebApp_ContextParams(), theJavaeePackage.getParamValue(), null, "contextParams", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getWebApp_Filters(), this.getFilter(), null, "filters", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getWebApp_FilterMappings(), this.getFilterMapping(), null, "filterMappings", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getWebApp_Listeners(), theJavaeePackage.getListener(), null, "listeners", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getWebApp_Servlets(), this.getServlet(), null, "servlets", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getWebApp_ServletMappings(), this.getServletMapping(), null, "servletMappings", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getWebApp_SessionConfigs(), this.getSessionConfig(), null, "sessionConfigs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getWebApp_MimeMappings(), this.getMimeMapping(), null, "mimeMappings", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getWebApp_WelcomeFileLists(), this.getWelcomeFileList(), null, "welcomeFileLists", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getWebApp_ErrorPages(), this.getErrorPage(), null, "errorPages", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getWebApp_JspConfigs(), theJspPackage.getJspConfig(), null, "jspConfigs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getWebApp_SecurityConstraints(), this.getSecurityConstraint(), null, "securityConstraints", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getWebApp_LoginConfigs(), this.getLoginConfig(), null, "loginConfigs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getWebApp_SecurityRoles(), theJavaeePackage.getSecurityRole(), null, "securityRoles", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getWebApp_EnvEntries(), theJavaeePackage.getEnvEntry(), null, "envEntries", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getWebApp_EjbRefs(), theJavaeePackage.getEjbRef(), null, "ejbRefs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getWebApp_EjbLocalRefs(), theJavaeePackage.getEjbLocalRef(), null, "ejbLocalRefs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getWebApp_ServiceRefs(), theJavaeePackage.getServiceRef(), null, "serviceRefs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getWebApp_ResourceRefs(), theJavaeePackage.getResourceRef(), null, "resourceRefs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getWebApp_ResourceEnvRefs(), theJavaeePackage.getResourceEnvRef(), null, "resourceEnvRefs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getWebApp_MessageDestinationRefs(), theJavaeePackage.getMessageDestinationRef(), null, "messageDestinationRefs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getWebApp_PersistenceContextRefs(), theJavaeePackage.getPersistenceContextRef(), null, "persistenceContextRefs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getWebApp_PersistenceUnitRefs(), theJavaeePackage.getPersistenceUnitRef(), null, "persistenceUnitRefs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getWebApp_PostConstructs(), theJavaeePackage.getLifecycleCallback(), null, "postConstructs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getWebApp_PreDestroys(), theJavaeePackage.getLifecycleCallback(), null, "preDestroys", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getWebApp_MessageDestinations(), theJavaeePackage.getMessageDestination(), null, "messageDestinations", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getWebApp_LocalEncodingMappingsLists(), this.getLocaleEncodingMappingList(), null, "localEncodingMappingsLists", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getWebApp_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, WebApp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getWebApp_MetadataComplete(), theXMLTypePackage.getBoolean(), "metadataComplete", null, 0, 1, WebApp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getWebApp_Version(), this.getWebAppVersionType(), "version", "2.5", 1, 1, WebApp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getWebResourceCollection_Id() {
>+		return (EAttribute)webResourceCollectionEClass.getEStructuralFeatures().get(5);
>+	}
> 
>-		initEClass(webAppDeploymentDescriptorEClass, WebAppDeploymentDescriptor.class, "WebAppDeploymentDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>-		initEAttribute(getWebAppDeploymentDescriptor_Mixed(), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getWebAppDeploymentDescriptor_XMLNSPrefixMap(), ecorePackage.getEStringToStringMapEntry(), null, "xMLNSPrefixMap", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getWebAppDeploymentDescriptor_XSISchemaLocation(), ecorePackage.getEStringToStringMapEntry(), null, "xSISchemaLocation", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getWebAppDeploymentDescriptor_WebApp(), this.getWebApp(), null, "webApp", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EClass getWelcomeFileList() {
>+		return welcomeFileListEClass;
>+	}
> 
>-		initEClass(webResourceCollectionEClass, WebResourceCollection.class, "WebResourceCollection", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>-		initEAttribute(getWebResourceCollection_WebResourceName(), theXMLTypePackage.getToken(), "webResourceName", null, 1, 1, WebResourceCollection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getWebResourceCollection_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, WebResourceCollection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEReference(getWebResourceCollection_UrlPatterns(), theJavaeePackage.getUrlPatternType(), null, "urlPatterns", null, 1, -1, WebResourceCollection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getWebResourceCollection_HttpMethods(), this.getHttpMethodType(), "httpMethods", null, 0, -1, WebResourceCollection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getWebResourceCollection_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, WebResourceCollection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getWelcomeFileList_WelcomeFiles() {
>+		return (EAttribute)welcomeFileListEClass.getEStructuralFeatures().get(0);
>+	}
> 
>-		initEClass(welcomeFileListEClass, WelcomeFileList.class, "WelcomeFileList", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>-		initEAttribute(getWelcomeFileList_WelcomeFiles(), theXMLTypePackage.getString(), "welcomeFiles", null, 1, -1, WelcomeFileList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getWelcomeFileList_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, WelcomeFileList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getWelcomeFileList_Id() {
>+		return (EAttribute)welcomeFileListEClass.getEStructuralFeatures().get(1);
>+	}
> 
>-		// Initialize enums and add enum literals
>-		initEEnum(dispatcherTypeEEnum, DispatcherType.class, "DispatcherType"); //$NON-NLS-1$
>-		addEEnumLiteral(dispatcherTypeEEnum, DispatcherType.FORWARD_LITERAL);
>-		addEEnumLiteral(dispatcherTypeEEnum, DispatcherType.INCLUDE_LITERAL);
>-		addEEnumLiteral(dispatcherTypeEEnum, DispatcherType.REQUEST_LITERAL);
>-		addEEnumLiteral(dispatcherTypeEEnum, DispatcherType.ERROR_LITERAL);
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EEnum getDispatcherType() {
>+		return dispatcherTypeEEnum;
>+	}
> 
>-		initEEnum(nullCharTypeEEnum, NullCharType.class, "NullCharType"); //$NON-NLS-1$
>-		addEEnumLiteral(nullCharTypeEEnum, NullCharType.__LITERAL);
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EEnum getNullCharType() {
>+		return nullCharTypeEEnum;
>+	}
> 
>-		initEEnum(transportGuaranteeTypeEEnum, TransportGuaranteeType.class, "TransportGuaranteeType"); //$NON-NLS-1$
>-		addEEnumLiteral(transportGuaranteeTypeEEnum, TransportGuaranteeType.NONE_LITERAL);
>-		addEEnumLiteral(transportGuaranteeTypeEEnum, TransportGuaranteeType.INTEGRAL_LITERAL);
>-		addEEnumLiteral(transportGuaranteeTypeEEnum, TransportGuaranteeType.CONFIDENTIAL_LITERAL);
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EEnum getTrackingModeType() {
>+		return trackingModeTypeEEnum;
>+	}
> 
>-		initEEnum(webAppVersionTypeEEnum, WebAppVersionType.class, "WebAppVersionType"); //$NON-NLS-1$
>-		addEEnumLiteral(webAppVersionTypeEEnum, WebAppVersionType._25_LITERAL);
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EEnum getTransportGuaranteeType() {
>+		return transportGuaranteeTypeEEnum;
>+	}
> 
>-		// Initialize data types
>-		initEDataType(authMethodTypeEDataType, String.class, "AuthMethodType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>-		initEDataType(dispatcherTypeObjectEDataType, DispatcherType.class, "DispatcherTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>-		initEDataType(encodingTypeEDataType, String.class, "EncodingType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>-		initEDataType(errorCodeTypeEDataType, BigInteger.class, "ErrorCodeType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>-		initEDataType(filterNameTypeEDataType, String.class, "FilterNameType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>-		initEDataType(httpMethodTypeEDataType, String.class, "HttpMethodType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>-		initEDataType(loadOnStartupTypeEDataType, Object.class, "LoadOnStartupType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>-		initEDataType(localeTypeEDataType, String.class, "LocaleType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>-		initEDataType(mimeTypeTypeEDataType, String.class, "MimeTypeType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>-		initEDataType(nonEmptyStringTypeEDataType, String.class, "NonEmptyStringType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>-		initEDataType(nullCharTypeObjectEDataType, NullCharType.class, "NullCharTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>-		initEDataType(servletNameTypeEDataType, String.class, "ServletNameType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>-		initEDataType(transportGuaranteeTypeObjectEDataType, TransportGuaranteeType.class, "TransportGuaranteeTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>-		initEDataType(warPathTypeEDataType, String.class, "WarPathType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>-		initEDataType(webAppVersionTypeObjectEDataType, WebAppVersionType.class, "WebAppVersionTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EEnum getWebAppVersionType() {
>+		return webAppVersionTypeEEnum;
>+	}
> 
>-		// Create resource
>-		createResource(eNS_URI);
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EDataType getAuthMethodType() {
>+		return authMethodTypeEDataType;
>+	}
> 
>-		// Create annotations
>-		// http:///org/eclipse/emf/ecore/util/ExtendedMetaData
>-		createExtendedMetaDataAnnotations();
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EDataType getDispatcherTypeObject() {
>+		return dispatcherTypeObjectEDataType;
> 	}
> 
> 	/**
>-	 * Initializes the annotations for http:///org/eclipse/emf/ecore/util/ExtendedMetaData.
> 	 * 
> 	 * 
> 	 * @generated
> 	 */
>-	protected void createExtendedMetaDataAnnotations() {
>-		String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$				
>+	public EDataType getEncodingType() {
>+		return encodingTypeEDataType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EDataType getErrorCodeType() {
>+		return errorCodeTypeEDataType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EDataType getFilterNameType() {
>+		return filterNameTypeEDataType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EDataType getHttpMethodType() {
>+		return httpMethodTypeEDataType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EDataType getLoadOnStartupType() {
>+		return loadOnStartupTypeEDataType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EDataType getLocaleType() {
>+		return localeTypeEDataType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EDataType getMimeTypeType() {
>+		return mimeTypeTypeEDataType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EDataType getNonEmptyStringType() {
>+		return nonEmptyStringTypeEDataType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EDataType getNullCharTypeObject() {
>+		return nullCharTypeObjectEDataType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EDataType getServletNameType() {
>+		return servletNameTypeEDataType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EDataType getTrackingModeTypeObject() {
>+		return trackingModeTypeObjectEDataType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EDataType getTransportGuaranteeTypeObject() {
>+		return transportGuaranteeTypeObjectEDataType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EDataType getWarPathType() {
>+		return warPathTypeEDataType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EDataType getWebAppVersionTypeObject() {
>+		return webAppVersionTypeObjectEDataType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public WebFactory getWebFactory() {
>+		return (WebFactory)getEFactoryInstance();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private boolean isCreated = false;
>+
>+	/**
>+	 * Creates the meta-model objects for the package. This method is
>+	 * guarded to have no affect on any invocation but its first.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void createPackageContents() {
>+		if (isCreated) return;
>+		isCreated = true;
>+
>+		// Create classes and their features
>+		absoluteOrderingTypeEClass = createEClass(ABSOLUTE_ORDERING_TYPE);
>+		createEAttribute(absoluteOrderingTypeEClass, ABSOLUTE_ORDERING_TYPE__GROUP);
>+		createEAttribute(absoluteOrderingTypeEClass, ABSOLUTE_ORDERING_TYPE__NAME);
>+		createEReference(absoluteOrderingTypeEClass, ABSOLUTE_ORDERING_TYPE__OTHERS);
>+
>+		authConstraintEClass = createEClass(AUTH_CONSTRAINT);
>+		createEReference(authConstraintEClass, AUTH_CONSTRAINT__DESCRIPTIONS);
>+		createEAttribute(authConstraintEClass, AUTH_CONSTRAINT__ROLE_NAMES);
>+		createEAttribute(authConstraintEClass, AUTH_CONSTRAINT__ID);
>+
>+		cookieCommentTypeEClass = createEClass(COOKIE_COMMENT_TYPE);
>+		createEAttribute(cookieCommentTypeEClass, COOKIE_COMMENT_TYPE__VALUE);
>+
>+		cookieConfigTypeEClass = createEClass(COOKIE_CONFIG_TYPE);
>+		createEReference(cookieConfigTypeEClass, COOKIE_CONFIG_TYPE__NAME);
>+		createEReference(cookieConfigTypeEClass, COOKIE_CONFIG_TYPE__DOMAIN);
>+		createEReference(cookieConfigTypeEClass, COOKIE_CONFIG_TYPE__PATH);
>+		createEReference(cookieConfigTypeEClass, COOKIE_CONFIG_TYPE__COMMENT);
>+		createEAttribute(cookieConfigTypeEClass, COOKIE_CONFIG_TYPE__HTTP_ONLY);
>+		createEAttribute(cookieConfigTypeEClass, COOKIE_CONFIG_TYPE__SECURE);
>+		createEAttribute(cookieConfigTypeEClass, COOKIE_CONFIG_TYPE__MAX_AGE);
>+		createEAttribute(cookieConfigTypeEClass, COOKIE_CONFIG_TYPE__ID);
>+
>+		cookieDomainTypeEClass = createEClass(COOKIE_DOMAIN_TYPE);
>+		createEAttribute(cookieDomainTypeEClass, COOKIE_DOMAIN_TYPE__VALUE);
>+
>+		cookieNameTypeEClass = createEClass(COOKIE_NAME_TYPE);
>+		createEAttribute(cookieNameTypeEClass, COOKIE_NAME_TYPE__VALUE);
>+
>+		cookiePathTypeEClass = createEClass(COOKIE_PATH_TYPE);
>+		createEAttribute(cookiePathTypeEClass, COOKIE_PATH_TYPE__VALUE);
>+
>+		errorPageEClass = createEClass(ERROR_PAGE);
>+		createEAttribute(errorPageEClass, ERROR_PAGE__ERROR_CODE);
>+		createEAttribute(errorPageEClass, ERROR_PAGE__EXCEPTION_TYPE);
>+		createEAttribute(errorPageEClass, ERROR_PAGE__LOCATION);
>+		createEAttribute(errorPageEClass, ERROR_PAGE__ID);
>+
>+		filterEClass = createEClass(FILTER);
>+		createEReference(filterEClass, FILTER__DESCRIPTIONS);
>+		createEReference(filterEClass, FILTER__DISPLAY_NAMES);
>+		createEReference(filterEClass, FILTER__ICONS);
>+		createEAttribute(filterEClass, FILTER__FILTER_NAME);
>+		createEAttribute(filterEClass, FILTER__FILTER_CLASS);
>+		createEAttribute(filterEClass, FILTER__ASYNC_SUPPORTED);
>+		createEReference(filterEClass, FILTER__INIT_PARAMS);
>+		createEAttribute(filterEClass, FILTER__ID);
>+
>+		filterMappingEClass = createEClass(FILTER_MAPPING);
>+		createEAttribute(filterMappingEClass, FILTER_MAPPING__FILTER_NAME);
>+		createEAttribute(filterMappingEClass, FILTER_MAPPING__GROUP);
>+		createEReference(filterMappingEClass, FILTER_MAPPING__URL_PATTERNS);
>+		createEAttribute(filterMappingEClass, FILTER_MAPPING__SERVLET_NAMES);
>+		createEAttribute(filterMappingEClass, FILTER_MAPPING__DISPATCHERS);
>+		createEAttribute(filterMappingEClass, FILTER_MAPPING__ID);
>+
>+		formLoginConfigEClass = createEClass(FORM_LOGIN_CONFIG);
>+		createEAttribute(formLoginConfigEClass, FORM_LOGIN_CONFIG__FORM_LOGIN_PAGE);
>+		createEAttribute(formLoginConfigEClass, FORM_LOGIN_CONFIG__FORM_ERROR_PAGE);
>+		createEAttribute(formLoginConfigEClass, FORM_LOGIN_CONFIG__ID);
>+
>+		localeEncodingMappingEClass = createEClass(LOCALE_ENCODING_MAPPING);
>+		createEAttribute(localeEncodingMappingEClass, LOCALE_ENCODING_MAPPING__LOCALE);
>+		createEAttribute(localeEncodingMappingEClass, LOCALE_ENCODING_MAPPING__ENCODING);
>+		createEAttribute(localeEncodingMappingEClass, LOCALE_ENCODING_MAPPING__ID);
>+
>+		localeEncodingMappingListEClass = createEClass(LOCALE_ENCODING_MAPPING_LIST);
>+		createEReference(localeEncodingMappingListEClass, LOCALE_ENCODING_MAPPING_LIST__LOCAL_ENCODING_MAPPINGS);
>+		createEAttribute(localeEncodingMappingListEClass, LOCALE_ENCODING_MAPPING_LIST__ID);
>+
>+		loginConfigEClass = createEClass(LOGIN_CONFIG);
>+		createEAttribute(loginConfigEClass, LOGIN_CONFIG__AUTH_METHOD);
>+		createEAttribute(loginConfigEClass, LOGIN_CONFIG__REALM_NAME);
>+		createEReference(loginConfigEClass, LOGIN_CONFIG__FORM_LOGIN_CONFIG);
>+		createEAttribute(loginConfigEClass, LOGIN_CONFIG__ID);
>+
>+		mimeMappingEClass = createEClass(MIME_MAPPING);
>+		createEAttribute(mimeMappingEClass, MIME_MAPPING__EXTENSION);
>+		createEAttribute(mimeMappingEClass, MIME_MAPPING__MIME_TYPE);
>+		createEAttribute(mimeMappingEClass, MIME_MAPPING__ID);
>+
>+		multipartConfigTypeEClass = createEClass(MULTIPART_CONFIG_TYPE);
>+		createEAttribute(multipartConfigTypeEClass, MULTIPART_CONFIG_TYPE__LOCATION);
>+		createEAttribute(multipartConfigTypeEClass, MULTIPART_CONFIG_TYPE__MAX_FILE_SIZE);
>+		createEAttribute(multipartConfigTypeEClass, MULTIPART_CONFIG_TYPE__MAX_REQUEST_SIZE);
>+		createEAttribute(multipartConfigTypeEClass, MULTIPART_CONFIG_TYPE__FILE_SIZE_THRESHOLD);
>+
>+		orderingOrderingTypeEClass = createEClass(ORDERING_ORDERING_TYPE);
>+		createEAttribute(orderingOrderingTypeEClass, ORDERING_ORDERING_TYPE__NAME);
>+		createEReference(orderingOrderingTypeEClass, ORDERING_ORDERING_TYPE__OTHERS);
>+
>+		orderingOthersTypeEClass = createEClass(ORDERING_OTHERS_TYPE);
>+		createEAttribute(orderingOthersTypeEClass, ORDERING_OTHERS_TYPE__ID);
>+
>+		orderingTypeEClass = createEClass(ORDERING_TYPE);
>+		createEReference(orderingTypeEClass, ORDERING_TYPE__AFTER);
>+		createEReference(orderingTypeEClass, ORDERING_TYPE__BEFORE);
>+
>+		securityConstraintEClass = createEClass(SECURITY_CONSTRAINT);
>+		createEReference(securityConstraintEClass, SECURITY_CONSTRAINT__DISPLAY_NAMES);
>+		createEReference(securityConstraintEClass, SECURITY_CONSTRAINT__WEB_RESOURCE_COLLECTIONS);
>+		createEReference(securityConstraintEClass, SECURITY_CONSTRAINT__AUTH_CONSTRAINT);
>+		createEReference(securityConstraintEClass, SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT);
>+		createEAttribute(securityConstraintEClass, SECURITY_CONSTRAINT__ID);
>+
>+		servletEClass = createEClass(SERVLET);
>+		createEReference(servletEClass, SERVLET__DESCRIPTIONS);
>+		createEReference(servletEClass, SERVLET__DISPLAY_NAMES);
>+		createEReference(servletEClass, SERVLET__ICONS);
>+		createEAttribute(servletEClass, SERVLET__SERVLET_NAME);
>+		createEAttribute(servletEClass, SERVLET__SERVLET_CLASS);
>+		createEAttribute(servletEClass, SERVLET__JSP_FILE);
>+		createEReference(servletEClass, SERVLET__INIT_PARAMS);
>+		createEAttribute(servletEClass, SERVLET__LOAD_ON_STARTUP);
>+		createEAttribute(servletEClass, SERVLET__ENABLED);
>+		createEAttribute(servletEClass, SERVLET__ASYNC_SUPPORTED);
>+		createEReference(servletEClass, SERVLET__RUN_AS);
>+		createEReference(servletEClass, SERVLET__SECURITY_ROLE_REFS);
>+		createEReference(servletEClass, SERVLET__MULTIPART_CONFIG);
>+		createEAttribute(servletEClass, SERVLET__ID);
>+
>+		servletMappingEClass = createEClass(SERVLET_MAPPING);
>+		createEAttribute(servletMappingEClass, SERVLET_MAPPING__SERVLET_NAME);
>+		createEReference(servletMappingEClass, SERVLET_MAPPING__URL_PATTERNS);
>+		createEAttribute(servletMappingEClass, SERVLET_MAPPING__ID);
>+
>+		sessionConfigEClass = createEClass(SESSION_CONFIG);
>+		createEAttribute(sessionConfigEClass, SESSION_CONFIG__SESSION_TIMEOUT);
>+		createEReference(sessionConfigEClass, SESSION_CONFIG__COOKIE_CONFIG);
>+		createEAttribute(sessionConfigEClass, SESSION_CONFIG__TRACKING_MODE);
>+		createEAttribute(sessionConfigEClass, SESSION_CONFIG__ID);
>+
>+		userDataConstraintEClass = createEClass(USER_DATA_CONSTRAINT);
>+		createEReference(userDataConstraintEClass, USER_DATA_CONSTRAINT__DESCRIPTIONS);
>+		createEAttribute(userDataConstraintEClass, USER_DATA_CONSTRAINT__TRANSPORT_GUARANTEE);
>+		createEAttribute(userDataConstraintEClass, USER_DATA_CONSTRAINT__ID);
>+
>+		webAppEClass = createEClass(WEB_APP);
>+		createEAttribute(webAppEClass, WEB_APP__GROUP);
>+		createEReference(webAppEClass, WEB_APP__DESCRIPTIONS);
>+		createEReference(webAppEClass, WEB_APP__DISPLAY_NAMES);
>+		createEReference(webAppEClass, WEB_APP__ICONS);
>+		createEAttribute(webAppEClass, WEB_APP__NAME);
>+		createEReference(webAppEClass, WEB_APP__DISTRIBUTABLES);
>+		createEReference(webAppEClass, WEB_APP__CONTEXT_PARAMS);
>+		createEReference(webAppEClass, WEB_APP__FILTERS);
>+		createEReference(webAppEClass, WEB_APP__FILTER_MAPPINGS);
>+		createEReference(webAppEClass, WEB_APP__LISTENERS);
>+		createEReference(webAppEClass, WEB_APP__SERVLETS);
>+		createEReference(webAppEClass, WEB_APP__SERVLET_MAPPINGS);
>+		createEReference(webAppEClass, WEB_APP__SESSION_CONFIGS);
>+		createEReference(webAppEClass, WEB_APP__MIME_MAPPINGS);
>+		createEReference(webAppEClass, WEB_APP__WELCOME_FILE_LISTS);
>+		createEReference(webAppEClass, WEB_APP__ERROR_PAGES);
>+		createEReference(webAppEClass, WEB_APP__JSP_CONFIGS);
>+		createEReference(webAppEClass, WEB_APP__SECURITY_CONSTRAINTS);
>+		createEReference(webAppEClass, WEB_APP__LOGIN_CONFIGS);
>+		createEReference(webAppEClass, WEB_APP__SECURITY_ROLES);
>+		createEReference(webAppEClass, WEB_APP__ENV_ENTRIES);
>+		createEReference(webAppEClass, WEB_APP__EJB_REFS);
>+		createEReference(webAppEClass, WEB_APP__EJB_LOCAL_REFS);
>+		createEReference(webAppEClass, WEB_APP__SERVICE_REFS);
>+		createEReference(webAppEClass, WEB_APP__RESOURCE_REFS);
>+		createEReference(webAppEClass, WEB_APP__RESOURCE_ENV_REFS);
>+		createEReference(webAppEClass, WEB_APP__MESSAGE_DESTINATION_REFS);
>+		createEReference(webAppEClass, WEB_APP__PERSISTENCE_CONTEXT_REFS);
>+		createEReference(webAppEClass, WEB_APP__PERSISTENCE_UNIT_REFS);
>+		createEReference(webAppEClass, WEB_APP__POST_CONSTRUCTS);
>+		createEReference(webAppEClass, WEB_APP__PRE_DESTROYS);
>+		createEReference(webAppEClass, WEB_APP__DATA_SOURCE);
>+		createEReference(webAppEClass, WEB_APP__MESSAGE_DESTINATIONS);
>+		createEReference(webAppEClass, WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS);
>+		createEAttribute(webAppEClass, WEB_APP__MODULE_NAME);
>+		createEReference(webAppEClass, WEB_APP__ABSOLUTE_ORDERING);
>+		createEAttribute(webAppEClass, WEB_APP__ID);
>+		createEAttribute(webAppEClass, WEB_APP__METADATA_COMPLETE);
>+		createEAttribute(webAppEClass, WEB_APP__VERSION);
>+
>+		webAppDeploymentDescriptorEClass = createEClass(WEB_APP_DEPLOYMENT_DESCRIPTOR);
>+		createEAttribute(webAppDeploymentDescriptorEClass, WEB_APP_DEPLOYMENT_DESCRIPTOR__MIXED);
>+		createEReference(webAppDeploymentDescriptorEClass, WEB_APP_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP);
>+		createEReference(webAppDeploymentDescriptorEClass, WEB_APP_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION);
>+		createEReference(webAppDeploymentDescriptorEClass, WEB_APP_DEPLOYMENT_DESCRIPTOR__WEB_APP);
>+
>+		webFragmentEClass = createEClass(WEB_FRAGMENT);
>+		createEAttribute(webFragmentEClass, WEB_FRAGMENT__GROUP);
>+		createEReference(webFragmentEClass, WEB_FRAGMENT__DESCRIPTIONS);
>+		createEReference(webFragmentEClass, WEB_FRAGMENT__DISPLAY_NAMES);
>+		createEReference(webFragmentEClass, WEB_FRAGMENT__ICONS);
>+		createEAttribute(webFragmentEClass, WEB_FRAGMENT__NAME);
>+		createEReference(webFragmentEClass, WEB_FRAGMENT__DISTRIBUTABLES);
>+		createEReference(webFragmentEClass, WEB_FRAGMENT__CONTEXT_PARAMS);
>+		createEReference(webFragmentEClass, WEB_FRAGMENT__FILTERS);
>+		createEReference(webFragmentEClass, WEB_FRAGMENT__FILTER_MAPPINGS);
>+		createEReference(webFragmentEClass, WEB_FRAGMENT__LISTENERS);
>+		createEReference(webFragmentEClass, WEB_FRAGMENT__SERVLETS);
>+		createEReference(webFragmentEClass, WEB_FRAGMENT__SERVLET_MAPPINGS);
>+		createEReference(webFragmentEClass, WEB_FRAGMENT__SESSION_CONFIGS);
>+		createEReference(webFragmentEClass, WEB_FRAGMENT__MIME_MAPPINGS);
>+		createEReference(webFragmentEClass, WEB_FRAGMENT__WELCOME_FILE_LISTS);
>+		createEReference(webFragmentEClass, WEB_FRAGMENT__ERROR_PAGES);
>+		createEReference(webFragmentEClass, WEB_FRAGMENT__JSP_CONFIGS);
>+		createEReference(webFragmentEClass, WEB_FRAGMENT__SECURITY_CONSTRAINTS);
>+		createEReference(webFragmentEClass, WEB_FRAGMENT__LOGIN_CONFIGS);
>+		createEReference(webFragmentEClass, WEB_FRAGMENT__SECURITY_ROLES);
>+		createEReference(webFragmentEClass, WEB_FRAGMENT__ENV_ENTRIES);
>+		createEReference(webFragmentEClass, WEB_FRAGMENT__EJB_REFS);
>+		createEReference(webFragmentEClass, WEB_FRAGMENT__EJB_LOCAL_REFS);
>+		createEReference(webFragmentEClass, WEB_FRAGMENT__SERVICE_REFS);
>+		createEReference(webFragmentEClass, WEB_FRAGMENT__RESOURCE_REFS);
>+		createEReference(webFragmentEClass, WEB_FRAGMENT__RESOURCE_ENV_REFS);
>+		createEReference(webFragmentEClass, WEB_FRAGMENT__MESSAGE_DESTINATION_REFS);
>+		createEReference(webFragmentEClass, WEB_FRAGMENT__PERSISTENCE_CONTEXT_REFS);
>+		createEReference(webFragmentEClass, WEB_FRAGMENT__PERSISTENCE_UNIT_REFS);
>+		createEReference(webFragmentEClass, WEB_FRAGMENT__POST_CONSTRUCTS);
>+		createEReference(webFragmentEClass, WEB_FRAGMENT__PRE_DESTROYS);
>+		createEReference(webFragmentEClass, WEB_FRAGMENT__DATA_SOURCE);
>+		createEReference(webFragmentEClass, WEB_FRAGMENT__MESSAGE_DESTINATIONS);
>+		createEReference(webFragmentEClass, WEB_FRAGMENT__LOCAL_ENCODING_MAPPINGS_LISTS);
>+		createEReference(webFragmentEClass, WEB_FRAGMENT__ORDERING);
>+		createEAttribute(webFragmentEClass, WEB_FRAGMENT__ID);
>+		createEAttribute(webFragmentEClass, WEB_FRAGMENT__METADATA_COMPLETE);
>+		createEAttribute(webFragmentEClass, WEB_FRAGMENT__VERSION);
>+
>+		webResourceCollectionEClass = createEClass(WEB_RESOURCE_COLLECTION);
>+		createEAttribute(webResourceCollectionEClass, WEB_RESOURCE_COLLECTION__WEB_RESOURCE_NAME);
>+		createEReference(webResourceCollectionEClass, WEB_RESOURCE_COLLECTION__DESCRIPTIONS);
>+		createEReference(webResourceCollectionEClass, WEB_RESOURCE_COLLECTION__URL_PATTERNS);
>+		createEAttribute(webResourceCollectionEClass, WEB_RESOURCE_COLLECTION__HTTP_METHODS);
>+		createEAttribute(webResourceCollectionEClass, WEB_RESOURCE_COLLECTION__HTTP_METHOD_OMISSION);
>+		createEAttribute(webResourceCollectionEClass, WEB_RESOURCE_COLLECTION__ID);
>+
>+		welcomeFileListEClass = createEClass(WELCOME_FILE_LIST);
>+		createEAttribute(welcomeFileListEClass, WELCOME_FILE_LIST__WELCOME_FILES);
>+		createEAttribute(welcomeFileListEClass, WELCOME_FILE_LIST__ID);
>+
>+		// Create enums
>+		dispatcherTypeEEnum = createEEnum(DISPATCHER_TYPE);
>+		nullCharTypeEEnum = createEEnum(NULL_CHAR_TYPE);
>+		trackingModeTypeEEnum = createEEnum(TRACKING_MODE_TYPE);
>+		transportGuaranteeTypeEEnum = createEEnum(TRANSPORT_GUARANTEE_TYPE);
>+		webAppVersionTypeEEnum = createEEnum(WEB_APP_VERSION_TYPE);
>+
>+		// Create data types
>+		authMethodTypeEDataType = createEDataType(AUTH_METHOD_TYPE);
>+		dispatcherTypeObjectEDataType = createEDataType(DISPATCHER_TYPE_OBJECT);
>+		encodingTypeEDataType = createEDataType(ENCODING_TYPE);
>+		errorCodeTypeEDataType = createEDataType(ERROR_CODE_TYPE);
>+		filterNameTypeEDataType = createEDataType(FILTER_NAME_TYPE);
>+		httpMethodTypeEDataType = createEDataType(HTTP_METHOD_TYPE);
>+		loadOnStartupTypeEDataType = createEDataType(LOAD_ON_STARTUP_TYPE);
>+		localeTypeEDataType = createEDataType(LOCALE_TYPE);
>+		mimeTypeTypeEDataType = createEDataType(MIME_TYPE_TYPE);
>+		nonEmptyStringTypeEDataType = createEDataType(NON_EMPTY_STRING_TYPE);
>+		nullCharTypeObjectEDataType = createEDataType(NULL_CHAR_TYPE_OBJECT);
>+		servletNameTypeEDataType = createEDataType(SERVLET_NAME_TYPE);
>+		trackingModeTypeObjectEDataType = createEDataType(TRACKING_MODE_TYPE_OBJECT);
>+		transportGuaranteeTypeObjectEDataType = createEDataType(TRANSPORT_GUARANTEE_TYPE_OBJECT);
>+		warPathTypeEDataType = createEDataType(WAR_PATH_TYPE);
>+		webAppVersionTypeObjectEDataType = createEDataType(WEB_APP_VERSION_TYPE_OBJECT);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private boolean isInitialized = false;
>+
>+	/**
>+	 * Complete the initialization of the package and its meta-model. This
>+	 * method is guarded to have no affect on any invocation but its first.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void initializePackageContents() {
>+		if (isInitialized) return;
>+		isInitialized = true;
>+
>+		// Initialize package
>+		setName(eNAME);
>+		setNsPrefix(eNS_PREFIX);
>+		setNsURI(eNS_URI);
>+
>+		// Obtain other dependent packages
>+		JavaeePackage theJavaeePackage = (JavaeePackage)EPackage.Registry.INSTANCE.getEPackage(JavaeePackage.eNS_URI);
>+		XMLTypePackage theXMLTypePackage = (XMLTypePackage)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI);
>+		JspPackage theJspPackage = (JspPackage)EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI);
>+
>+		// Create type parameters
>+
>+		// Set bounds for type parameters
>+
>+		// Add supertypes to classes
>+
>+		// Initialize classes and features; add operations and parameters
>+		initEClass(absoluteOrderingTypeEClass, AbsoluteOrderingType.class, "AbsoluteOrderingType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEAttribute(getAbsoluteOrderingType_Group(), ecorePackage.getEFeatureMapEntry(), "group", null, 0, -1, AbsoluteOrderingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getAbsoluteOrderingType_Name(), theJavaeePackage.getJavaIdentifier(), "name", null, 0, -1, AbsoluteOrderingType.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getAbsoluteOrderingType_Others(), this.getOrderingOthersType(), null, "others", null, 0, -1, AbsoluteOrderingType.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(authConstraintEClass, AuthConstraint.class, "AuthConstraint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEReference(getAuthConstraint_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, AuthConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getAuthConstraint_RoleNames(), theJavaeePackage.getRoleName(), "roleNames", null, 0, -1, AuthConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getAuthConstraint_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, AuthConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(cookieCommentTypeEClass, CookieCommentType.class, "CookieCommentType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEAttribute(getCookieCommentType_Value(), this.getNonEmptyStringType(), "value", null, 0, 1, CookieCommentType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(cookieConfigTypeEClass, CookieConfigType.class, "CookieConfigType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEReference(getCookieConfigType_Name(), this.getCookieNameType(), null, "name", null, 0, 1, CookieConfigType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getCookieConfigType_Domain(), this.getCookieDomainType(), null, "domain", null, 0, 1, CookieConfigType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getCookieConfigType_Path(), this.getCookiePathType(), null, "path", null, 0, 1, CookieConfigType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getCookieConfigType_Comment(), this.getCookieCommentType(), null, "comment", null, 0, 1, CookieConfigType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getCookieConfigType_HttpOnly(), theJavaeePackage.getTrueFalseType(), "httpOnly", null, 0, 1, CookieConfigType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getCookieConfigType_Secure(), theJavaeePackage.getTrueFalseType(), "secure", null, 0, 1, CookieConfigType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getCookieConfigType_MaxAge(), theXMLTypePackage.getInteger(), "maxAge", null, 0, 1, CookieConfigType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getCookieConfigType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, CookieConfigType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(cookieDomainTypeEClass, CookieDomainType.class, "CookieDomainType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEAttribute(getCookieDomainType_Value(), this.getNonEmptyStringType(), "value", null, 0, 1, CookieDomainType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(cookieNameTypeEClass, CookieNameType.class, "CookieNameType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEAttribute(getCookieNameType_Value(), this.getNonEmptyStringType(), "value", null, 0, 1, CookieNameType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(cookiePathTypeEClass, CookiePathType.class, "CookiePathType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEAttribute(getCookiePathType_Value(), this.getNonEmptyStringType(), "value", null, 0, 1, CookiePathType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(errorPageEClass, ErrorPage.class, "ErrorPage", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEAttribute(getErrorPage_ErrorCode(), this.getErrorCodeType(), "errorCode", null, 0, 1, ErrorPage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getErrorPage_ExceptionType(), theJavaeePackage.getFullyQualifiedClassType(), "exceptionType", null, 0, 1, ErrorPage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getErrorPage_Location(), this.getWarPathType(), "location", null, 1, 1, ErrorPage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getErrorPage_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ErrorPage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(filterEClass, Filter.class, "Filter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEReference(getFilter_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getFilter_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getFilter_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getFilter_FilterName(), this.getFilterNameType(), "filterName", null, 1, 1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getFilter_FilterClass(), theJavaeePackage.getFullyQualifiedClassType(), "filterClass", null, 1, 1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getFilter_AsyncSupported(), theJavaeePackage.getTrueFalseType(), "asyncSupported", null, 0, 1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getFilter_InitParams(), theJavaeePackage.getParamValue(), null, "initParams", null, 0, -1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getFilter_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(filterMappingEClass, FilterMapping.class, "FilterMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEAttribute(getFilterMapping_FilterName(), this.getFilterNameType(), "filterName", null, 1, 1, FilterMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getFilterMapping_Group(), ecorePackage.getEFeatureMapEntry(), "group", null, 0, -1, FilterMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getFilterMapping_UrlPatterns(), theJavaeePackage.getUrlPatternType(), null, "urlPatterns", null, 0, -1, FilterMapping.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getFilterMapping_ServletNames(), this.getServletNameType(), "servletNames", null, 0, -1, FilterMapping.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getFilterMapping_Dispatchers(), this.getDispatcherType(), "dispatchers", null, 0, 5, FilterMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getFilterMapping_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, FilterMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(formLoginConfigEClass, FormLoginConfig.class, "FormLoginConfig", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEAttribute(getFormLoginConfig_FormLoginPage(), this.getWarPathType(), "formLoginPage", null, 1, 1, FormLoginConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getFormLoginConfig_FormErrorPage(), this.getWarPathType(), "formErrorPage", null, 1, 1, FormLoginConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getFormLoginConfig_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, FormLoginConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(localeEncodingMappingEClass, LocaleEncodingMapping.class, "LocaleEncodingMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEAttribute(getLocaleEncodingMapping_Locale(), this.getLocaleType(), "locale", null, 1, 1, LocaleEncodingMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getLocaleEncodingMapping_Encoding(), this.getEncodingType(), "encoding", null, 1, 1, LocaleEncodingMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getLocaleEncodingMapping_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, LocaleEncodingMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(localeEncodingMappingListEClass, LocaleEncodingMappingList.class, "LocaleEncodingMappingList", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEReference(getLocaleEncodingMappingList_LocalEncodingMappings(), this.getLocaleEncodingMapping(), null, "localEncodingMappings", null, 1, -1, LocaleEncodingMappingList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getLocaleEncodingMappingList_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, LocaleEncodingMappingList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(loginConfigEClass, LoginConfig.class, "LoginConfig", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEAttribute(getLoginConfig_AuthMethod(), this.getAuthMethodType(), "authMethod", null, 0, 1, LoginConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getLoginConfig_RealmName(), theXMLTypePackage.getToken(), "realmName", null, 0, 1, LoginConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getLoginConfig_FormLoginConfig(), this.getFormLoginConfig(), null, "formLoginConfig", null, 0, 1, LoginConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getLoginConfig_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, LoginConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(mimeMappingEClass, MimeMapping.class, "MimeMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEAttribute(getMimeMapping_Extension(), theXMLTypePackage.getToken(), "extension", null, 1, 1, MimeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getMimeMapping_MimeType(), this.getMimeTypeType(), "mimeType", null, 1, 1, MimeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getMimeMapping_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, MimeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(multipartConfigTypeEClass, MultipartConfigType.class, "MultipartConfigType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEAttribute(getMultipartConfigType_Location(), theXMLTypePackage.getToken(), "location", null, 0, 1, MultipartConfigType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getMultipartConfigType_MaxFileSize(), theXMLTypePackage.getLong(), "maxFileSize", null, 0, 1, MultipartConfigType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getMultipartConfigType_MaxRequestSize(), theXMLTypePackage.getLong(), "maxRequestSize", null, 0, 1, MultipartConfigType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getMultipartConfigType_FileSizeThreshold(), theXMLTypePackage.getInteger(), "fileSizeThreshold", null, 0, 1, MultipartConfigType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(orderingOrderingTypeEClass, OrderingOrderingType.class, "OrderingOrderingType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEAttribute(getOrderingOrderingType_Name(), theJavaeePackage.getJavaIdentifier(), "name", null, 0, -1, OrderingOrderingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getOrderingOrderingType_Others(), this.getOrderingOthersType(), null, "others", null, 0, 1, OrderingOrderingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(orderingOthersTypeEClass, OrderingOthersType.class, "OrderingOthersType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEAttribute(getOrderingOthersType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, OrderingOthersType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(orderingTypeEClass, OrderingType.class, "OrderingType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEReference(getOrderingType_After(), this.getOrderingOrderingType(), null, "after", null, 0, 1, OrderingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getOrderingType_Before(), this.getOrderingOrderingType(), null, "before", null, 0, 1, OrderingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(securityConstraintEClass, SecurityConstraint.class, "SecurityConstraint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEReference(getSecurityConstraint_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, SecurityConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getSecurityConstraint_WebResourceCollections(), this.getWebResourceCollection(), null, "webResourceCollections", null, 1, -1, SecurityConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getSecurityConstraint_AuthConstraint(), this.getAuthConstraint(), null, "authConstraint", null, 0, 1, SecurityConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getSecurityConstraint_UserDataConstraint(), this.getUserDataConstraint(), null, "userDataConstraint", null, 0, 1, SecurityConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getSecurityConstraint_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, SecurityConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(servletEClass, Servlet.class, "Servlet", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEReference(getServlet_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getServlet_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getServlet_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getServlet_ServletName(), this.getServletNameType(), "servletName", null, 1, 1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getServlet_ServletClass(), theJavaeePackage.getFullyQualifiedClassType(), "servletClass", null, 0, 1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getServlet_JspFile(), theJspPackage.getJspFileType(), "jspFile", null, 0, 1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getServlet_InitParams(), theJavaeePackage.getParamValue(), null, "initParams", null, 0, -1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getServlet_LoadOnStartup(), this.getLoadOnStartupType(), "loadOnStartup", null, 0, 1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getServlet_Enabled(), theJavaeePackage.getTrueFalseType(), "enabled", null, 0, 1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getServlet_AsyncSupported(), theJavaeePackage.getTrueFalseType(), "asyncSupported", null, 0, 1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getServlet_RunAs(), theJavaeePackage.getRunAs(), null, "runAs", null, 0, 1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getServlet_SecurityRoleRefs(), theJavaeePackage.getSecurityRoleRef(), null, "securityRoleRefs", null, 0, -1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getServlet_MultipartConfig(), this.getMultipartConfigType(), null, "multipartConfig", null, 0, 1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getServlet_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(servletMappingEClass, ServletMapping.class, "ServletMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEAttribute(getServletMapping_ServletName(), this.getServletNameType(), "servletName", null, 1, 1, ServletMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getServletMapping_UrlPatterns(), theJavaeePackage.getUrlPatternType(), null, "urlPatterns", null, 1, -1, ServletMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getServletMapping_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ServletMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(sessionConfigEClass, SessionConfig.class, "SessionConfig", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEAttribute(getSessionConfig_SessionTimeout(), theXMLTypePackage.getInteger(), "sessionTimeout", null, 0, 1, SessionConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getSessionConfig_CookieConfig(), this.getCookieConfigType(), null, "cookieConfig", null, 0, 1, SessionConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getSessionConfig_TrackingMode(), this.getTrackingModeType(), "trackingMode", null, 0, 3, SessionConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getSessionConfig_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, SessionConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(userDataConstraintEClass, UserDataConstraint.class, "UserDataConstraint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEReference(getUserDataConstraint_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, UserDataConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getUserDataConstraint_TransportGuarantee(), this.getTransportGuaranteeType(), "transportGuarantee", null, 1, 1, UserDataConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getUserDataConstraint_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, UserDataConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(webAppEClass, WebApp.class, "WebApp", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEAttribute(getWebApp_Group(), ecorePackage.getEFeatureMapEntry(), "group", null, 0, -1, WebApp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebApp_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebApp_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebApp_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getWebApp_Name(), theJavaeePackage.getJavaIdentifier(), "name", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebApp_Distributables(), theJavaeePackage.getEmptyType(), null, "distributables", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebApp_ContextParams(), theJavaeePackage.getParamValue(), null, "contextParams", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebApp_Filters(), this.getFilter(), null, "filters", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebApp_FilterMappings(), this.getFilterMapping(), null, "filterMappings", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebApp_Listeners(), theJavaeePackage.getListener(), null, "listeners", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebApp_Servlets(), this.getServlet(), null, "servlets", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebApp_ServletMappings(), this.getServletMapping(), null, "servletMappings", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebApp_SessionConfigs(), this.getSessionConfig(), null, "sessionConfigs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebApp_MimeMappings(), this.getMimeMapping(), null, "mimeMappings", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebApp_WelcomeFileLists(), this.getWelcomeFileList(), null, "welcomeFileLists", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebApp_ErrorPages(), this.getErrorPage(), null, "errorPages", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebApp_JspConfigs(), theJspPackage.getJspConfig(), null, "jspConfigs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebApp_SecurityConstraints(), this.getSecurityConstraint(), null, "securityConstraints", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebApp_LoginConfigs(), this.getLoginConfig(), null, "loginConfigs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebApp_SecurityRoles(), theJavaeePackage.getSecurityRole(), null, "securityRoles", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebApp_EnvEntries(), theJavaeePackage.getEnvEntry(), null, "envEntries", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebApp_EjbRefs(), theJavaeePackage.getEjbRef(), null, "ejbRefs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebApp_EjbLocalRefs(), theJavaeePackage.getEjbLocalRef(), null, "ejbLocalRefs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebApp_ServiceRefs(), theJavaeePackage.getServiceRef(), null, "serviceRefs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebApp_ResourceRefs(), theJavaeePackage.getResourceRef(), null, "resourceRefs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebApp_ResourceEnvRefs(), theJavaeePackage.getResourceEnvRef(), null, "resourceEnvRefs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebApp_MessageDestinationRefs(), theJavaeePackage.getMessageDestinationRef(), null, "messageDestinationRefs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebApp_PersistenceContextRefs(), theJavaeePackage.getPersistenceContextRef(), null, "persistenceContextRefs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebApp_PersistenceUnitRefs(), theJavaeePackage.getPersistenceUnitRef(), null, "persistenceUnitRefs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebApp_PostConstructs(), theJavaeePackage.getLifecycleCallback(), null, "postConstructs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebApp_PreDestroys(), theJavaeePackage.getLifecycleCallback(), null, "preDestroys", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebApp_DataSource(), theJavaeePackage.getDataSourceType(), null, "dataSource", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebApp_MessageDestinations(), theJavaeePackage.getMessageDestination(), null, "messageDestinations", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebApp_LocalEncodingMappingsLists(), this.getLocaleEncodingMappingList(), null, "localEncodingMappingsLists", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getWebApp_ModuleName(), theXMLTypePackage.getToken(), "moduleName", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebApp_AbsoluteOrdering(), this.getAbsoluteOrderingType(), null, "absoluteOrdering", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getWebApp_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, WebApp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getWebApp_MetadataComplete(), theXMLTypePackage.getBoolean(), "metadataComplete", null, 0, 1, WebApp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getWebApp_Version(), this.getWebAppVersionType(), "version", null, 1, 1, WebApp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(webAppDeploymentDescriptorEClass, WebAppDeploymentDescriptor.class, "WebAppDeploymentDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEAttribute(getWebAppDeploymentDescriptor_Mixed(), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebAppDeploymentDescriptor_XMLNSPrefixMap(), ecorePackage.getEStringToStringMapEntry(), null, "xMLNSPrefixMap", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebAppDeploymentDescriptor_XSISchemaLocation(), ecorePackage.getEStringToStringMapEntry(), null, "xSISchemaLocation", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebAppDeploymentDescriptor_WebApp(), this.getWebApp(), null, "webApp", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(webFragmentEClass, WebFragment.class, "WebFragment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEAttribute(getWebFragment_Group(), ecorePackage.getEFeatureMapEntry(), "group", null, 0, -1, WebFragment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebFragment_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebFragment_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebFragment_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getWebFragment_Name(), theJavaeePackage.getJavaIdentifier(), "name", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebFragment_Distributables(), theJavaeePackage.getEmptyType(), null, "distributables", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebFragment_ContextParams(), theJavaeePackage.getParamValue(), null, "contextParams", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebFragment_Filters(), this.getFilter(), null, "filters", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebFragment_FilterMappings(), this.getFilterMapping(), null, "filterMappings", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebFragment_Listeners(), theJavaeePackage.getListener(), null, "listeners", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebFragment_Servlets(), this.getServlet(), null, "servlets", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebFragment_ServletMappings(), this.getServletMapping(), null, "servletMappings", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebFragment_SessionConfigs(), this.getSessionConfig(), null, "sessionConfigs", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebFragment_MimeMappings(), this.getMimeMapping(), null, "mimeMappings", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebFragment_WelcomeFileLists(), this.getWelcomeFileList(), null, "welcomeFileLists", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebFragment_ErrorPages(), this.getErrorPage(), null, "errorPages", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebFragment_JspConfigs(), theJspPackage.getJspConfig(), null, "jspConfigs", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebFragment_SecurityConstraints(), this.getSecurityConstraint(), null, "securityConstraints", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebFragment_LoginConfigs(), this.getLoginConfig(), null, "loginConfigs", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebFragment_SecurityRoles(), theJavaeePackage.getSecurityRole(), null, "securityRoles", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebFragment_EnvEntries(), theJavaeePackage.getEnvEntry(), null, "envEntries", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebFragment_EjbRefs(), theJavaeePackage.getEjbRef(), null, "ejbRefs", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebFragment_EjbLocalRefs(), theJavaeePackage.getEjbLocalRef(), null, "ejbLocalRefs", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebFragment_ServiceRefs(), theJavaeePackage.getServiceRef(), null, "serviceRefs", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebFragment_ResourceRefs(), theJavaeePackage.getResourceRef(), null, "resourceRefs", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebFragment_ResourceEnvRefs(), theJavaeePackage.getResourceEnvRef(), null, "resourceEnvRefs", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebFragment_MessageDestinationRefs(), theJavaeePackage.getMessageDestinationRef(), null, "messageDestinationRefs", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebFragment_PersistenceContextRefs(), theJavaeePackage.getPersistenceContextRef(), null, "persistenceContextRefs", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebFragment_PersistenceUnitRefs(), theJavaeePackage.getPersistenceUnitRef(), null, "persistenceUnitRefs", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebFragment_PostConstructs(), theJavaeePackage.getLifecycleCallback(), null, "postConstructs", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebFragment_PreDestroys(), theJavaeePackage.getLifecycleCallback(), null, "preDestroys", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebFragment_DataSource(), theJavaeePackage.getDataSourceType(), null, "dataSource", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebFragment_MessageDestinations(), theJavaeePackage.getMessageDestination(), null, "messageDestinations", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebFragment_LocalEncodingMappingsLists(), this.getLocaleEncodingMappingList(), null, "localEncodingMappingsLists", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebFragment_Ordering(), this.getOrderingType(), null, "ordering", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getWebFragment_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, WebFragment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getWebFragment_MetadataComplete(), theXMLTypePackage.getBoolean(), "metadataComplete", null, 0, 1, WebFragment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getWebFragment_Version(), this.getWebAppVersionType(), "version", null, 1, 1, WebFragment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(webResourceCollectionEClass, WebResourceCollection.class, "WebResourceCollection", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEAttribute(getWebResourceCollection_WebResourceName(), theXMLTypePackage.getToken(), "webResourceName", null, 1, 1, WebResourceCollection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebResourceCollection_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, WebResourceCollection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebResourceCollection_UrlPatterns(), theJavaeePackage.getUrlPatternType(), null, "urlPatterns", null, 1, -1, WebResourceCollection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getWebResourceCollection_HttpMethods(), this.getHttpMethodType(), "httpMethods", null, 0, -1, WebResourceCollection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getWebResourceCollection_HttpMethodOmission(), this.getHttpMethodType(), "httpMethodOmission", null, 0, -1, WebResourceCollection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getWebResourceCollection_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, WebResourceCollection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(welcomeFileListEClass, WelcomeFileList.class, "WelcomeFileList", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEAttribute(getWelcomeFileList_WelcomeFiles(), theXMLTypePackage.getString(), "welcomeFiles", null, 1, -1, WelcomeFileList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getWelcomeFileList_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, WelcomeFileList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		// Initialize enums and add enum literals
>+		initEEnum(dispatcherTypeEEnum, DispatcherType.class, "DispatcherType"); //$NON-NLS-1$
>+		addEEnumLiteral(dispatcherTypeEEnum, DispatcherType.FORWARD_LITERAL);
>+		addEEnumLiteral(dispatcherTypeEEnum, DispatcherType.INCLUDE_LITERAL);
>+		addEEnumLiteral(dispatcherTypeEEnum, DispatcherType.REQUEST_LITERAL);
>+		addEEnumLiteral(dispatcherTypeEEnum, DispatcherType.ASYNC_LITERAL);
>+		addEEnumLiteral(dispatcherTypeEEnum, DispatcherType.ERROR_LITERAL);
>+
>+		initEEnum(nullCharTypeEEnum, NullCharType.class, "NullCharType"); //$NON-NLS-1$
>+		addEEnumLiteral(nullCharTypeEEnum, NullCharType.__LITERAL);
>+
>+		initEEnum(trackingModeTypeEEnum, TrackingModeType.class, "TrackingModeType"); //$NON-NLS-1$
>+		addEEnumLiteral(trackingModeTypeEEnum, TrackingModeType.COOKIE);
>+		addEEnumLiteral(trackingModeTypeEEnum, TrackingModeType.URL);
>+		addEEnumLiteral(trackingModeTypeEEnum, TrackingModeType.SSL);
>+
>+		initEEnum(transportGuaranteeTypeEEnum, TransportGuaranteeType.class, "TransportGuaranteeType"); //$NON-NLS-1$
>+		addEEnumLiteral(transportGuaranteeTypeEEnum, TransportGuaranteeType.NONE_LITERAL);
>+		addEEnumLiteral(transportGuaranteeTypeEEnum, TransportGuaranteeType.INTEGRAL_LITERAL);
>+		addEEnumLiteral(transportGuaranteeTypeEEnum, TransportGuaranteeType.CONFIDENTIAL_LITERAL);
>+
>+		initEEnum(webAppVersionTypeEEnum, WebAppVersionType.class, "WebAppVersionType"); //$NON-NLS-1$
>+		addEEnumLiteral(webAppVersionTypeEEnum, WebAppVersionType._25_LITERAL);
>+		addEEnumLiteral(webAppVersionTypeEEnum, WebAppVersionType._30_LITERAL);
>+
>+		// Initialize data types
>+		initEDataType(authMethodTypeEDataType, String.class, "AuthMethodType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEDataType(dispatcherTypeObjectEDataType, DispatcherType.class, "DispatcherTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEDataType(encodingTypeEDataType, String.class, "EncodingType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEDataType(errorCodeTypeEDataType, BigInteger.class, "ErrorCodeType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEDataType(filterNameTypeEDataType, String.class, "FilterNameType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEDataType(httpMethodTypeEDataType, String.class, "HttpMethodType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEDataType(loadOnStartupTypeEDataType, Object.class, "LoadOnStartupType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEDataType(localeTypeEDataType, String.class, "LocaleType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEDataType(mimeTypeTypeEDataType, String.class, "MimeTypeType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEDataType(nonEmptyStringTypeEDataType, String.class, "NonEmptyStringType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEDataType(nullCharTypeObjectEDataType, NullCharType.class, "NullCharTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEDataType(servletNameTypeEDataType, String.class, "ServletNameType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEDataType(trackingModeTypeObjectEDataType, TrackingModeType.class, "TrackingModeTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEDataType(transportGuaranteeTypeObjectEDataType, TransportGuaranteeType.class, "TransportGuaranteeTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEDataType(warPathTypeEDataType, String.class, "WarPathType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEDataType(webAppVersionTypeObjectEDataType, WebAppVersionType.class, "WebAppVersionTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+
>+		// Create resource
>+		createResource(eNS_URI);
>+
>+		// Create annotations
>+		// http:///org/eclipse/emf/ecore/util/ExtendedMetaData
>+		createExtendedMetaDataAnnotations();
>+	}
>+
>+	/**
>+	 * Initializes the annotations for http:///org/eclipse/emf/ecore/util/ExtendedMetaData.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected void createExtendedMetaDataAnnotations() {
>+		String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$				
>+		addAnnotation
>+		 (absoluteOrderingTypeEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "absoluteOrderingType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getAbsoluteOrderingType_Group(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "group", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "group:0" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getAbsoluteOrderingType_Name(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "name", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getAbsoluteOrderingType_Others(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "others", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (authConstraintEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "auth-constraintType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getAuthConstraint_Descriptions(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "description", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getAuthConstraint_RoleNames(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "role-name", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getAuthConstraint_Id(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (authMethodTypeEDataType, 
>+		 source, 
>+		 new String[] {
>+			 "name", "auth-methodType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#token" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (cookieCommentTypeEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "cookie-commentType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getCookieCommentType_Value(), 
>+		 source, 
>+		 new String[] {
>+			 "name", ":0", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (cookieConfigTypeEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "cookie-configType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getCookieConfigType_Name(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "name", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getCookieConfigType_Domain(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "domain", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getCookieConfigType_Path(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "path", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getCookieConfigType_Comment(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "comment", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getCookieConfigType_HttpOnly(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "http-only", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getCookieConfigType_Secure(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "secure", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getCookieConfigType_MaxAge(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "max-age", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getCookieConfigType_Id(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (cookieDomainTypeEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "cookie-domainType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getCookieDomainType_Value(), 
>+		 source, 
>+		 new String[] {
>+			 "name", ":0", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (cookieNameTypeEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "cookie-nameType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getCookieNameType_Value(), 
>+		 source, 
>+		 new String[] {
>+			 "name", ":0", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (cookiePathTypeEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "cookie-pathType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getCookiePathType_Value(), 
>+		 source, 
>+		 new String[] {
>+			 "name", ":0", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (dispatcherTypeEEnum, 
>+		 source, 
>+		 new String[] {
>+			 "name", "dispatcherType" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (dispatcherTypeObjectEDataType, 
>+		 source, 
>+		 new String[] {
>+			 "name", "dispatcherType:Object", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "baseType", "dispatcherType" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (encodingTypeEDataType, 
>+		 source, 
>+		 new String[] {
>+			 "name", "encodingType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#string", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "pattern", "[^\\s]+" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (errorCodeTypeEDataType, 
>+		 source, 
>+		 new String[] {
>+			 "name", "error-codeType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#positiveInteger", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "pattern", "\\d{3}" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (errorPageEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "error-pageType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getErrorPage_ErrorCode(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "error-code", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getErrorPage_ExceptionType(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "exception-type", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getErrorPage_Location(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "location", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getErrorPage_Id(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (filterEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "filterType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getFilter_Descriptions(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "description", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "http://java.sun.com/xml/ns/javaee" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getFilter_DisplayNames(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "display-name", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "http://java.sun.com/xml/ns/javaee" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getFilter_Icons(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "icon", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "http://java.sun.com/xml/ns/javaee" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getFilter_FilterName(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "filter-name", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getFilter_FilterClass(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "filter-class", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getFilter_AsyncSupported(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "async-supported", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getFilter_InitParams(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "init-param", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getFilter_Id(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (filterMappingEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "filter-mappingType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getFilterMapping_FilterName(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "filter-name", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getFilterMapping_Group(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "group", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "group:1" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getFilterMapping_UrlPatterns(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "url-pattern", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "group", "#group:1" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getFilterMapping_ServletNames(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "servlet-name", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "group", "#group:1" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getFilterMapping_Dispatchers(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "dispatcher", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getFilterMapping_Id(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (filterNameTypeEDataType, 
>+		 source, 
>+		 new String[] {
>+			 "name", "filter-nameType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "baseType", "nonEmptyStringType" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (formLoginConfigEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "form-login-configType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getFormLoginConfig_FormLoginPage(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "form-login-page", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getFormLoginConfig_FormErrorPage(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "form-error-page", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getFormLoginConfig_Id(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (httpMethodTypeEDataType, 
>+		 source, 
>+		 new String[] {
>+			 "name", "http-methodType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#token", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "pattern", "[!-~-[\$\$<>@,;:\"/\\[\\]?=\\{\\}\\\\\\p{Z}]]+" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (loadOnStartupTypeEDataType, 
>+		 source, 
>+		 new String[] {
>+			 "name", "load-on-startupType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "memberTypes", "null-charType http://www.eclipse.org/emf/2003/XMLType#integer" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (localeEncodingMappingEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "locale-encoding-mappingType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getLocaleEncodingMapping_Locale(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "locale", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getLocaleEncodingMapping_Encoding(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "encoding", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getLocaleEncodingMapping_Id(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (localeEncodingMappingListEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "locale-encoding-mapping-listType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getLocaleEncodingMappingList_LocalEncodingMappings(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "locale-encoding-mapping", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getLocaleEncodingMappingList_Id(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (localeTypeEDataType, 
>+		 source, 
>+		 new String[] {
>+			 "name", "localeType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#string", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "pattern", "[a-z]{2}(_|-)?([\\p{L}\\-\\p{Nd}]{2})?" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (loginConfigEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "login-configType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getLoginConfig_AuthMethod(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "auth-method", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getLoginConfig_RealmName(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "realm-name", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getLoginConfig_FormLoginConfig(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "form-login-config", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getLoginConfig_Id(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (mimeMappingEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "mime-mappingType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getMimeMapping_Extension(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "extension", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
> 		addAnnotation
>-		 (authConstraintEClass, 
>+		 (getMimeMapping_MimeType(), 
> 		 source, 
> 		 new String[] {
>-			 "name", "auth-constraintType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "mime-type", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getMimeMapping_Id(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (mimeTypeTypeEDataType, 
>+		 source, 
>+		 new String[] {
>+			 "name", "mime-typeType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#token", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "pattern", "[^\\p{Cc}^\\s]+/[^\\p{Cc}^\\s]+" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (multipartConfigTypeEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "multipart-configType", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getAuthConstraint_Descriptions(), 
>+		 (getMultipartConfigType_Location(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "description", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "location", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getAuthConstraint_RoleNames(), 
>+		 (getMultipartConfigType_MaxFileSize(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "role-name", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "max-file-size", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getAuthConstraint_Id(), 
>+		 (getMultipartConfigType_MaxRequestSize(), 
> 		 source, 
> 		 new String[] {
>-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
>-		 });			
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "max-request-size", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
> 		addAnnotation
>-		 (authMethodTypeEDataType, 
>+		 (getMultipartConfigType_FileSizeThreshold(), 
> 		 source, 
> 		 new String[] {
>-			 "name", "auth-methodType", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#token" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "file-size-threshold", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });			
> 		addAnnotation
>-		 (dispatcherTypeEEnum, 
>+		 (nonEmptyStringTypeEDataType, 
> 		 source, 
> 		 new String[] {
>-			 "name", "dispatcherType" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "nonEmptyStringType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#token", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "minLength", "1" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (dispatcherTypeObjectEDataType, 
>+		 (nullCharTypeEEnum, 
> 		 source, 
> 		 new String[] {
>-			 "name", "dispatcherType:Object", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "baseType", "dispatcherType" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "null-charType" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (nullCharTypeObjectEDataType, 
>+		 source, 
>+		 new String[] {
>+			 "name", "null-charType:Object", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "baseType", "null-charType" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });			
> 		addAnnotation
>-		 (encodingTypeEDataType, 
>+		 (orderingOrderingTypeEClass, 
> 		 source, 
> 		 new String[] {
>-			 "name", "encodingType", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#string", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "pattern", "[^\\s]+" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "ordering-orderingType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getOrderingOrderingType_Name(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "name", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getOrderingOrderingType_Others(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "others", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });			
> 		addAnnotation
>-		 (errorCodeTypeEDataType, 
>+		 (orderingOthersTypeEClass, 
> 		 source, 
> 		 new String[] {
>-			 "name", "error-codeType", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#positiveInteger", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "pattern", "\\d{3}" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "ordering-othersType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "empty" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getOrderingOthersType_Id(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });			
> 		addAnnotation
>-		 (errorPageEClass, 
>+		 (orderingTypeEClass, 
> 		 source, 
> 		 new String[] {
>-			 "name", "error-pageType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "orderingType", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getErrorPage_ErrorCode(), 
>+		 (getOrderingType_After(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "error-code", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "after", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>-		 });			
>+		 });		
> 		addAnnotation
>-		 (getErrorPage_ExceptionType(), 
>+		 (getOrderingType_Before(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "exception-type", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "before", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });			
> 		addAnnotation
>-		 (getErrorPage_Location(), 
>+		 (securityConstraintEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "security-constraintType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getSecurityConstraint_DisplayNames(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "location", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "display-name", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getErrorPage_Id(), 
>+		 (getSecurityConstraint_WebResourceCollections(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "web-resource-collection", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getSecurityConstraint_AuthConstraint(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "auth-constraint", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getSecurityConstraint_UserDataConstraint(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "user-data-constraint", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getSecurityConstraint_Id(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });			
> 		addAnnotation
>-		 (filterEClass, 
>+		 (servletEClass, 
> 		 source, 
> 		 new String[] {
>-			 "name", "filterType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "servletType", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getFilter_Descriptions(), 
>+		 (getServlet_Descriptions(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>@@ -2252,7 +3978,7 @@
> 			 "namespace", "http://java.sun.com/xml/ns/javaee" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getFilter_DisplayNames(), 
>+		 (getServlet_DisplayNames(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>@@ -2260,7 +3986,7 @@
> 			 "namespace", "http://java.sun.com/xml/ns/javaee" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getFilter_Icons(), 
>+		 (getServlet_Icons(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>@@ -2268,566 +3994,646 @@
> 			 "namespace", "http://java.sun.com/xml/ns/javaee" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getFilter_FilterName(), 
>+		 (getServlet_ServletName(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "filter-name", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "servlet-name", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });			
> 		addAnnotation
>-		 (getFilter_FilterClass(), 
>+		 (getServlet_ServletClass(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "filter-class", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "servlet-class", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>-		 });			
>+		 });		
> 		addAnnotation
>-		 (getFilter_InitParams(), 
>+		 (getServlet_JspFile(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "init-param", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "jsp-file", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getFilter_Id(), 
>+		 (getServlet_InitParams(), 
> 		 source, 
> 		 new String[] {
>-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "init-param", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });			
> 		addAnnotation
>-		 (filterMappingEClass, 
>+		 (getServlet_LoadOnStartup(), 
> 		 source, 
> 		 new String[] {
>-			 "name", "filter-mappingType", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>-		 });		
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "load-on-startup", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
> 		addAnnotation
>-		 (getFilterMapping_FilterName(), 
>+		 (getServlet_Enabled(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "filter-name", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "enabled", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getServlet_AsyncSupported(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "async-supported", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getFilterMapping_Group(), 
>+		 (getServlet_RunAs(), 
> 		 source, 
> 		 new String[] {
>-			 "kind", "group", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "group:1" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "run-as", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getFilterMapping_UrlPatterns(), 
>+		 (getServlet_SecurityRoleRefs(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "url-pattern", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "group", "#group:1" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "security-role-ref", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getServlet_MultipartConfig(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "multipart-config", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getFilterMapping_ServletNames(), 
>+		 (getServlet_Id(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (servletMappingEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "servlet-mappingType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getServletMapping_ServletName(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "name", "servlet-name", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "group", "#group:1" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getFilterMapping_Dispatchers(), 
>+		 (getServletMapping_UrlPatterns(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "dispatcher", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "url-pattern", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getFilterMapping_Id(), 
>+		 (getServletMapping_Id(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });			
> 		addAnnotation
>-		 (filterNameTypeEDataType, 
>+		 (servletNameTypeEDataType, 
> 		 source, 
> 		 new String[] {
>-			 "name", "filter-nameType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "servlet-nameType", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "baseType", "nonEmptyStringType" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });			
> 		addAnnotation
>-		 (formLoginConfigEClass, 
>+		 (sessionConfigEClass, 
> 		 source, 
> 		 new String[] {
>-			 "name", "form-login-configType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "session-configType", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });			
> 		addAnnotation
>-		 (getFormLoginConfig_FormLoginPage(), 
>+		 (getSessionConfig_SessionTimeout(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "form-login-page", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "session-timeout", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });			
> 		addAnnotation
>-		 (getFormLoginConfig_FormErrorPage(), 
>+		 (getSessionConfig_CookieConfig(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "form-error-page", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "cookie-config", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getSessionConfig_TrackingMode(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "tracking-mode", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getFormLoginConfig_Id(), 
>+		 (getSessionConfig_Id(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });			
> 		addAnnotation
>-		 (httpMethodTypeEDataType, 
>+		 (trackingModeTypeEEnum, 
>+		 source, 
>+		 new String[] {
>+			 "name", "tracking-modeType" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (trackingModeTypeObjectEDataType, 
>+		 source, 
>+		 new String[] {
>+			 "name", "tracking-modeType:Object", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "baseType", "tracking-modeType" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (transportGuaranteeTypeEEnum, 
> 		 source, 
> 		 new String[] {
>-			 "name", "http-methodType", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#token", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "pattern", "[\\p{L}-[\\p{Cc}\\p{Z}]]+" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "transport-guaranteeType" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (loadOnStartupTypeEDataType, 
>+		 (transportGuaranteeTypeObjectEDataType, 
> 		 source, 
> 		 new String[] {
>-			 "name", "load-on-startupType", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "memberTypes", "null-charType http://www.eclipse.org/emf/2003/XMLType#integer" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "transport-guaranteeType:Object", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "baseType", "transport-guaranteeType" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });			
> 		addAnnotation
>-		 (localeEncodingMappingEClass, 
>+		 (userDataConstraintEClass, 
> 		 source, 
> 		 new String[] {
>-			 "name", "locale-encoding-mappingType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "user-data-constraintType", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getLocaleEncodingMapping_Locale(), 
>+		 (getUserDataConstraint_Descriptions(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "locale", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "description", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getLocaleEncodingMapping_Encoding(), 
>+		 (getUserDataConstraint_TransportGuarantee(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "encoding", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "transport-guarantee", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getLocaleEncodingMapping_Id(), 
>+		 (getUserDataConstraint_Id(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });			
> 		addAnnotation
>-		 (localeEncodingMappingListEClass, 
>+		 (warPathTypeEDataType, 
> 		 source, 
> 		 new String[] {
>-			 "name", "locale-encoding-mapping-listType", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "war-pathType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#token", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "pattern", "/.*" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getLocaleEncodingMappingList_LocalEncodingMappings(), 
>+		 (webAppEClass, 
> 		 source, 
> 		 new String[] {
>-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "locale-encoding-mapping", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "web-appType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getLocaleEncodingMappingList_Id(), 
>+		 (getWebApp_Group(), 
> 		 source, 
> 		 new String[] {
>-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
>-		 });			
>+			 "kind", "group", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "group:0" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
> 		addAnnotation
>-		 (localeTypeEDataType, 
>+		 (getWebApp_Descriptions(), 
> 		 source, 
> 		 new String[] {
>-			 "name", "localeType", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#string", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "pattern", "[a-z]{2}(_|-)?([\\p{L}\\-\\p{Nd}]{2})?" //$NON-NLS-1$ //$NON-NLS-2$
>-		 });			
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "description", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "http://java.sun.com/xml/ns/javaee", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
> 		addAnnotation
>-		 (loginConfigEClass, 
>+		 (getWebApp_DisplayNames(), 
> 		 source, 
> 		 new String[] {
>-			 "name", "login-configType", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "display-name", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "http://java.sun.com/xml/ns/javaee", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getLoginConfig_AuthMethod(), 
>+		 (getWebApp_Icons(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "auth-method", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "icon", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "http://java.sun.com/xml/ns/javaee", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });			
> 		addAnnotation
>-		 (getLoginConfig_RealmName(), 
>+		 (getWebApp_Name(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "realm-name", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "name", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getLoginConfig_FormLoginConfig(), 
>+		 (getWebApp_Distributables(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "form-login-config", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>-		 });		
>-		addAnnotation
>-		 (getLoginConfig_Id(), 
>-		 source, 
>-		 new String[] {
>-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "distributable", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });			
> 		addAnnotation
>-		 (mimeMappingEClass, 
>+		 (getWebApp_ContextParams(), 
> 		 source, 
> 		 new String[] {
>-			 "name", "mime-mappingType", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "context-param", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getMimeMapping_Extension(), 
>+		 (getWebApp_Filters(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "extension", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "filter", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getMimeMapping_MimeType(), 
>+		 (getWebApp_FilterMappings(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "mime-type", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "filter-mapping", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getMimeMapping_Id(), 
>-		 source, 
>-		 new String[] {
>-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
>-		 });			
>-		addAnnotation
>-		 (mimeTypeTypeEDataType, 
>-		 source, 
>-		 new String[] {
>-			 "name", "mime-typeType", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#token", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "pattern", "[^\\p{Cc}^\\s]+/[^\\p{Cc}^\\s]+" //$NON-NLS-1$ //$NON-NLS-2$
>-		 });			
>-		addAnnotation
>-		 (nonEmptyStringTypeEDataType, 
>+		 (getWebApp_Listeners(), 
> 		 source, 
> 		 new String[] {
>-			 "name", "nonEmptyStringType", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#token", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "minLength", "1" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "listener", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (nullCharTypeEEnum, 
>+		 (getWebApp_Servlets(), 
> 		 source, 
> 		 new String[] {
>-			 "name", "null-charType" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "servlet", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (nullCharTypeObjectEDataType, 
>-		 source, 
>-		 new String[] {
>-			 "name", "null-charType:Object", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "baseType", "null-charType" //$NON-NLS-1$ //$NON-NLS-2$
>-		 });			
>-		addAnnotation
>-		 (securityConstraintEClass, 
>+		 (getWebApp_ServletMappings(), 
> 		 source, 
> 		 new String[] {
>-			 "name", "security-constraintType", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "servlet-mapping", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getSecurityConstraint_DisplayNames(), 
>+		 (getWebApp_SessionConfigs(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "display-name", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "session-config", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getSecurityConstraint_WebResourceCollections(), 
>+		 (getWebApp_MimeMappings(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "web-resource-collection", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "mime-mapping", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getSecurityConstraint_AuthConstraint(), 
>+		 (getWebApp_WelcomeFileLists(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "auth-constraint", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "welcome-file-list", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getSecurityConstraint_UserDataConstraint(), 
>+		 (getWebApp_ErrorPages(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "user-data-constraint", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "error-page", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getSecurityConstraint_Id(), 
>+		 (getWebApp_JspConfigs(), 
> 		 source, 
> 		 new String[] {
>-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
>-		 });			
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "jsp-config", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
> 		addAnnotation
>-		 (servletEClass, 
>+		 (getWebApp_SecurityConstraints(), 
> 		 source, 
> 		 new String[] {
>-			 "name", "servletType", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "security-constraint", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getServlet_Descriptions(), 
>+		 (getWebApp_LoginConfigs(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "description", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "namespace", "http://java.sun.com/xml/ns/javaee" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "login-config", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getServlet_DisplayNames(), 
>+		 (getWebApp_SecurityRoles(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "display-name", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "namespace", "http://java.sun.com/xml/ns/javaee" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "security-role", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getServlet_Icons(), 
>+		 (getWebApp_EnvEntries(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "icon", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "namespace", "http://java.sun.com/xml/ns/javaee" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "env-entry", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "http://java.sun.com/xml/ns/javaee", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getServlet_ServletName(), 
>+		 (getWebApp_EjbRefs(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "servlet-name", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>-		 });			
>+			 "name", "ejb-ref", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "http://java.sun.com/xml/ns/javaee", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
> 		addAnnotation
>-		 (getServlet_ServletClass(), 
>+		 (getWebApp_EjbLocalRefs(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "servlet-class", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "ejb-local-ref", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "http://java.sun.com/xml/ns/javaee", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getServlet_JspFile(), 
>+		 (getWebApp_ServiceRefs(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "jsp-file", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "service-ref", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "http://java.sun.com/xml/ns/javaee", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getServlet_InitParams(), 
>+		 (getWebApp_ResourceRefs(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "init-param", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>-		 });			
>+			 "name", "resource-ref", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "http://java.sun.com/xml/ns/javaee", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
> 		addAnnotation
>-		 (getServlet_LoadOnStartup(), 
>+		 (getWebApp_ResourceEnvRefs(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "load-on-startup", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "resource-env-ref", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "http://java.sun.com/xml/ns/javaee", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getServlet_RunAs(), 
>+		 (getWebApp_MessageDestinationRefs(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "run-as", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "message-destination-ref", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "http://java.sun.com/xml/ns/javaee", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getServlet_SecurityRoleRefs(), 
>+		 (getWebApp_PersistenceContextRefs(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "security-role-ref", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "persistence-context-ref", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "http://java.sun.com/xml/ns/javaee", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getServlet_Id(), 
>+		 (getWebApp_PersistenceUnitRefs(), 
> 		 source, 
> 		 new String[] {
>-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
>-		 });			
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "persistence-unit-ref", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "http://java.sun.com/xml/ns/javaee", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
> 		addAnnotation
>-		 (servletMappingEClass, 
>+		 (getWebApp_PostConstructs(), 
> 		 source, 
> 		 new String[] {
>-			 "name", "servlet-mappingType", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "post-construct", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "http://java.sun.com/xml/ns/javaee", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getServletMapping_ServletName(), 
>+		 (getWebApp_PreDestroys(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "servlet-name", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "pre-destroy", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "http://java.sun.com/xml/ns/javaee", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getServletMapping_UrlPatterns(), 
>+		 (getWebApp_DataSource(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "url-pattern", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "data-source", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "http://java.sun.com/xml/ns/javaee", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getServletMapping_Id(), 
>+		 (getWebApp_MessageDestinations(), 
> 		 source, 
> 		 new String[] {
>-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "message-destination", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });			
> 		addAnnotation
>-		 (servletNameTypeEDataType, 
>+		 (getWebApp_LocalEncodingMappingsLists(), 
> 		 source, 
> 		 new String[] {
>-			 "name", "servlet-nameType", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "baseType", "nonEmptyStringType" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "locale-encoding-mapping-list", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });			
> 		addAnnotation
>-		 (sessionConfigEClass, 
>+		 (getWebApp_ModuleName(), 
> 		 source, 
> 		 new String[] {
>-			 "name", "session-configType", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "module-name", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });			
> 		addAnnotation
>-		 (getSessionConfig_SessionTimeout(), 
>+		 (getWebApp_AbsoluteOrdering(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "session-timeout", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "absolute-ordering", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getSessionConfig_Id(), 
>+		 (getWebApp_Id(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });			
> 		addAnnotation
>-		 (transportGuaranteeTypeEEnum, 
>+		 (getWebApp_MetadataComplete(), 
> 		 source, 
> 		 new String[] {
>-			 "name", "transport-guaranteeType" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "metadata-complete" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (transportGuaranteeTypeObjectEDataType, 
>+		 (getWebApp_Version(), 
> 		 source, 
> 		 new String[] {
>-			 "name", "transport-guaranteeType:Object", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "baseType", "transport-guaranteeType" //$NON-NLS-1$ //$NON-NLS-2$
>-		 });			
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "version" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
> 		addAnnotation
>-		 (userDataConstraintEClass, 
>+		 (webAppDeploymentDescriptorEClass, 
> 		 source, 
> 		 new String[] {
>-			 "name", "user-data-constraintType", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "mixed" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getUserDataConstraint_Descriptions(), 
>+		 (getWebAppDeploymentDescriptor_Mixed(), 
> 		 source, 
> 		 new String[] {
>-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "description", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "elementWildcard", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", ":mixed" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getUserDataConstraint_TransportGuarantee(), 
>+		 (getWebAppDeploymentDescriptor_XMLNSPrefixMap(), 
> 		 source, 
> 		 new String[] {
>-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "transport-guarantee", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "xmlns:prefix" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getUserDataConstraint_Id(), 
>+		 (getWebAppDeploymentDescriptor_XSISchemaLocation(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "xsi:schemaLocation" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getWebAppDeploymentDescriptor_WebApp(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "web-app", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });			
> 		addAnnotation
>-		 (warPathTypeEDataType, 
>+		 (webAppVersionTypeEEnum, 
> 		 source, 
> 		 new String[] {
>-			 "name", "war-pathType", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#token", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "pattern", "/.*" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "web-app-versionType" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (webAppEClass, 
>+		 (webAppVersionTypeObjectEDataType, 
> 		 source, 
> 		 new String[] {
>-			 "name", "web-appType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "web-app-versionType:Object", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "baseType", "web-app-versionType" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (webFragmentEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "web-fragmentType", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getWebApp_Group(), 
>+		 (getWebFragment_Group(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "group", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "name", "group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getWebApp_Descriptions(), 
>+		 (getWebFragment_Descriptions(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>@@ -2836,7 +4642,7 @@
> 			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getWebApp_DisplayNames(), 
>+		 (getWebFragment_DisplayNames(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>@@ -2845,16 +4651,25 @@
> 			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getWebApp_Icons(), 
>+		 (getWebFragment_Icons(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "name", "icon", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "namespace", "http://java.sun.com/xml/ns/javaee", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getWebFragment_Name(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "name", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getWebApp_Distributables(), 
>+		 (getWebFragment_Distributables(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>@@ -2863,7 +4678,7 @@
> 			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });			
> 		addAnnotation
>-		 (getWebApp_ContextParams(), 
>+		 (getWebFragment_ContextParams(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>@@ -2872,7 +4687,7 @@
> 			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getWebApp_Filters(), 
>+		 (getWebFragment_Filters(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>@@ -2881,7 +4696,7 @@
> 			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getWebApp_FilterMappings(), 
>+		 (getWebFragment_FilterMappings(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>@@ -2890,7 +4705,7 @@
> 			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getWebApp_Listeners(), 
>+		 (getWebFragment_Listeners(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>@@ -2899,7 +4714,7 @@
> 			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getWebApp_Servlets(), 
>+		 (getWebFragment_Servlets(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>@@ -2908,7 +4723,7 @@
> 			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getWebApp_ServletMappings(), 
>+		 (getWebFragment_ServletMappings(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>@@ -2917,7 +4732,7 @@
> 			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getWebApp_SessionConfigs(), 
>+		 (getWebFragment_SessionConfigs(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>@@ -2926,7 +4741,7 @@
> 			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getWebApp_MimeMappings(), 
>+		 (getWebFragment_MimeMappings(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>@@ -2935,7 +4750,7 @@
> 			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getWebApp_WelcomeFileLists(), 
>+		 (getWebFragment_WelcomeFileLists(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>@@ -2944,7 +4759,7 @@
> 			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getWebApp_ErrorPages(), 
>+		 (getWebFragment_ErrorPages(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>@@ -2953,7 +4768,7 @@
> 			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getWebApp_JspConfigs(), 
>+		 (getWebFragment_JspConfigs(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>@@ -2962,7 +4777,7 @@
> 			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getWebApp_SecurityConstraints(), 
>+		 (getWebFragment_SecurityConstraints(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>@@ -2971,7 +4786,7 @@
> 			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getWebApp_LoginConfigs(), 
>+		 (getWebFragment_LoginConfigs(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>@@ -2980,7 +4795,7 @@
> 			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getWebApp_SecurityRoles(), 
>+		 (getWebFragment_SecurityRoles(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>@@ -2989,7 +4804,7 @@
> 			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getWebApp_EnvEntries(), 
>+		 (getWebFragment_EnvEntries(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>@@ -2998,7 +4813,7 @@
> 			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getWebApp_EjbRefs(), 
>+		 (getWebFragment_EjbRefs(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>@@ -3007,7 +4822,7 @@
> 			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getWebApp_EjbLocalRefs(), 
>+		 (getWebFragment_EjbLocalRefs(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>@@ -3016,7 +4831,7 @@
> 			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getWebApp_ServiceRefs(), 
>+		 (getWebFragment_ServiceRefs(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>@@ -3025,7 +4840,7 @@
> 			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getWebApp_ResourceRefs(), 
>+		 (getWebFragment_ResourceRefs(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>@@ -3034,7 +4849,7 @@
> 			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getWebApp_ResourceEnvRefs(), 
>+		 (getWebFragment_ResourceEnvRefs(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>@@ -3043,7 +4858,7 @@
> 			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getWebApp_MessageDestinationRefs(), 
>+		 (getWebFragment_MessageDestinationRefs(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>@@ -3052,7 +4867,7 @@
> 			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getWebApp_PersistenceContextRefs(), 
>+		 (getWebFragment_PersistenceContextRefs(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>@@ -3061,7 +4876,7 @@
> 			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getWebApp_PersistenceUnitRefs(), 
>+		 (getWebFragment_PersistenceUnitRefs(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>@@ -3070,7 +4885,7 @@
> 			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getWebApp_PostConstructs(), 
>+		 (getWebFragment_PostConstructs(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>@@ -3079,7 +4894,7 @@
> 			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getWebApp_PreDestroys(), 
>+		 (getWebFragment_PreDestroys(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>@@ -3088,92 +4903,61 @@
> 			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getWebApp_MessageDestinations(), 
>+		 (getWebFragment_DataSource(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "message-destination", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "data-source", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "http://java.sun.com/xml/ns/javaee", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getWebApp_LocalEncodingMappingsLists(), 
>+		 (getWebFragment_MessageDestinations(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "locale-encoding-mapping-list", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "message-destination", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
>-		 });		
>-		addAnnotation
>-		 (getWebApp_Id(), 
>-		 source, 
>-		 new String[] {
>-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });			
> 		addAnnotation
>-		 (getWebApp_MetadataComplete(), 
>-		 source, 
>-		 new String[] {
>-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "metadata-complete" //$NON-NLS-1$ //$NON-NLS-2$
>-		 });		
>-		addAnnotation
>-		 (getWebApp_Version(), 
>-		 source, 
>-		 new String[] {
>-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "version" //$NON-NLS-1$ //$NON-NLS-2$
>-		 });		
>-		addAnnotation
>-		 (webAppDeploymentDescriptorEClass, 
>-		 source, 
>-		 new String[] {
>-			 "name", "", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "kind", "mixed" //$NON-NLS-1$ //$NON-NLS-2$
>-		 });		
>-		addAnnotation
>-		 (getWebAppDeploymentDescriptor_Mixed(), 
>+		 (getWebFragment_LocalEncodingMappingsLists(), 
> 		 source, 
> 		 new String[] {
>-			 "kind", "elementWildcard", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", ":mixed" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "locale-encoding-mapping-list", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getWebAppDeploymentDescriptor_XMLNSPrefixMap(), 
>+		 (getWebFragment_Ordering(), 
> 		 source, 
> 		 new String[] {
>-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "xmlns:prefix" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "ordering", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getWebAppDeploymentDescriptor_XSISchemaLocation(), 
>+		 (getWebFragment_Id(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "xsi:schemaLocation" //$NON-NLS-1$ //$NON-NLS-2$
>-		 });			
>-		addAnnotation
>-		 (getWebAppDeploymentDescriptor_WebApp(), 
>-		 source, 
>-		 new String[] {
>-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "web-app", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });			
> 		addAnnotation
>-		 (webAppVersionTypeEEnum, 
>+		 (getWebFragment_MetadataComplete(), 
> 		 source, 
> 		 new String[] {
>-			 "name", "web-app-versionType" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "metadata-complete" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (webAppVersionTypeObjectEDataType, 
>+		 (getWebFragment_Version(), 
> 		 source, 
> 		 new String[] {
>-			 "name", "web-app-versionType:Object", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "baseType", "web-app-versionType" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "version" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });			
> 		addAnnotation
> 		 (webResourceCollectionEClass, 
>@@ -3205,7 +4989,7 @@
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "name", "url-pattern", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>-		 });		
>+		 });			
> 		addAnnotation
> 		 (getWebResourceCollection_HttpMethods(), 
> 		 source, 
>@@ -3213,6 +4997,14 @@
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "name", "http-method", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getWebResourceCollection_HttpMethodOmission(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "http-method-omission", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
> 		 (getWebResourceCollection_Id(), 
>Index: jee-models/org/eclipse/jst/javaee/web/internal/impl/WebAppDeploymentDescriptorImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WebAppDeploymentDescriptorImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 WebAppDeploymentDescriptorImpl.java
>--- jee-models/org/eclipse/jst/javaee/web/internal/impl/WebAppDeploymentDescriptorImpl.java	9 Jun 2009 19:37:06 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/web/internal/impl/WebAppDeploymentDescriptorImpl.java	14 Oct 2009 21:47:32 -0000
>@@ -59,7 +59,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected FeatureMap mixed = null;
>+	protected FeatureMap mixed;
> 
> 	/**
> 	 * The cached value of the '{@link #getXMLNSPrefixMap() XMLNS Prefix Map}' map.
>@@ -69,7 +69,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EMap xMLNSPrefixMap = null;
>+	protected EMap<String, String> xMLNSPrefixMap;
> 
> 	/**
> 	 * The cached value of the '{@link #getXSISchemaLocation() XSI Schema Location}' map.
>@@ -79,7 +79,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EMap xSISchemaLocation = null;
>+	protected EMap<String, String> xSISchemaLocation;
> 
> 	/**
> 	 * 
>@@ -117,9 +117,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public Map getXMLNSPrefixMap() {
>+	public Map<String, String> getXMLNSPrefixMap() {
> 		if (xMLNSPrefixMap == null) {
>-			xMLNSPrefixMap = new EcoreEMap(EcorePackage.Literals.ESTRING_TO_STRING_MAP_ENTRY, EStringToStringMapEntryImpl.class, this, WebPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP);
>+			xMLNSPrefixMap = new EcoreEMap<String,String>(EcorePackage.Literals.ESTRING_TO_STRING_MAP_ENTRY, EStringToStringMapEntryImpl.class, this, WebPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP);
> 		}
> 		return xMLNSPrefixMap.map();
> 	}
>@@ -129,9 +129,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public Map getXSISchemaLocation() {
>+	public Map<String, String> getXSISchemaLocation() {
> 		if (xSISchemaLocation == null) {
>-			xSISchemaLocation = new EcoreEMap(EcorePackage.Literals.ESTRING_TO_STRING_MAP_ENTRY, EStringToStringMapEntryImpl.class, this, WebPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION);
>+			xSISchemaLocation = new EcoreEMap<String,String>(EcorePackage.Literals.ESTRING_TO_STRING_MAP_ENTRY, EStringToStringMapEntryImpl.class, this, WebPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION);
> 		}
> 		return xSISchemaLocation.map();
> 	}
>@@ -172,11 +172,11 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case WebPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__MIXED:
>-				return ((InternalEList)getMixed()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getMixed()).basicRemove(otherEnd, msgs);
> 			case WebPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP:
>-				return ((InternalEList)((EMap.InternalMapView)getXMLNSPrefixMap()).eMap()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)((EMap.InternalMapView<String, String>)getXMLNSPrefixMap()).eMap()).basicRemove(otherEnd, msgs);
> 			case WebPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION:
>-				return ((InternalEList)((EMap.InternalMapView)getXSISchemaLocation()).eMap()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)((EMap.InternalMapView<String, String>)getXSISchemaLocation()).eMap()).basicRemove(otherEnd, msgs);
> 			case WebPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__WEB_APP:
> 				return basicSetWebApp(null, msgs);
> 		}
>@@ -195,10 +195,10 @@
> 				if (coreType) return getMixed();
> 				return ((FeatureMap.Internal)getMixed()).getWrapper();
> 			case WebPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP:
>-				if (coreType) return ((EMap.InternalMapView)getXMLNSPrefixMap()).eMap();
>+				if (coreType) return ((EMap.InternalMapView<String, String>)getXMLNSPrefixMap()).eMap();
> 				else return getXMLNSPrefixMap();
> 			case WebPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION:
>-				if (coreType) return ((EMap.InternalMapView)getXSISchemaLocation()).eMap();
>+				if (coreType) return ((EMap.InternalMapView<String, String>)getXSISchemaLocation()).eMap();
> 				else return getXSISchemaLocation();
> 			case WebPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__WEB_APP:
> 				return getWebApp();
>@@ -218,10 +218,10 @@
> 				((FeatureMap.Internal)getMixed()).set(newValue);
> 				return;
> 			case WebPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP:
>-				((EStructuralFeature.Setting)((EMap.InternalMapView)getXMLNSPrefixMap()).eMap()).set(newValue);
>+				((EStructuralFeature.Setting)((EMap.InternalMapView<String, String>)getXMLNSPrefixMap()).eMap()).set(newValue);
> 				return;
> 			case WebPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION:
>-				((EStructuralFeature.Setting)((EMap.InternalMapView)getXSISchemaLocation()).eMap()).set(newValue);
>+				((EStructuralFeature.Setting)((EMap.InternalMapView<String, String>)getXSISchemaLocation()).eMap()).set(newValue);
> 				return;
> 			case WebPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__WEB_APP:
> 				setWebApp((WebApp)newValue);
>Index: jee-models/org/eclipse/jst/javaee/web/internal/impl/ServletMappingImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/ServletMappingImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 ServletMappingImpl.java
>--- jee-models/org/eclipse/jst/javaee/web/internal/impl/ServletMappingImpl.java	9 Jun 2009 19:37:06 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/web/internal/impl/ServletMappingImpl.java	14 Oct 2009 21:47:32 -0000
>@@ -77,7 +77,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList urlPatterns = null;
>+	protected EList<UrlPatternType> urlPatterns;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -144,9 +144,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getUrlPatterns() {
>+	public List<UrlPatternType> getUrlPatterns() {
> 		if (urlPatterns == null) {
>-			urlPatterns = new EObjectContainmentEList(UrlPatternType.class, this, WebPackage.SERVLET_MAPPING__URL_PATTERNS);
>+			urlPatterns = new EObjectContainmentEList<UrlPatternType>(UrlPatternType.class, this, WebPackage.SERVLET_MAPPING__URL_PATTERNS);
> 		}
> 		return urlPatterns;
> 	}
>@@ -181,7 +181,7 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case WebPackage.SERVLET_MAPPING__URL_PATTERNS:
>-				return ((InternalEList)getUrlPatterns()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getUrlPatterns()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -209,6 +209,7 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
>@@ -217,7 +218,7 @@
> 				return;
> 			case WebPackage.SERVLET_MAPPING__URL_PATTERNS:
> 				getUrlPatterns().clear();
>-				getUrlPatterns().addAll((Collection)newValue);
>+				getUrlPatterns().addAll((Collection<? extends UrlPatternType>)newValue);
> 				return;
> 			case WebPackage.SERVLET_MAPPING__ID:
> 				setId((String)newValue);
>Index: jee-models/org/eclipse/jst/javaee/web/internal/util/WebResourceImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/util/WebResourceImpl.java,v
>retrieving revision 1.6
>diff -u -r1.6 WebResourceImpl.java
>--- jee-models/org/eclipse/jst/javaee/web/internal/util/WebResourceImpl.java	9 Jun 2009 19:37:05 -0000	1.6
>+++ jee-models/org/eclipse/jst/javaee/web/internal/util/WebResourceImpl.java	14 Oct 2009 21:47:33 -0000
>@@ -28,7 +28,7 @@
> * @see org.eclipse.jst.javaee.web.internal.util.WebResourceFactoryImpl
> * @generated
> */
>-public class WebResourceImpl extends JavaeeResourceImpl implements IRootObjectResource, IWebResource{
>+public class WebResourceImpl extends JavaeeResourceImpl implements IRootObjectResource, IWebResource {
> 	/**
> 	 * Creates an instance of the resource.
> 	 * 
>Index: jee-models/org/eclipse/jst/javaee/web/internal/util/WebSwitch.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/util/WebSwitch.java,v
>retrieving revision 1.2
>diff -u -r1.2 WebSwitch.java
>--- jee-models/org/eclipse/jst/javaee/web/internal/util/WebSwitch.java	26 Jul 2007 16:56:11 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/web/internal/util/WebSwitch.java	14 Oct 2009 21:47:33 -0000
>@@ -32,7 +32,7 @@
> * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage
> * @generated
> */
>-public class WebSwitch {
>+public class WebSwitch<T> {
> 	/**
> 	 * The cached model package
> 	 * 
>@@ -60,7 +60,7 @@
> 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
> 	 * @generated
> 	 */
>-	public Object doSwitch(EObject theEObject) {
>+	public T doSwitch(EObject theEObject) {
> 		return doSwitch(theEObject.eClass(), theEObject);
> 	}
> 
>@@ -71,16 +71,16 @@
> 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
> 	 * @generated
> 	 */
>-	protected Object doSwitch(EClass theEClass, EObject theEObject) {
>+	protected T doSwitch(EClass theEClass, EObject theEObject) {
> 		if (theEClass.eContainer() == modelPackage) {
> 			return doSwitch(theEClass.getClassifierID(), theEObject);
> 		}
> 		else {
>-			List eSuperTypes = theEClass.getESuperTypes();
>+			List<EClass> eSuperTypes = theEClass.getESuperTypes();
> 			return
> 				eSuperTypes.isEmpty() ?
> 					defaultCase(theEObject) :
>-					doSwitch((EClass)eSuperTypes.get(0), theEObject);
>+					doSwitch(eSuperTypes.get(0), theEObject);
> 		}
> 	}
> 
>@@ -91,113 +91,179 @@
> 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
> 	 * @generated
> 	 */
>-	protected Object doSwitch(int classifierID, EObject theEObject) {
>+	protected T doSwitch(int classifierID, EObject theEObject) {
> 		switch (classifierID) {
>+			case WebPackage.ABSOLUTE_ORDERING_TYPE: {
>+				AbsoluteOrderingType absoluteOrderingType = (AbsoluteOrderingType)theEObject;
>+				T result = caseAbsoluteOrderingType(absoluteOrderingType);
>+				if (result == null) result = defaultCase(theEObject);
>+				return result;
>+			}
> 			case WebPackage.AUTH_CONSTRAINT: {
> 				AuthConstraint authConstraint = (AuthConstraint)theEObject;
>-				Object result = caseAuthConstraint(authConstraint);
>+				T result = caseAuthConstraint(authConstraint);
>+				if (result == null) result = defaultCase(theEObject);
>+				return result;
>+			}
>+			case WebPackage.COOKIE_COMMENT_TYPE: {
>+				CookieCommentType cookieCommentType = (CookieCommentType)theEObject;
>+				T result = caseCookieCommentType(cookieCommentType);
>+				if (result == null) result = defaultCase(theEObject);
>+				return result;
>+			}
>+			case WebPackage.COOKIE_CONFIG_TYPE: {
>+				CookieConfigType cookieConfigType = (CookieConfigType)theEObject;
>+				T result = caseCookieConfigType(cookieConfigType);
>+				if (result == null) result = defaultCase(theEObject);
>+				return result;
>+			}
>+			case WebPackage.COOKIE_DOMAIN_TYPE: {
>+				CookieDomainType cookieDomainType = (CookieDomainType)theEObject;
>+				T result = caseCookieDomainType(cookieDomainType);
>+				if (result == null) result = defaultCase(theEObject);
>+				return result;
>+			}
>+			case WebPackage.COOKIE_NAME_TYPE: {
>+				CookieNameType cookieNameType = (CookieNameType)theEObject;
>+				T result = caseCookieNameType(cookieNameType);
>+				if (result == null) result = defaultCase(theEObject);
>+				return result;
>+			}
>+			case WebPackage.COOKIE_PATH_TYPE: {
>+				CookiePathType cookiePathType = (CookiePathType)theEObject;
>+				T result = caseCookiePathType(cookiePathType);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case WebPackage.ERROR_PAGE: {
> 				ErrorPage errorPage = (ErrorPage)theEObject;
>-				Object result = caseErrorPage(errorPage);
>+				T result = caseErrorPage(errorPage);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case WebPackage.FILTER: {
> 				Filter filter = (Filter)theEObject;
>-				Object result = caseFilter(filter);
>+				T result = caseFilter(filter);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case WebPackage.FILTER_MAPPING: {
> 				FilterMapping filterMapping = (FilterMapping)theEObject;
>-				Object result = caseFilterMapping(filterMapping);
>+				T result = caseFilterMapping(filterMapping);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case WebPackage.FORM_LOGIN_CONFIG: {
> 				FormLoginConfig formLoginConfig = (FormLoginConfig)theEObject;
>-				Object result = caseFormLoginConfig(formLoginConfig);
>+				T result = caseFormLoginConfig(formLoginConfig);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case WebPackage.LOCALE_ENCODING_MAPPING: {
> 				LocaleEncodingMapping localeEncodingMapping = (LocaleEncodingMapping)theEObject;
>-				Object result = caseLocaleEncodingMapping(localeEncodingMapping);
>+				T result = caseLocaleEncodingMapping(localeEncodingMapping);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case WebPackage.LOCALE_ENCODING_MAPPING_LIST: {
> 				LocaleEncodingMappingList localeEncodingMappingList = (LocaleEncodingMappingList)theEObject;
>-				Object result = caseLocaleEncodingMappingList(localeEncodingMappingList);
>+				T result = caseLocaleEncodingMappingList(localeEncodingMappingList);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case WebPackage.LOGIN_CONFIG: {
> 				LoginConfig loginConfig = (LoginConfig)theEObject;
>-				Object result = caseLoginConfig(loginConfig);
>+				T result = caseLoginConfig(loginConfig);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case WebPackage.MIME_MAPPING: {
> 				MimeMapping mimeMapping = (MimeMapping)theEObject;
>-				Object result = caseMimeMapping(mimeMapping);
>+				T result = caseMimeMapping(mimeMapping);
>+				if (result == null) result = defaultCase(theEObject);
>+				return result;
>+			}
>+			case WebPackage.MULTIPART_CONFIG_TYPE: {
>+				MultipartConfigType multipartConfigType = (MultipartConfigType)theEObject;
>+				T result = caseMultipartConfigType(multipartConfigType);
>+				if (result == null) result = defaultCase(theEObject);
>+				return result;
>+			}
>+			case WebPackage.ORDERING_ORDERING_TYPE: {
>+				OrderingOrderingType orderingOrderingType = (OrderingOrderingType)theEObject;
>+				T result = caseOrderingOrderingType(orderingOrderingType);
>+				if (result == null) result = defaultCase(theEObject);
>+				return result;
>+			}
>+			case WebPackage.ORDERING_OTHERS_TYPE: {
>+				OrderingOthersType orderingOthersType = (OrderingOthersType)theEObject;
>+				T result = caseOrderingOthersType(orderingOthersType);
>+				if (result == null) result = defaultCase(theEObject);
>+				return result;
>+			}
>+			case WebPackage.ORDERING_TYPE: {
>+				OrderingType orderingType = (OrderingType)theEObject;
>+				T result = caseOrderingType(orderingType);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case WebPackage.SECURITY_CONSTRAINT: {
> 				SecurityConstraint securityConstraint = (SecurityConstraint)theEObject;
>-				Object result = caseSecurityConstraint(securityConstraint);
>+				T result = caseSecurityConstraint(securityConstraint);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case WebPackage.SERVLET: {
> 				Servlet servlet = (Servlet)theEObject;
>-				Object result = caseServlet(servlet);
>+				T result = caseServlet(servlet);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case WebPackage.SERVLET_MAPPING: {
> 				ServletMapping servletMapping = (ServletMapping)theEObject;
>-				Object result = caseServletMapping(servletMapping);
>+				T result = caseServletMapping(servletMapping);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case WebPackage.SESSION_CONFIG: {
> 				SessionConfig sessionConfig = (SessionConfig)theEObject;
>-				Object result = caseSessionConfig(sessionConfig);
>+				T result = caseSessionConfig(sessionConfig);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case WebPackage.USER_DATA_CONSTRAINT: {
> 				UserDataConstraint userDataConstraint = (UserDataConstraint)theEObject;
>-				Object result = caseUserDataConstraint(userDataConstraint);
>+				T result = caseUserDataConstraint(userDataConstraint);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case WebPackage.WEB_APP: {
> 				WebApp webApp = (WebApp)theEObject;
>-				Object result = caseWebApp(webApp);
>+				T result = caseWebApp(webApp);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case WebPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR: {
> 				WebAppDeploymentDescriptor webAppDeploymentDescriptor = (WebAppDeploymentDescriptor)theEObject;
>-				Object result = caseWebAppDeploymentDescriptor(webAppDeploymentDescriptor);
>+				T result = caseWebAppDeploymentDescriptor(webAppDeploymentDescriptor);
>+				if (result == null) result = defaultCase(theEObject);
>+				return result;
>+			}
>+			case WebPackage.WEB_FRAGMENT: {
>+				WebFragment webFragment = (WebFragment)theEObject;
>+				T result = caseWebFragment(webFragment);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case WebPackage.WEB_RESOURCE_COLLECTION: {
> 				WebResourceCollection webResourceCollection = (WebResourceCollection)theEObject;
>-				Object result = caseWebResourceCollection(webResourceCollection);
>+				T result = caseWebResourceCollection(webResourceCollection);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case WebPackage.WELCOME_FILE_LIST: {
> 				WelcomeFileList welcomeFileList = (WelcomeFileList)theEObject;
>-				Object result = caseWelcomeFileList(welcomeFileList);
>+				T result = caseWelcomeFileList(welcomeFileList);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
>@@ -206,287 +272,452 @@
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Auth Constraint'.
>+	 * Returns the result of interpreting the object as an instance of 'Absolute Ordering Type'.
>+	 * 
>+	 * This implementation returns null;
>+	 * returning a non-null result will terminate the switch.
>+	 * 
>+	 * @param object the target of the switch.
>+	 * @return the result of interpreting the object as an instance of 'Absolute Ordering Type'.
>+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+	 * @generated
>+	 */
>+	public T caseAbsoluteOrderingType(AbsoluteOrderingType object) {
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the result of interpreting the object as an instance of 'Auth Constraint'.
>+	 * 
>+	 * This implementation returns null;
>+	 * returning a non-null result will terminate the switch.
>+	 * 
>+	 * @param object the target of the switch.
>+	 * @return the result of interpreting the object as an instance of 'Auth Constraint'.
>+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+	 * @generated
>+	 */
>+	public T caseAuthConstraint(AuthConstraint object) {
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the result of interpreting the object as an instance of 'Cookie Comment Type'.
>+	 * 
>+	 * This implementation returns null;
>+	 * returning a non-null result will terminate the switch.
>+	 * 
>+	 * @param object the target of the switch.
>+	 * @return the result of interpreting the object as an instance of 'Cookie Comment Type'.
>+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+	 * @generated
>+	 */
>+	public T caseCookieCommentType(CookieCommentType object) {
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the result of interpreting the object as an instance of 'Cookie Config Type'.
>+	 * 
>+	 * This implementation returns null;
>+	 * returning a non-null result will terminate the switch.
>+	 * 
>+	 * @param object the target of the switch.
>+	 * @return the result of interpreting the object as an instance of 'Cookie Config Type'.
>+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+	 * @generated
>+	 */
>+	public T caseCookieConfigType(CookieConfigType object) {
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the result of interpreting the object as an instance of 'Cookie Domain Type'.
>+	 * 
>+	 * This implementation returns null;
>+	 * returning a non-null result will terminate the switch.
>+	 * 
>+	 * @param object the target of the switch.
>+	 * @return the result of interpreting the object as an instance of 'Cookie Domain Type'.
>+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+	 * @generated
>+	 */
>+	public T caseCookieDomainType(CookieDomainType object) {
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the result of interpreting the object as an instance of 'Cookie Name Type'.
>+	 * 
>+	 * This implementation returns null;
>+	 * returning a non-null result will terminate the switch.
>+	 * 
>+	 * @param object the target of the switch.
>+	 * @return the result of interpreting the object as an instance of 'Cookie Name Type'.
>+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+	 * @generated
>+	 */
>+	public T caseCookieNameType(CookieNameType object) {
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the result of interpreting the object as an instance of 'Cookie Path Type'.
>+	 * 
>+	 * This implementation returns null;
>+	 * returning a non-null result will terminate the switch.
>+	 * 
>+	 * @param object the target of the switch.
>+	 * @return the result of interpreting the object as an instance of 'Cookie Path Type'.
>+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+	 * @generated
>+	 */
>+	public T caseCookiePathType(CookiePathType object) {
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the result of interpreting the object as an instance of 'Error Page'.
>+	 * 
>+	 * This implementation returns null;
>+	 * returning a non-null result will terminate the switch.
>+	 * 
>+	 * @param object the target of the switch.
>+	 * @return the result of interpreting the object as an instance of 'Error Page'.
>+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+	 * @generated
>+	 */
>+	public T caseErrorPage(ErrorPage object) {
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the result of interpreting the object as an instance of 'Filter'.
>+	 * 
>+	 * This implementation returns null;
>+	 * returning a non-null result will terminate the switch.
>+	 * 
>+	 * @param object the target of the switch.
>+	 * @return the result of interpreting the object as an instance of 'Filter'.
>+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+	 * @generated
>+	 */
>+	public T caseFilter(Filter object) {
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the result of interpreting the object as an instance of 'Filter Mapping'.
>+	 * 
>+	 * This implementation returns null;
>+	 * returning a non-null result will terminate the switch.
>+	 * 
>+	 * @param object the target of the switch.
>+	 * @return the result of interpreting the object as an instance of 'Filter Mapping'.
>+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+	 * @generated
>+	 */
>+	public T caseFilterMapping(FilterMapping object) {
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the result of interpreting the object as an instance of 'Form Login Config'.
>+	 * 
>+	 * This implementation returns null;
>+	 * returning a non-null result will terminate the switch.
>+	 * 
>+	 * @param object the target of the switch.
>+	 * @return the result of interpreting the object as an instance of 'Form Login Config'.
>+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+	 * @generated
>+	 */
>+	public T caseFormLoginConfig(FormLoginConfig object) {
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the result of interpreting the object as an instance of 'Locale Encoding Mapping'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Auth Constraint'.
>+	 * @return the result of interpreting the object as an instance of 'Locale Encoding Mapping'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseAuthConstraint(AuthConstraint object) {
>+	public T caseLocaleEncodingMapping(LocaleEncodingMapping object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Error Page'.
>+	 * Returns the result of interpreting the object as an instance of 'Locale Encoding Mapping List'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Error Page'.
>+	 * @return the result of interpreting the object as an instance of 'Locale Encoding Mapping List'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseErrorPage(ErrorPage object) {
>+	public T caseLocaleEncodingMappingList(LocaleEncodingMappingList object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Filter'.
>+	 * Returns the result of interpreting the object as an instance of 'Login Config'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Filter'.
>+	 * @return the result of interpreting the object as an instance of 'Login Config'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseFilter(Filter object) {
>+	public T caseLoginConfig(LoginConfig object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Filter Mapping'.
>+	 * Returns the result of interpreting the object as an instance of 'Mime Mapping'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Filter Mapping'.
>+	 * @return the result of interpreting the object as an instance of 'Mime Mapping'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseFilterMapping(FilterMapping object) {
>+	public T caseMimeMapping(MimeMapping object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Form Login Config'.
>+	 * Returns the result of interpreting the object as an instance of 'Multipart Config Type'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Form Login Config'.
>+	 * @return the result of interpreting the object as an instance of 'Multipart Config Type'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseFormLoginConfig(FormLoginConfig object) {
>+	public T caseMultipartConfigType(MultipartConfigType object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Locale Encoding Mapping'.
>+	 * Returns the result of interpreting the object as an instance of 'Ordering Ordering Type'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Locale Encoding Mapping'.
>+	 * @return the result of interpreting the object as an instance of 'Ordering Ordering Type'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseLocaleEncodingMapping(LocaleEncodingMapping object) {
>+	public T caseOrderingOrderingType(OrderingOrderingType object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Locale Encoding Mapping List'.
>+	 * Returns the result of interpreting the object as an instance of 'Ordering Others Type'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Locale Encoding Mapping List'.
>+	 * @return the result of interpreting the object as an instance of 'Ordering Others Type'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseLocaleEncodingMappingList(LocaleEncodingMappingList object) {
>+	public T caseOrderingOthersType(OrderingOthersType object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Login Config'.
>+	 * Returns the result of interpreting the object as an instance of 'Ordering Type'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Login Config'.
>+	 * @return the result of interpreting the object as an instance of 'Ordering Type'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseLoginConfig(LoginConfig object) {
>+	public T caseOrderingType(OrderingType object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Mime Mapping'.
>+	 * Returns the result of interpreting the object as an instance of 'Security Constraint'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Mime Mapping'.
>+	 * @return the result of interpreting the object as an instance of 'Security Constraint'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseMimeMapping(MimeMapping object) {
>+	public T caseSecurityConstraint(SecurityConstraint object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Security Constraint'.
>+	 * Returns the result of interpreting the object as an instance of 'Servlet'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Security Constraint'.
>+	 * @return the result of interpreting the object as an instance of 'Servlet'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseSecurityConstraint(SecurityConstraint object) {
>+	public T caseServlet(Servlet object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Servlet'.
>+	 * Returns the result of interpreting the object as an instance of 'Servlet Mapping'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Servlet'.
>+	 * @return the result of interpreting the object as an instance of 'Servlet Mapping'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseServlet(Servlet object) {
>+	public T caseServletMapping(ServletMapping object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Servlet Mapping'.
>+	 * Returns the result of interpreting the object as an instance of 'Session Config'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Servlet Mapping'.
>+	 * @return the result of interpreting the object as an instance of 'Session Config'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseServletMapping(ServletMapping object) {
>+	public T caseSessionConfig(SessionConfig object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Session Config'.
>+	 * Returns the result of interpreting the object as an instance of 'User Data Constraint'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Session Config'.
>+	 * @return the result of interpreting the object as an instance of 'User Data Constraint'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseSessionConfig(SessionConfig object) {
>+	public T caseUserDataConstraint(UserDataConstraint object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'User Data Constraint'.
>+	 * Returns the result of interpreting the object as an instance of 'App'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'User Data Constraint'.
>+	 * @return the result of interpreting the object as an instance of 'App'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseUserDataConstraint(UserDataConstraint object) {
>+	public T caseWebApp(WebApp object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'App'.
>+	 * Returns the result of interpreting the object as an instance of 'App Deployment Descriptor'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'App'.
>+	 * @return the result of interpreting the object as an instance of 'App Deployment Descriptor'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseWebApp(WebApp object) {
>+	public T caseWebAppDeploymentDescriptor(WebAppDeploymentDescriptor object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'App Deployment Descriptor'.
>+	 * Returns the result of interpreting the object as an instance of 'Fragment'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'App Deployment Descriptor'.
>+	 * @return the result of interpreting the object as an instance of 'Fragment'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseWebAppDeploymentDescriptor(WebAppDeploymentDescriptor object) {
>+	public T caseWebFragment(WebFragment object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Resource Collection'.
>+	 * Returns the result of interpreting the object as an instance of 'Resource Collection'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Resource Collection'.
>+	 * @return the result of interpreting the object as an instance of 'Resource Collection'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseWebResourceCollection(WebResourceCollection object) {
>+	public T caseWebResourceCollection(WebResourceCollection object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Welcome File List'.
>+	 * Returns the result of interpreting the object as an instance of 'Welcome File List'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Welcome File List'.
>+	 * @return the result of interpreting the object as an instance of 'Welcome File List'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseWelcomeFileList(WelcomeFileList object) {
>+	public T caseWelcomeFileList(WelcomeFileList object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'EObject'.
>+	 * Returns the result of interpreting the object as an instance of 'EObject'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch, but this is the last case anyway.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'EObject'.
>+	 * @return the result of interpreting the object as an instance of 'EObject'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
> 	 * @generated
> 	 */
>-	public Object defaultCase(EObject object) {
>+	public T defaultCase(EObject object) {
> 		return null;
> 	}
> 
>Index: jee-models/org/eclipse/jst/javaee/web/internal/util/WebAdapterFactory.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/util/WebAdapterFactory.java,v
>retrieving revision 1.3
>diff -u -r1.3 WebAdapterFactory.java
>--- jee-models/org/eclipse/jst/javaee/web/internal/util/WebAdapterFactory.java	9 Jun 2009 19:37:05 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/web/internal/util/WebAdapterFactory.java	14 Oct 2009 21:47:33 -0000
>@@ -70,87 +70,131 @@
> 	}
> 
> 	/**
>-	 * The switch the delegates to the <code>createXXX</code> methods.
>+	 * The switch that delegates to the <code>createXXX</code> methods.
> 	 * 
> 	 * 
> 	 * @generated
> 	 */
>-	protected WebSwitch modelSwitch =
>-		new WebSwitch() {
>+	protected WebSwitch<Adapter> modelSwitch =
>+		new WebSwitch<Adapter>() {
> 			@Override
>-			public Object caseAuthConstraint(AuthConstraint object) {
>+			public Adapter caseAbsoluteOrderingType(AbsoluteOrderingType object) {
>+				return createAbsoluteOrderingTypeAdapter();
>+			}
>+			@Override
>+			public Adapter caseAuthConstraint(AuthConstraint object) {
> 				return createAuthConstraintAdapter();
> 			}
> 			@Override
>-			public Object caseErrorPage(ErrorPage object) {
>+			public Adapter caseCookieCommentType(CookieCommentType object) {
>+				return createCookieCommentTypeAdapter();
>+			}
>+			@Override
>+			public Adapter caseCookieConfigType(CookieConfigType object) {
>+				return createCookieConfigTypeAdapter();
>+			}
>+			@Override
>+			public Adapter caseCookieDomainType(CookieDomainType object) {
>+				return createCookieDomainTypeAdapter();
>+			}
>+			@Override
>+			public Adapter caseCookieNameType(CookieNameType object) {
>+				return createCookieNameTypeAdapter();
>+			}
>+			@Override
>+			public Adapter caseCookiePathType(CookiePathType object) {
>+				return createCookiePathTypeAdapter();
>+			}
>+			@Override
>+			public Adapter caseErrorPage(ErrorPage object) {
> 				return createErrorPageAdapter();
> 			}
> 			@Override
>-			public Object caseFilter(Filter object) {
>+			public Adapter caseFilter(Filter object) {
> 				return createFilterAdapter();
> 			}
> 			@Override
>-			public Object caseFilterMapping(FilterMapping object) {
>+			public Adapter caseFilterMapping(FilterMapping object) {
> 				return createFilterMappingAdapter();
> 			}
> 			@Override
>-			public Object caseFormLoginConfig(FormLoginConfig object) {
>+			public Adapter caseFormLoginConfig(FormLoginConfig object) {
> 				return createFormLoginConfigAdapter();
> 			}
> 			@Override
>-			public Object caseLocaleEncodingMapping(LocaleEncodingMapping object) {
>+			public Adapter caseLocaleEncodingMapping(LocaleEncodingMapping object) {
> 				return createLocaleEncodingMappingAdapter();
> 			}
> 			@Override
>-			public Object caseLocaleEncodingMappingList(LocaleEncodingMappingList object) {
>+			public Adapter caseLocaleEncodingMappingList(LocaleEncodingMappingList object) {
> 				return createLocaleEncodingMappingListAdapter();
> 			}
> 			@Override
>-			public Object caseLoginConfig(LoginConfig object) {
>+			public Adapter caseLoginConfig(LoginConfig object) {
> 				return createLoginConfigAdapter();
> 			}
> 			@Override
>-			public Object caseMimeMapping(MimeMapping object) {
>+			public Adapter caseMimeMapping(MimeMapping object) {
> 				return createMimeMappingAdapter();
> 			}
> 			@Override
>-			public Object caseSecurityConstraint(SecurityConstraint object) {
>+			public Adapter caseMultipartConfigType(MultipartConfigType object) {
>+				return createMultipartConfigTypeAdapter();
>+			}
>+			@Override
>+			public Adapter caseOrderingOrderingType(OrderingOrderingType object) {
>+				return createOrderingOrderingTypeAdapter();
>+			}
>+			@Override
>+			public Adapter caseOrderingOthersType(OrderingOthersType object) {
>+				return createOrderingOthersTypeAdapter();
>+			}
>+			@Override
>+			public Adapter caseOrderingType(OrderingType object) {
>+				return createOrderingTypeAdapter();
>+			}
>+			@Override
>+			public Adapter caseSecurityConstraint(SecurityConstraint object) {
> 				return createSecurityConstraintAdapter();
> 			}
> 			@Override
>-			public Object caseServlet(Servlet object) {
>+			public Adapter caseServlet(Servlet object) {
> 				return createServletAdapter();
> 			}
> 			@Override
>-			public Object caseServletMapping(ServletMapping object) {
>+			public Adapter caseServletMapping(ServletMapping object) {
> 				return createServletMappingAdapter();
> 			}
> 			@Override
>-			public Object caseSessionConfig(SessionConfig object) {
>+			public Adapter caseSessionConfig(SessionConfig object) {
> 				return createSessionConfigAdapter();
> 			}
> 			@Override
>-			public Object caseUserDataConstraint(UserDataConstraint object) {
>+			public Adapter caseUserDataConstraint(UserDataConstraint object) {
> 				return createUserDataConstraintAdapter();
> 			}
> 			@Override
>-			public Object caseWebApp(WebApp object) {
>+			public Adapter caseWebApp(WebApp object) {
> 				return createWebAppAdapter();
> 			}
> 			@Override
>-			public Object caseWebAppDeploymentDescriptor(WebAppDeploymentDescriptor object) {
>+			public Adapter caseWebAppDeploymentDescriptor(WebAppDeploymentDescriptor object) {
> 				return createWebAppDeploymentDescriptorAdapter();
> 			}
> 			@Override
>-			public Object caseWebResourceCollection(WebResourceCollection object) {
>+			public Adapter caseWebFragment(WebFragment object) {
>+				return createWebFragmentAdapter();
>+			}
>+			@Override
>+			public Adapter caseWebResourceCollection(WebResourceCollection object) {
> 				return createWebResourceCollectionAdapter();
> 			}
> 			@Override
>-			public Object caseWelcomeFileList(WelcomeFileList object) {
>+			public Adapter caseWelcomeFileList(WelcomeFileList object) {
> 				return createWelcomeFileListAdapter();
> 			}
> 			@Override
>-			public Object defaultCase(EObject object) {
>+			public Adapter defaultCase(EObject object) {
> 				return createEObjectAdapter();
> 			}
> 		};
>@@ -165,11 +209,25 @@
> 	 */
> 	@Override
> 	public Adapter createAdapter(Notifier target) {
>-		return (Adapter)modelSwitch.doSwitch((EObject)target);
>+		return modelSwitch.doSwitch((EObject)target);
> 	}
> 
> 
> 	/**
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.web.AbsoluteOrderingType Absolute Ordering Type}'.
>+	 * 
>+	 * This default implementation returns null so that we can easily ignore cases;
>+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
>+	 * 
>+	 * @return the new adapter.
>+	 * @see org.eclipse.jst.javaee.web.AbsoluteOrderingType
>+	 * @generated
>+	 */
>+	public Adapter createAbsoluteOrderingTypeAdapter() {
>+		return null;
>+	}
>+
>+	/**
> 	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.web.AuthConstraint Auth Constraint}'.
> 	 * 
> 	 * This default implementation returns null so that we can easily ignore cases;
>@@ -184,6 +242,76 @@
> 	}
> 
> 	/**
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.web.CookieCommentType Cookie Comment Type}'.
>+	 * 
>+	 * This default implementation returns null so that we can easily ignore cases;
>+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
>+	 * 
>+	 * @return the new adapter.
>+	 * @see org.eclipse.jst.javaee.web.CookieCommentType
>+	 * @generated
>+	 */
>+	public Adapter createCookieCommentTypeAdapter() {
>+		return null;
>+	}
>+
>+	/**
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.web.CookieConfigType Cookie Config Type}'.
>+	 * 
>+	 * This default implementation returns null so that we can easily ignore cases;
>+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
>+	 * 
>+	 * @return the new adapter.
>+	 * @see org.eclipse.jst.javaee.web.CookieConfigType
>+	 * @generated
>+	 */
>+	public Adapter createCookieConfigTypeAdapter() {
>+		return null;
>+	}
>+
>+	/**
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.web.CookieDomainType Cookie Domain Type}'.
>+	 * 
>+	 * This default implementation returns null so that we can easily ignore cases;
>+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
>+	 * 
>+	 * @return the new adapter.
>+	 * @see org.eclipse.jst.javaee.web.CookieDomainType
>+	 * @generated
>+	 */
>+	public Adapter createCookieDomainTypeAdapter() {
>+		return null;
>+	}
>+
>+	/**
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.web.CookieNameType Cookie Name Type}'.
>+	 * 
>+	 * This default implementation returns null so that we can easily ignore cases;
>+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
>+	 * 
>+	 * @return the new adapter.
>+	 * @see org.eclipse.jst.javaee.web.CookieNameType
>+	 * @generated
>+	 */
>+	public Adapter createCookieNameTypeAdapter() {
>+		return null;
>+	}
>+
>+	/**
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.web.CookiePathType Cookie Path Type}'.
>+	 * 
>+	 * This default implementation returns null so that we can easily ignore cases;
>+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
>+	 * 
>+	 * @return the new adapter.
>+	 * @see org.eclipse.jst.javaee.web.CookiePathType
>+	 * @generated
>+	 */
>+	public Adapter createCookiePathTypeAdapter() {
>+		return null;
>+	}
>+
>+	/**
> 	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.web.ErrorPage Error Page}'.
> 	 * 
> 	 * This default implementation returns null so that we can easily ignore cases;
>@@ -296,6 +424,62 @@
> 	}
> 
> 	/**
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.web.MultipartConfigType Multipart Config Type}'.
>+	 * 
>+	 * This default implementation returns null so that we can easily ignore cases;
>+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
>+	 * 
>+	 * @return the new adapter.
>+	 * @see org.eclipse.jst.javaee.web.MultipartConfigType
>+	 * @generated
>+	 */
>+	public Adapter createMultipartConfigTypeAdapter() {
>+		return null;
>+	}
>+
>+	/**
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.web.OrderingOrderingType Ordering Ordering Type}'.
>+	 * 
>+	 * This default implementation returns null so that we can easily ignore cases;
>+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
>+	 * 
>+	 * @return the new adapter.
>+	 * @see org.eclipse.jst.javaee.web.OrderingOrderingType
>+	 * @generated
>+	 */
>+	public Adapter createOrderingOrderingTypeAdapter() {
>+		return null;
>+	}
>+
>+	/**
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.web.OrderingOthersType Ordering Others Type}'.
>+	 * 
>+	 * This default implementation returns null so that we can easily ignore cases;
>+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
>+	 * 
>+	 * @return the new adapter.
>+	 * @see org.eclipse.jst.javaee.web.OrderingOthersType
>+	 * @generated
>+	 */
>+	public Adapter createOrderingOthersTypeAdapter() {
>+		return null;
>+	}
>+
>+	/**
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.web.OrderingType Ordering Type}'.
>+	 * 
>+	 * This default implementation returns null so that we can easily ignore cases;
>+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
>+	 * 
>+	 * @return the new adapter.
>+	 * @see org.eclipse.jst.javaee.web.OrderingType
>+	 * @generated
>+	 */
>+	public Adapter createOrderingTypeAdapter() {
>+		return null;
>+	}
>+
>+	/**
> 	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.web.SecurityConstraint Security Constraint}'.
> 	 * 
> 	 * This default implementation returns null so that we can easily ignore cases;
>@@ -394,6 +578,20 @@
> 	}
> 
> 	/**
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.web.WebFragment Fragment}'.
>+	 * 
>+	 * This default implementation returns null so that we can easily ignore cases;
>+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
>+	 * 
>+	 * @return the new adapter.
>+	 * @see org.eclipse.jst.javaee.web.WebFragment
>+	 * @generated
>+	 */
>+	public Adapter createWebFragmentAdapter() {
>+		return null;
>+	}
>+
>+	/**
> 	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.web.WebResourceCollection Resource Collection}'.
> 	 * 
> 	 * This default implementation returns null so that we can easily ignore cases;
>Index: jee-models/org/eclipse/jst/javaee/web/internal/util/WebXMLProcessor.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/util/WebXMLProcessor.java,v
>retrieving revision 1.3
>diff -u -r1.3 WebXMLProcessor.java
>--- jee-models/org/eclipse/jst/javaee/web/internal/util/WebXMLProcessor.java	9 Jun 2009 19:37:05 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/web/internal/util/WebXMLProcessor.java	14 Oct 2009 21:47:33 -0000
>@@ -14,6 +14,7 @@
> 
> import org.eclipse.emf.ecore.EPackage;
> 
>+import org.eclipse.emf.ecore.resource.Resource;
> import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
> 
> import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
>@@ -43,7 +44,7 @@
> 	 * @generated
> 	 */
> 	@Override
>-	protected Map getRegistrations() {
>+	protected Map<String, Resource.Factory> getRegistrations() {
> 		if (registrations == null) {
> 			super.getRegistrations();
> 			registrations.put(XML_EXTENSION, new WebResourceFactoryImpl());
>Index: jee-models/org/eclipse/jst/javaee/web/internal/util/WebValidator.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/util/WebValidator.java,v
>retrieving revision 1.4
>diff -u -r1.4 WebValidator.java
>--- jee-models/org/eclipse/jst/javaee/web/internal/util/WebValidator.java	9 Jun 2009 22:38:39 -0000	1.4
>+++ jee-models/org/eclipse/jst/javaee/web/internal/util/WebValidator.java	14 Oct 2009 21:47:33 -0000
>@@ -12,13 +12,13 @@
> 
> import java.math.BigInteger;
> 
>-import java.util.List;
> import java.util.Map;
> 
> import org.eclipse.emf.common.util.BasicDiagnostic;
> import org.eclipse.emf.common.util.Diagnostic;
> import org.eclipse.emf.common.util.DiagnosticChain;
> 
>+import org.eclipse.emf.common.util.ResourceLocator;
> import org.eclipse.emf.ecore.EObject;
> import org.eclipse.emf.ecore.EPackage;
> 
>@@ -106,16 +106,28 @@
> 	}
> 
> 	/**
>-	 * Calls <code>validateXXX</code> for the corresonding classifier of the model.
>+	 * Calls <code>validateXXX</code> for the corresponding classifier of the model.
> 	 * 
> 	 * 
> 	 * @generated
> 	 */
> 	@Override
>-	protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map context) {
>+	protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		switch (classifierID) {
>+			case WebPackage.ABSOLUTE_ORDERING_TYPE:
>+				return validateAbsoluteOrderingType((AbsoluteOrderingType)value, diagnostics, context);
> 			case WebPackage.AUTH_CONSTRAINT:
> 				return validateAuthConstraint((AuthConstraint)value, diagnostics, context);
>+			case WebPackage.COOKIE_COMMENT_TYPE:
>+				return validateCookieCommentType((CookieCommentType)value, diagnostics, context);
>+			case WebPackage.COOKIE_CONFIG_TYPE:
>+				return validateCookieConfigType((CookieConfigType)value, diagnostics, context);
>+			case WebPackage.COOKIE_DOMAIN_TYPE:
>+				return validateCookieDomainType((CookieDomainType)value, diagnostics, context);
>+			case WebPackage.COOKIE_NAME_TYPE:
>+				return validateCookieNameType((CookieNameType)value, diagnostics, context);
>+			case WebPackage.COOKIE_PATH_TYPE:
>+				return validateCookiePathType((CookiePathType)value, diagnostics, context);
> 			case WebPackage.ERROR_PAGE:
> 				return validateErrorPage((ErrorPage)value, diagnostics, context);
> 			case WebPackage.FILTER:
>@@ -132,6 +144,14 @@
> 				return validateLoginConfig((LoginConfig)value, diagnostics, context);
> 			case WebPackage.MIME_MAPPING:
> 				return validateMimeMapping((MimeMapping)value, diagnostics, context);
>+			case WebPackage.MULTIPART_CONFIG_TYPE:
>+				return validateMultipartConfigType((MultipartConfigType)value, diagnostics, context);
>+			case WebPackage.ORDERING_ORDERING_TYPE:
>+				return validateOrderingOrderingType((OrderingOrderingType)value, diagnostics, context);
>+			case WebPackage.ORDERING_OTHERS_TYPE:
>+				return validateOrderingOthersType((OrderingOthersType)value, diagnostics, context);
>+			case WebPackage.ORDERING_TYPE:
>+				return validateOrderingType((OrderingType)value, diagnostics, context);
> 			case WebPackage.SECURITY_CONSTRAINT:
> 				return validateSecurityConstraint((SecurityConstraint)value, diagnostics, context);
> 			case WebPackage.SERVLET:
>@@ -146,6 +166,8 @@
> 				return validateWebApp((WebApp)value, diagnostics, context);
> 			case WebPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR:
> 				return validateWebAppDeploymentDescriptor((WebAppDeploymentDescriptor)value, diagnostics, context);
>+			case WebPackage.WEB_FRAGMENT:
>+				return validateWebFragment((WebFragment)value, diagnostics, context);
> 			case WebPackage.WEB_RESOURCE_COLLECTION:
> 				return validateWebResourceCollection((WebResourceCollection)value, diagnostics, context);
> 			case WebPackage.WELCOME_FILE_LIST:
>@@ -154,6 +176,8 @@
> 				return validateDispatcherType((DispatcherType)value, diagnostics, context);
> 			case WebPackage.NULL_CHAR_TYPE:
> 				return validateNullCharType((NullCharType)value, diagnostics, context);
>+			case WebPackage.TRACKING_MODE_TYPE:
>+				return validateTrackingModeType((TrackingModeType)value, diagnostics, context);
> 			case WebPackage.TRANSPORT_GUARANTEE_TYPE:
> 				return validateTransportGuaranteeType((TransportGuaranteeType)value, diagnostics, context);
> 			case WebPackage.WEB_APP_VERSION_TYPE:
>@@ -182,13 +206,15 @@
> 				return validateNullCharTypeObject((NullCharType)value, diagnostics, context);
> 			case WebPackage.SERVLET_NAME_TYPE:
> 				return validateServletNameType((String)value, diagnostics, context);
>+			case WebPackage.TRACKING_MODE_TYPE_OBJECT:
>+				return validateTrackingModeTypeObject((TrackingModeType)value, diagnostics, context);
> 			case WebPackage.TRANSPORT_GUARANTEE_TYPE_OBJECT:
> 				return validateTransportGuaranteeTypeObject((TransportGuaranteeType)value, diagnostics, context);
> 			case WebPackage.WAR_PATH_TYPE:
> 				return validateWarPathType((String)value, diagnostics, context);
> 			case WebPackage.WEB_APP_VERSION_TYPE_OBJECT:
> 				return validateWebAppVersionTypeObject((WebAppVersionType)value, diagnostics, context);
>-			default: 
>+			default:
> 				return true;
> 		}
> 	}
>@@ -198,7 +224,16 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateAuthConstraint(AuthConstraint authConstraint, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateAbsoluteOrderingType(AbsoluteOrderingType absoluteOrderingType, DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return validate_EveryDefaultConstraint((EObject)absoluteOrderingType, diagnostics, context);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateAuthConstraint(AuthConstraint authConstraint, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)authConstraint, diagnostics, context);
> 	}
> 
>@@ -207,7 +242,52 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateErrorPage(ErrorPage errorPage, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateCookieCommentType(CookieCommentType cookieCommentType, DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return validate_EveryDefaultConstraint((EObject)cookieCommentType, diagnostics, context);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateCookieConfigType(CookieConfigType cookieConfigType, DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return validate_EveryDefaultConstraint((EObject)cookieConfigType, diagnostics, context);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateCookieDomainType(CookieDomainType cookieDomainType, DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return validate_EveryDefaultConstraint((EObject)cookieDomainType, diagnostics, context);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateCookieNameType(CookieNameType cookieNameType, DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return validate_EveryDefaultConstraint((EObject)cookieNameType, diagnostics, context);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateCookiePathType(CookiePathType cookiePathType, DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return validate_EveryDefaultConstraint((EObject)cookiePathType, diagnostics, context);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateErrorPage(ErrorPage errorPage, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)errorPage, diagnostics, context);
> 	}
> 
>@@ -216,7 +296,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateFilter(Filter filter, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateFilter(Filter filter, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)filter, diagnostics, context);
> 	}
> 
>@@ -225,7 +305,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateFilterMapping(FilterMapping filterMapping, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateFilterMapping(FilterMapping filterMapping, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)filterMapping, diagnostics, context);
> 	}
> 
>@@ -234,7 +314,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateFormLoginConfig(FormLoginConfig formLoginConfig, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateFormLoginConfig(FormLoginConfig formLoginConfig, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)formLoginConfig, diagnostics, context);
> 	}
> 
>@@ -243,7 +323,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateLocaleEncodingMapping(LocaleEncodingMapping localeEncodingMapping, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateLocaleEncodingMapping(LocaleEncodingMapping localeEncodingMapping, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)localeEncodingMapping, diagnostics, context);
> 	}
> 
>@@ -252,7 +332,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateLocaleEncodingMappingList(LocaleEncodingMappingList localeEncodingMappingList, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateLocaleEncodingMappingList(LocaleEncodingMappingList localeEncodingMappingList, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)localeEncodingMappingList, diagnostics, context);
> 	}
> 
>@@ -261,7 +341,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateLoginConfig(LoginConfig loginConfig, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateLoginConfig(LoginConfig loginConfig, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)loginConfig, diagnostics, context);
> 	}
> 
>@@ -270,7 +350,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateMimeMapping(MimeMapping mimeMapping, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateMimeMapping(MimeMapping mimeMapping, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)mimeMapping, diagnostics, context);
> 	}
> 
>@@ -279,7 +359,43 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateSecurityConstraint(SecurityConstraint securityConstraint, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateMultipartConfigType(MultipartConfigType multipartConfigType, DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return validate_EveryDefaultConstraint((EObject)multipartConfigType, diagnostics, context);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateOrderingOrderingType(OrderingOrderingType orderingOrderingType, DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return validate_EveryDefaultConstraint((EObject)orderingOrderingType, diagnostics, context);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateOrderingOthersType(OrderingOthersType orderingOthersType, DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return validate_EveryDefaultConstraint((EObject)orderingOthersType, diagnostics, context);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateOrderingType(OrderingType orderingType, DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return validate_EveryDefaultConstraint((EObject)orderingType, diagnostics, context);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateSecurityConstraint(SecurityConstraint securityConstraint, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)securityConstraint, diagnostics, context);
> 	}
> 
>@@ -288,7 +404,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateServlet(Servlet servlet, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateServlet(Servlet servlet, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)servlet, diagnostics, context);
> 	}
> 
>@@ -297,7 +413,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateServletMapping(ServletMapping servletMapping, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateServletMapping(ServletMapping servletMapping, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)servletMapping, diagnostics, context);
> 	}
> 
>@@ -306,7 +422,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateSessionConfig(SessionConfig sessionConfig, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateSessionConfig(SessionConfig sessionConfig, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)sessionConfig, diagnostics, context);
> 	}
> 
>@@ -315,7 +431,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateUserDataConstraint(UserDataConstraint userDataConstraint, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateUserDataConstraint(UserDataConstraint userDataConstraint, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)userDataConstraint, diagnostics, context);
> 	}
> 
>@@ -324,7 +440,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateWebApp(WebApp webApp, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateWebApp(WebApp webApp, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)webApp, diagnostics, context);
> 	}
> 
>@@ -333,7 +449,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateWebAppDeploymentDescriptor(WebAppDeploymentDescriptor webAppDeploymentDescriptor, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateWebAppDeploymentDescriptor(WebAppDeploymentDescriptor webAppDeploymentDescriptor, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)webAppDeploymentDescriptor, diagnostics, context);
> 	}
> 
>@@ -342,7 +458,16 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateWebResourceCollection(WebResourceCollection webResourceCollection, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateWebFragment(WebFragment webFragment, DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return validate_EveryDefaultConstraint((EObject)webFragment, diagnostics, context);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateWebResourceCollection(WebResourceCollection webResourceCollection, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)webResourceCollection, diagnostics, context);
> 	}
> 
>@@ -351,7 +476,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateWelcomeFileList(WelcomeFileList welcomeFileList, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateWelcomeFileList(WelcomeFileList welcomeFileList, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)welcomeFileList, diagnostics, context);
> 	}
> 
>@@ -360,7 +485,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateDispatcherType(DispatcherType dispatcherType, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateDispatcherType(DispatcherType dispatcherType, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return true;
> 	}
> 
>@@ -369,7 +494,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateNullCharType(NullCharType nullCharType, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateNullCharType(NullCharType nullCharType, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return true;
> 	}
> 
>@@ -378,7 +503,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateTransportGuaranteeType(TransportGuaranteeType transportGuaranteeType, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateTrackingModeType(TrackingModeType trackingModeType, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return true;
> 	}
> 
>@@ -387,7 +512,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateWebAppVersionType(WebAppVersionType webAppVersionType, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateTransportGuaranteeType(TransportGuaranteeType transportGuaranteeType, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return true;
> 	}
> 
>@@ -396,7 +521,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateAuthMethodType(String authMethodType, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateWebAppVersionType(WebAppVersionType webAppVersionType, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return true;
> 	}
> 
>@@ -405,7 +530,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateDispatcherTypeObject(DispatcherType dispatcherTypeObject, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateAuthMethodType(String authMethodType, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return true;
> 	}
> 
>@@ -414,7 +539,16 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateEncodingType(String encodingType, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateDispatcherTypeObject(DispatcherType dispatcherTypeObject, DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return true;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateEncodingType(String encodingType, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		boolean result = validateEncodingType_Pattern(encodingType, diagnostics, context);
> 		return result;
> 	}
>@@ -438,7 +572,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateEncodingType_Pattern(String encodingType, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateEncodingType_Pattern(String encodingType, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validatePattern(WebPackage.Literals.ENCODING_TYPE, encodingType, ENCODING_TYPE__PATTERN__VALUES, diagnostics, context);
> 	}
> 
>@@ -447,7 +581,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateErrorCodeType(BigInteger errorCodeType, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateErrorCodeType(BigInteger errorCodeType, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		boolean result = xmlTypeValidator.validatePositiveInteger_Min(errorCodeType, diagnostics, context);
> 		if (result || diagnostics != null) result &= validateErrorCodeType_Pattern(errorCodeType, diagnostics, context);
> 		return result;
>@@ -472,7 +606,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateErrorCodeType_Pattern(BigInteger errorCodeType, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateErrorCodeType_Pattern(BigInteger errorCodeType, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validatePattern(WebPackage.Literals.ERROR_CODE_TYPE, errorCodeType, ERROR_CODE_TYPE__PATTERN__VALUES, diagnostics, context);
> 	}
> 
>@@ -481,7 +615,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateFilterNameType(String filterNameType, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateFilterNameType(String filterNameType, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		boolean result = validateNonEmptyStringType_MinLength(filterNameType, diagnostics, context);
> 		return result;
> 	}
>@@ -491,7 +625,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateHttpMethodType(String httpMethodType, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateHttpMethodType(String httpMethodType, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		boolean result = validateHttpMethodType_Pattern(httpMethodType, diagnostics, context);
> 		return result;
> 	}
>@@ -505,7 +639,7 @@
> 	public static final PatternMatcher [][] HTTP_METHOD_TYPE__PATTERN__VALUES =
> 		new PatternMatcher [][] {
> 			new PatternMatcher [] {
>-				XMLTypeUtil.createPatternMatcher("[\\p{L}-[\\p{Cc}\\p{Z}]]+") //$NON-NLS-1$
>+				XMLTypeUtil.createPatternMatcher("[!-~-[\$\$<>@,;:\"/\\[\\]?=\\{\\}\\\\\\p{Z}]]+") //$NON-NLS-1$
> 			}
> 		};
> 
>@@ -515,7 +649,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateHttpMethodType_Pattern(String httpMethodType, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateHttpMethodType_Pattern(String httpMethodType, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validatePattern(WebPackage.Literals.HTTP_METHOD_TYPE, httpMethodType, HTTP_METHOD_TYPE__PATTERN__VALUES, diagnostics, context);
> 	}
> 
>@@ -524,7 +658,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateLoadOnStartupType(Object loadOnStartupType, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateLoadOnStartupType(Object loadOnStartupType, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		boolean result = validateLoadOnStartupType_MemberTypes(loadOnStartupType, diagnostics, context);
> 		return result;
> 	}
>@@ -535,7 +669,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateLoadOnStartupType_MemberTypes(Object loadOnStartupType, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateLoadOnStartupType_MemberTypes(Object loadOnStartupType, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		if (diagnostics != null) {
> 			BasicDiagnostic tempDiagnostics = new BasicDiagnostic();
> 			if (WebPackage.Literals.NULL_CHAR_TYPE.isInstance(loadOnStartupType)) {
>@@ -544,9 +678,8 @@
> 			if (XMLTypePackage.Literals.INTEGER.isInstance(loadOnStartupType)) {
> 				if (xmlTypeValidator.validateInteger((BigInteger)loadOnStartupType, tempDiagnostics, context)) return true;
> 			}
>-			List children = tempDiagnostics.getChildren();
>-			for (int i = 0; i < children.size(); i++) {
>-				diagnostics.add((Diagnostic)children.get(i));
>+			for (Diagnostic diagnostic : tempDiagnostics.getChildren()) {
>+				diagnostics.add(diagnostic);
> 			}
> 		}
> 		else {
>@@ -565,7 +698,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateLocaleType(String localeType, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateLocaleType(String localeType, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		boolean result = validateLocaleType_Pattern(localeType, diagnostics, context);
> 		return result;
> 	}
>@@ -589,7 +722,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateLocaleType_Pattern(String localeType, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateLocaleType_Pattern(String localeType, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validatePattern(WebPackage.Literals.LOCALE_TYPE, localeType, LOCALE_TYPE__PATTERN__VALUES, diagnostics, context);
> 	}
> 
>@@ -598,7 +731,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateMimeTypeType(String mimeTypeType, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateMimeTypeType(String mimeTypeType, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		boolean result = validateMimeTypeType_Pattern(mimeTypeType, diagnostics, context);
> 		return result;
> 	}
>@@ -622,7 +755,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateMimeTypeType_Pattern(String mimeTypeType, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateMimeTypeType_Pattern(String mimeTypeType, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validatePattern(WebPackage.Literals.MIME_TYPE_TYPE, mimeTypeType, MIME_TYPE_TYPE__PATTERN__VALUES, diagnostics, context);
> 	}
> 
>@@ -631,7 +764,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateNonEmptyStringType(String nonEmptyStringType, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateNonEmptyStringType(String nonEmptyStringType, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		boolean result = validateNonEmptyStringType_MinLength(nonEmptyStringType, diagnostics, context);
> 		return result;
> 	}
>@@ -642,10 +775,10 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateNonEmptyStringType_MinLength(String nonEmptyStringType, DiagnosticChain diagnostics, Map context) {
>-		int length = nonEmptyStringType.length(); 
>+	public boolean validateNonEmptyStringType_MinLength(String nonEmptyStringType, DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		int length = nonEmptyStringType.length();
> 		boolean result = length >= 1;
>-		if (!result && diagnostics != null) 
>+		if (!result && diagnostics != null)
> 			reportMinLengthViolation(WebPackage.Literals.NON_EMPTY_STRING_TYPE, nonEmptyStringType, length, 1, diagnostics, context);
> 		return result;
> 	}
>@@ -655,7 +788,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateNullCharTypeObject(NullCharType nullCharTypeObject, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateNullCharTypeObject(NullCharType nullCharTypeObject, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return true;
> 	}
> 
>@@ -664,7 +797,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateServletNameType(String servletNameType, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateServletNameType(String servletNameType, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		boolean result = validateNonEmptyStringType_MinLength(servletNameType, diagnostics, context);
> 		return result;
> 	}
>@@ -674,7 +807,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateTransportGuaranteeTypeObject(TransportGuaranteeType transportGuaranteeTypeObject, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateTrackingModeTypeObject(TrackingModeType trackingModeTypeObject, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return true;
> 	}
> 
>@@ -683,7 +816,16 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateWarPathType(String warPathType, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateTransportGuaranteeTypeObject(TransportGuaranteeType transportGuaranteeTypeObject, DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return true;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateWarPathType(String warPathType, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		boolean result = validateWarPathType_Pattern(warPathType, diagnostics, context);
> 		return result;
> 	}
>@@ -707,7 +849,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateWarPathType_Pattern(String warPathType, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateWarPathType_Pattern(String warPathType, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validatePattern(WebPackage.Literals.WAR_PATH_TYPE, warPathType, WAR_PATH_TYPE__PATTERN__VALUES, diagnostics, context);
> 	}
> 
>@@ -716,8 +858,22 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateWebAppVersionTypeObject(WebAppVersionType webAppVersionTypeObject, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateWebAppVersionTypeObject(WebAppVersionType webAppVersionTypeObject, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return true;
> 	}
> 
>+	/**
>+	 * Returns the resource locator that will be used to fetch messages for this validator's diagnostics.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public ResourceLocator getResourceLocator() {
>+		// TODO
>+		// Specialize this to return a resource locator for messages specific to this validator.
>+		// Ensure that you remove @generated or mark it @generated NOT
>+		return super.getResourceLocator();
>+	}
>+
> } //WebValidator
>Index: jee-models/org/eclipse/jst/javaee/web/LoginConfig.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/LoginConfig.java,v
>retrieving revision 1.2
>diff -u -r1.2 LoginConfig.java
>--- jee-models/org/eclipse/jst/javaee/web/LoginConfig.java	26 Jul 2007 16:56:11 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/web/LoginConfig.java	14 Oct 2009 21:47:32 -0000
>@@ -20,13 +20,14 @@
> * 
> * 
> * 
>- * 	The login-configType is used to configure the authentication
>- * 	method that should be used, the realm name that should be
>- * 	used for this application, and the attributes that are
>- * 	needed by the form login mechanism.
>- * 
>- * 	Used in: web-app
>- * 
>+ * The login-configType is used to configure the authentication
>+ * method that should be used, the realm name that should be
>+ * used for this application, and the attributes that are
>+ * needed by the form login mechanism.
>+ * 
>+ * Used in: web-app
>+ * 
>+ * @since Java EE 5, Web 2.5
> * 
> * 
> *
>@@ -77,10 +78,11 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The realm name element specifies the realm name to
>-	 * 	 use in HTTP Basic authorization.
>-	 * 
>-	 * 	 
>+	 * The realm name element specifies the realm name to
>+	 * use in HTTP Basic authorization.
>+	 * 
>+	 * @since Java EE 5, Web 2.5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Realm Name' attribute.
> 	 * @see #setRealmName(String)
>Index: jee-models/org/eclipse/jst/javaee/web/UserDataConstraint.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/UserDataConstraint.java,v
>retrieving revision 1.2
>diff -u -r1.2 UserDataConstraint.java
>--- jee-models/org/eclipse/jst/javaee/web/UserDataConstraint.java	26 Jul 2007 16:56:11 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/web/UserDataConstraint.java	14 Oct 2009 21:47:32 -0000
>@@ -12,6 +12,7 @@
> 
> import java.util.List;
> 
>+import org.eclipse.jst.javaee.core.Description;
> import org.eclipse.jst.javaee.core.JavaEEObject;
> 
> /**
>@@ -22,12 +23,13 @@
> * 
> * 
> * 
>- * 	The user-data-constraintType is used to indicate how
>- * 	data communicated between the client and container should be
>- * 	protected.
>- * 
>- * 	Used in: security-constraint
>- * 
>+ * The user-data-constraintType is used to indicate how
>+ * data communicated between the client and container should be
>+ * protected.
>+ * 
>+ * Used in: security-constraint
>+ * 
>+ * @since Java EE 5, Web 2.5
> * 
> * 
> *
>@@ -58,11 +60,10 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getUserDataConstraint_Descriptions()
> 	 * @generated
> 	 */
>-	List getDescriptions();
>+	List<Description> getDescriptions();
> 
> 	/**
> 	 * Returns the value of the 'Transport Guarantee' attribute.
>-	 * The default value is <code>"NONE"</code>.
> 	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.web.TransportGuaranteeType}.
> 	 * 
> 	 * 
>Index: jee-models/org/eclipse/jst/javaee/web/MimeMapping.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/MimeMapping.java,v
>retrieving revision 1.2
>diff -u -r1.2 MimeMapping.java
>--- jee-models/org/eclipse/jst/javaee/web/MimeMapping.java	26 Jul 2007 16:56:11 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/web/MimeMapping.java	14 Oct 2009 21:47:32 -0000
>@@ -20,11 +20,12 @@
> * 
> * 
> * 
>- * 	The mime-mappingType defines a mapping between an extension
>- * 	and a mime type.
>- * 
>- * 	Used in: web-app
>- * 
>+ * The mime-mappingType defines a mapping between an extension
>+ * and a mime type.
>+ * 
>+ * Used in: web-app
>+ * 
>+ * @since Java EE 5, Web 2.5
> * 
> * 
> *
>Index: jee-models/org/eclipse/jst/javaee/web/TransportGuaranteeType.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/TransportGuaranteeType.java,v
>retrieving revision 1.2
>diff -u -r1.2 TransportGuaranteeType.java
>--- jee-models/org/eclipse/jst/javaee/web/TransportGuaranteeType.java	26 Jul 2007 16:56:11 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/web/TransportGuaranteeType.java	14 Oct 2009 21:47:32 -0000
>@@ -14,7 +14,7 @@
> import java.util.Collections;
> import java.util.List;
> 
>-import org.eclipse.emf.common.util.AbstractEnumerator;
>+import org.eclipse.emf.common.util.Enumerator;
> 
> /**
> * 
>@@ -24,27 +24,56 @@
> * 
> * 
> * 
>- * 	The transport-guaranteeType specifies that the communication
>- * 	between client and server should be NONE, INTEGRAL, or
>- * 	CONFIDENTIAL. NONE means that the application does not
>- * 	require any transport guarantees. A value of INTEGRAL means
>- * 	that the application requires that the data sent between the
>- * 	client and server be sent in such a way that it can't be
>- * 	changed in transit. CONFIDENTIAL means that the application
>- * 	requires that the data be transmitted in a fashion that
>- * 	prevents other entities from observing the contents of the
>- * 	transmission. In most cases, the presence of the INTEGRAL or
>- * 	CONFIDENTIAL flag will indicate that the use of SSL is
>- * 	required.
>- * 
>- * 	Used in: user-data-constraint
>- * 
>+ * The transport-guaranteeType specifies that the communication
>+ * between client and server should be NONE, INTEGRAL, or
>+ * CONFIDENTIAL. NONE means that the application does not
>+ * require any transport guarantees. A value of INTEGRAL means
>+ * that the application requires that the data sent between the
>+ * client and server be sent in such a way that it can't be
>+ * changed in transit. CONFIDENTIAL means that the application
>+ * requires that the data be transmitted in a fashion that
>+ * prevents other entities from observing the contents of the
>+ * transmission. In most cases, the presence of the INTEGRAL or
>+ * CONFIDENTIAL flag will indicate that the use of SSL is
>+ * required.
>+ * 
>+ * Used in: user-data-constraint
>+ * 
>+ * @since Java EE 5, Web 2.5
> * 
> * 
> * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getTransportGuaranteeType()
> * @generated
> */
>-public final class TransportGuaranteeType extends AbstractEnumerator {
>+public enum TransportGuaranteeType implements Enumerator
>+{
>+	/**
>+	 * The 'NONE' literal object.
>+	 * 
>+	 * 
>+	 * @see #NONE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	NONE_LITERAL(0, "NONE", "NONE"), //$NON-NLS-1$ //$NON-NLS-2$
>+	/**
>+	 * The 'INTEGRAL' literal object.
>+	 * 
>+	 * 
>+	 * @see #INTEGRAL
>+	 * @generated
>+	 * @ordered
>+	 */
>+	INTEGRAL_LITERAL(1, "INTEGRAL", "INTEGRAL"), //$NON-NLS-1$ //$NON-NLS-2$
>+	/**
>+	 * The 'CONFIDENTIAL' literal object.
>+	 * 
>+	 * 
>+	 * @see #CONFIDENTIAL
>+	 * @generated
>+	 * @ordered
>+	 */
>+	CONFIDENTIAL_LITERAL(2, "CONFIDENTIAL", "CONFIDENTIAL"); //$NON-NLS-1$ //$NON-NLS-2$
> 	/**
> 	 * The 'NONE' literal value.
> 	 * 
>@@ -88,36 +117,6 @@
> 	public static final int CONFIDENTIAL = 2;
> 
> 	/**
>-	 * The 'NONE' literal object.
>-	 * 
>-	 * 
>-	 * @see #NONE
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final TransportGuaranteeType NONE_LITERAL = new TransportGuaranteeType(NONE, "NONE", "NONE"); //$NON-NLS-1$ //$NON-NLS-2$
>-
>-	/**
>-	 * The 'INTEGRAL' literal object.
>-	 * 
>-	 * 
>-	 * @see #INTEGRAL
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final TransportGuaranteeType INTEGRAL_LITERAL = new TransportGuaranteeType(INTEGRAL, "INTEGRAL", "INTEGRAL"); //$NON-NLS-1$ //$NON-NLS-2$
>-
>-	/**
>-	 * The 'CONFIDENTIAL' literal object.
>-	 * 
>-	 * 
>-	 * @see #CONFIDENTIAL
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final TransportGuaranteeType CONFIDENTIAL_LITERAL = new TransportGuaranteeType(CONFIDENTIAL, "CONFIDENTIAL", "CONFIDENTIAL"); //$NON-NLS-1$ //$NON-NLS-2$
>-
>-	/**
> 	 * An array of all the 'Transport Guarantee Type' enumerators.
> 	 * 
> 	 * 
>@@ -136,7 +135,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
>+	public static final List<TransportGuaranteeType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
> 
> 	/**
> 	 * Returns the 'Transport Guarantee Type' literal with the specified literal value.
>@@ -182,17 +181,77 @@
> 			case INTEGRAL: return INTEGRAL_LITERAL;
> 			case CONFIDENTIAL: return CONFIDENTIAL_LITERAL;
> 		}
>-		return null;	
>+		return null;
> 	}
> 
> 	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final int value;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final String name;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final String literal;
>+
>+	/**
> 	 * Only this class can construct instances.
> 	 * 
> 	 * 
> 	 * @generated
> 	 */
> 	private TransportGuaranteeType(int value, String name, String literal) {
>-		super(value, name, literal);
>+		this.value = value;
>+		this.name = name;
>+		this.literal = literal;
> 	}
> 
>-} //TransportGuaranteeType
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public int getValue() {
>+	 return value;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getName() {
>+	 return name;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getLiteral() {
>+	 return literal;
>+	}
>+
>+	/**
>+	 * Returns the literal value of the enumerator, which is its string representation.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		return literal;
>+	}
>+}
>Index: jee-models/org/eclipse/jst/javaee/web/DispatcherType.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/DispatcherType.java,v
>retrieving revision 1.2
>diff -u -r1.2 DispatcherType.java
>--- jee-models/org/eclipse/jst/javaee/web/DispatcherType.java	26 Jul 2007 16:56:11 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/web/DispatcherType.java	14 Oct 2009 21:47:32 -0000
>@@ -14,7 +14,7 @@
> import java.util.Collections;
> import java.util.List;
> 
>-import org.eclipse.emf.common.util.AbstractEnumerator;
>+import org.eclipse.emf.common.util.Enumerator;
> 
> /**
> * 
>@@ -24,118 +24,147 @@
> * 
> * 
> * 
>- * 	The dispatcher has four legal values: FORWARD, REQUEST, INCLUDE,
>- * 	and ERROR. A value of FORWARD means the Filter will be applied
>- * 	under RequestDispatcher.forward() calls. A value of REQUEST
>- * 	means the Filter will be applied under ordinary client calls to
>- * 	the path or servlet. A value of INCLUDE means the Filter will be
>- * 	applied under RequestDispatcher.include() calls. A value of
>- * 	ERROR means the Filter will be applied under the error page
>- * 	mechanism. The absence of any dispatcher elements in a
>- * 	filter-mapping indicates a default of applying filters only under
>- * 	ordinary client calls to the path or servlet.
>- * 
>+ * The dispatcher has five legal values: FORWARD, REQUEST,
>+ * INCLUDE, ASYNC, and ERROR.
>+ * 
>+ * A value of FORWARD means the Filter will be applied under
>+ * RequestDispatcher.forward() calls.
>+ * A value of REQUEST means the Filter will be applied under
>+ * ordinary client calls to the path or servlet.
>+ * A value of INCLUDE means the Filter will be applied under
>+ * RequestDispatcher.include() calls.
>+ * A value of ASYNC means the Filter will be applied under
>+ * calls dispatched from an AsyncContext.
>+ * A value of ERROR means the Filter will be applied under the
>+ * error page mechanism.
>+ * 
>+ * The absence of any dispatcher elements in a filter-mapping
>+ * indicates a default of applying filters only under ordinary
>+ * client calls to the path or servlet.
>+ * 
>+ * @since Java EE 5, Web 2.5
> * 
> * 
> * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getDispatcherType()
> * @generated
> */
>-public final class DispatcherType extends AbstractEnumerator {
>+public enum DispatcherType implements Enumerator
>+{
> 	/**
>-	 * The 'FORWARD' literal value.
>+	 * The 'FORWARD' literal object.
> 	 * 
>-	 * 
>-	 * If the meaning of 'FORWARD' literal object isn't clear,
>-	 * there really should be more of a description here...
>-	 * 
> 	 * 
>-	 * @see #FORWARD_LITERAL
>+	 * @see #FORWARD
> 	 * @generated
> 	 * @ordered
> 	 */
>-	public static final int FORWARD = 0;
>-
>+	FORWARD_LITERAL(0, "FORWARD", "FORWARD"), //$NON-NLS-1$ //$NON-NLS-2$
> 	/**
>-	 * The 'INCLUDE' literal value.
>+	 * The 'INCLUDE' literal object.
> 	 * 
>-	 * 
>-	 * If the meaning of 'INCLUDE' literal object isn't clear,
>-	 * there really should be more of a description here...
>-	 * 
> 	 * 
>-	 * @see #INCLUDE_LITERAL
>+	 * @see #INCLUDE
> 	 * @generated
> 	 * @ordered
> 	 */
>-	public static final int INCLUDE = 1;
>-
>+	INCLUDE_LITERAL(1, "INCLUDE", "INCLUDE"), //$NON-NLS-1$ //$NON-NLS-2$
> 	/**
>-	 * The 'REQUEST' literal value.
>+	 * The 'REQUEST' literal object.
> 	 * 
>-	 * 
>-	 * If the meaning of 'REQUEST' literal object isn't clear,
>-	 * there really should be more of a description here...
>-	 * 
> 	 * 
>-	 * @see #REQUEST_LITERAL
>+	 * @see #REQUEST
> 	 * @generated
> 	 * @ordered
> 	 */
>-	public static final int REQUEST = 2;
>-
>+	REQUEST_LITERAL(2, "REQUEST", "REQUEST"), //$NON-NLS-1$ //$NON-NLS-2$
> 	/**
>-	 * The 'ERROR' literal value.
>+	 * The 'ASYNC' literal object.
>+	 * 
>+	 * 
>+	 * @see #ASYNC
>+	 * @generated
>+	 * @ordered
>+	 */
>+	ASYNC_LITERAL(3, "ASYNC", "ASYNC"), //$NON-NLS-1$ //$NON-NLS-2$
>+	/**
>+	 * The 'ERROR' literal object.
>+	 * 
>+	 * 
>+	 * @see #ERROR
>+	 * @generated
>+	 * @ordered
>+	 */
>+	ERROR_LITERAL(4, "ERROR", "ERROR"); //$NON-NLS-1$ //$NON-NLS-2$
>+	/**
>+	 * The 'FORWARD' literal value.
> 	 * 
> 	 * 
>-	 * If the meaning of 'ERROR' literal object isn't clear,
>+	 * If the meaning of 'FORWARD' literal object isn't clear,
> 	 * there really should be more of a description here...
> 	 * 
> 	 * 
>-	 * @see #ERROR_LITERAL
>+	 * @see #FORWARD_LITERAL
> 	 * @generated
> 	 * @ordered
> 	 */
>-	public static final int ERROR = 3;
>+	public static final int FORWARD = 0;
> 
> 	/**
>-	 * The 'FORWARD' literal object.
>+	 * The 'INCLUDE' literal value.
> 	 * 
>+	 * 
>+	 * If the meaning of 'INCLUDE' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
> 	 * 
>-	 * @see #FORWARD
>+	 * @see #INCLUDE_LITERAL
> 	 * @generated
> 	 * @ordered
> 	 */
>-	public static final DispatcherType FORWARD_LITERAL = new DispatcherType(FORWARD, "FORWARD", "FORWARD"); //$NON-NLS-1$ //$NON-NLS-2$
>+	public static final int INCLUDE = 1;
> 
> 	/**
>-	 * The 'INCLUDE' literal object.
>+	 * The 'REQUEST' literal value.
> 	 * 
>+	 * 
>+	 * If the meaning of 'REQUEST' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
> 	 * 
>-	 * @see #INCLUDE
>+	 * @see #REQUEST_LITERAL
> 	 * @generated
> 	 * @ordered
> 	 */
>-	public static final DispatcherType INCLUDE_LITERAL = new DispatcherType(INCLUDE, "INCLUDE", "INCLUDE"); //$NON-NLS-1$ //$NON-NLS-2$
>+	public static final int REQUEST = 2;
> 
> 	/**
>-	 * The 'REQUEST' literal object.
>+	 * The 'ASYNC' literal value.
> 	 * 
> 	 * 
>-	 * @see #REQUEST
>+	 * 
>+	 * 
>+	 * @since Java EE 6, Web 3.0
>+	 * 
>+	 * 
>+	 * @see #ASYNC_LITERAL
> 	 * @generated
> 	 * @ordered
> 	 */
>-	public static final DispatcherType REQUEST_LITERAL = new DispatcherType(REQUEST, "REQUEST", "REQUEST"); //$NON-NLS-1$ //$NON-NLS-2$
>+	public static final int ASYNC = 3;
> 
> 	/**
>-	 * The 'ERROR' literal object.
>+	 * The 'ERROR' literal value.
> 	 * 
>+	 * 
>+	 * If the meaning of 'ERROR' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
> 	 * 
>-	 * @see #ERROR
>+	 * @see #ERROR_LITERAL
> 	 * @generated
> 	 * @ordered
> 	 */
>-	public static final DispatcherType ERROR_LITERAL = new DispatcherType(ERROR, "ERROR", "ERROR"); //$NON-NLS-1$ //$NON-NLS-2$
>+	public static final int ERROR = 4;
> 
> 	/**
> 	 * An array of all the 'Dispatcher Type' enumerators.
>@@ -148,6 +177,7 @@
> 			FORWARD_LITERAL,
> 			INCLUDE_LITERAL,
> 			REQUEST_LITERAL,
>+			ASYNC_LITERAL,
> 			ERROR_LITERAL,
> 		};
> 
>@@ -157,7 +187,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
>+	public static final List<DispatcherType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
> 
> 	/**
> 	 * Returns the 'Dispatcher Type' literal with the specified literal value.
>@@ -202,19 +232,80 @@
> 			case FORWARD: return FORWARD_LITERAL;
> 			case INCLUDE: return INCLUDE_LITERAL;
> 			case REQUEST: return REQUEST_LITERAL;
>+			case ASYNC: return ASYNC_LITERAL;
> 			case ERROR: return ERROR_LITERAL;
> 		}
>-		return null;	
>+		return null;
> 	}
> 
> 	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final int value;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final String name;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final String literal;
>+
>+	/**
> 	 * Only this class can construct instances.
> 	 * 
> 	 * 
> 	 * @generated
> 	 */
> 	private DispatcherType(int value, String name, String literal) {
>-		super(value, name, literal);
>+		this.value = value;
>+		this.name = name;
>+		this.literal = literal;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public int getValue() {
>+	 return value;
> 	}
> 
>-} //DispatcherType
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getName() {
>+	 return name;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getLiteral() {
>+	 return literal;
>+	}
>+
>+	/**
>+	 * Returns the literal value of the enumerator, which is its string representation.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		return literal;
>+	}
>+}
>Index: jee-models/org/eclipse/jst/javaee/web/LocaleEncodingMapping.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/LocaleEncodingMapping.java,v
>retrieving revision 1.2
>diff -u -r1.2 LocaleEncodingMapping.java
>--- jee-models/org/eclipse/jst/javaee/web/LocaleEncodingMapping.java	26 Jul 2007 16:56:11 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/web/LocaleEncodingMapping.java	14 Oct 2009 21:47:32 -0000
>@@ -20,11 +20,12 @@
> * 
> * 
> * 
>- * 	The locale-encoding-mapping contains locale name and
>- * 	encoding name. The locale name must be either "Language-code",
>- * 	such as "ja", defined by ISO-639 or "Language-code_Country-code",
>- * 	such as "ja_JP". "Country code" is defined by ISO-3166.
>- * 
>+ * The locale-encoding-mapping contains locale name and
>+ * encoding name. The locale name must be either "Language-code",
>+ * such as "ja", defined by ISO-639 or "Language-code_Country-code",
>+ * such as "ja_JP". "Country code" is defined by ISO-3166.
>+ * 
>+ * @since Java EE 5, Web 2.5
> * 
> * 
> *
>Index: jee-models/org/eclipse/jst/javaee/web/WebAppDeploymentDescriptor.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/WebAppDeploymentDescriptor.java,v
>retrieving revision 1.2
>diff -u -r1.2 WebAppDeploymentDescriptor.java
>--- jee-models/org/eclipse/jst/javaee/web/WebAppDeploymentDescriptor.java	26 Jul 2007 16:56:11 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/web/WebAppDeploymentDescriptor.java	14 Oct 2009 21:47:32 -0000
>@@ -65,7 +65,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebAppDeploymentDescriptor_XMLNSPrefixMap()
> 	 * @generated
> 	 */
>-	Map getXMLNSPrefixMap();
>+	Map<String, String> getXMLNSPrefixMap();
> 
> 	/**
> 	 * Returns the value of the 'XSI Schema Location' map.
>@@ -81,32 +81,12 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebAppDeploymentDescriptor_XSISchemaLocation()
> 	 * @generated
> 	 */
>-	Map getXSISchemaLocation();
>+	Map<String, String> getXSISchemaLocation();
> 
> 	/**
> 	 * Returns the value of the 'Web App' containment reference.
> 	 * 
> 	 * 
>-	 * 
>-	 * 
>-	 * 
>-	 * 	The web-app element is the root of the deployment
>-	 * 	descriptor for a web application. Note that the sub-elements
>-	 * 	of this element can be in the arbitrary order. Because of
>-	 * 	that, the multiplicity of the elements of distributable,
>-	 * 	session-config, welcome-file-list, jsp-config, login-config,
>-	 * 	and locale-encoding-mapping-list was changed from "?" to "*"
>-	 * 	in this schema. However, the deployment descriptor instance
>-	 * 	file must not contain multiple elements of session-config,
>-	 * 	jsp-config, and login-config. When there are multiple elements of
>-	 * 	welcome-file-list or locale-encoding-mapping-list, the container
>-	 * 	must concatenate the element contents. The multiple occurence
>-	 * 	of the element distributable is redundant and the container
>-	 * 	treats that case exactly in the same way when there is only
>-	 * 	one distributable.
>-	 * 
>-	 * 
>-	 * 
> 	 * @return the value of the 'Web App' containment reference.
> 	 * @see #setWebApp(WebApp)
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebAppDeploymentDescriptor_WebApp()
>Index: jee-models/org/eclipse/jst/javaee/web/ServletMapping.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/ServletMapping.java,v
>retrieving revision 1.2
>diff -u -r1.2 ServletMapping.java
>--- jee-models/org/eclipse/jst/javaee/web/ServletMapping.java	26 Jul 2007 16:56:11 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/web/ServletMapping.java	14 Oct 2009 21:47:32 -0000
>@@ -13,6 +13,7 @@
> import java.util.List;
> 
> import org.eclipse.jst.javaee.core.JavaEEObject;
>+import org.eclipse.jst.javaee.core.UrlPatternType;
> 
> /**
> * 
>@@ -22,11 +23,12 @@
> * 
> * 
> * 
>- * 	The servlet-mappingType defines a mapping between a
>- * 	servlet and a url pattern.
>- * 
>- * 	Used in: web-app
>- * 
>+ * The servlet-mappingType defines a mapping between a
>+ * servlet and a url pattern. 
>+ * 
>+ * Used in: web-app
>+ * 
>+ * @since Java EE 5, Web 2.5
> * 
> * 
> *
>@@ -82,7 +84,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getServletMapping_UrlPatterns()
> 	 * @generated
> 	 */
>-	List getUrlPatterns();
>+	List<UrlPatternType> getUrlPatterns();
> 
> 	/**
> 	 * Returns the value of the 'Id' attribute.
>Index: jee-models/org/eclipse/jst/javaee/web/SessionConfig.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/SessionConfig.java,v
>retrieving revision 1.2
>diff -u -r1.2 SessionConfig.java
>--- jee-models/org/eclipse/jst/javaee/web/SessionConfig.java	26 Jul 2007 16:56:11 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/web/SessionConfig.java	14 Oct 2009 21:47:32 -0000
>@@ -12,6 +12,7 @@
> 
> import java.math.BigInteger;
> 
>+import java.util.List;
> import org.eclipse.jst.javaee.core.JavaEEObject;
> 
> /**
>@@ -22,11 +23,12 @@
> * 
> * 
> * 
>- * 	The session-configType defines the session parameters
>- * 	for this web application.
>- * 
>- * 	Used in: web-app
>- * 
>+ * The session-configType defines the session parameters
>+ * for this web application.
>+ * 
>+ * Used in: web-app
>+ * 
>+ * @since Java EE 5, Web 2.5
> * 
> * 
> *
>@@ -34,6 +36,8 @@
> * The following features are supported:
> * <ul>
> * <li>{@link org.eclipse.jst.javaee.web.SessionConfig#getSessionTimeout Session Timeout}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.SessionConfig#getCookieConfig Cookie Config}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.SessionConfig#getTrackingMode Tracking Mode}</li>
> * <li>{@link org.eclipse.jst.javaee.web.SessionConfig#getId Id}</li>
> * </ul>
> * 
>@@ -50,16 +54,17 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The session-timeout element defines the default
>-	 * 	 session timeout interval for all sessions created
>-	 * 	 in this web application. The specified timeout
>-	 * 	 must be expressed in a whole number of minutes.
>-	 * 	 If the timeout is 0 or less, the container ensures
>-	 * 	 the default behaviour of sessions is never to time
>-	 * 	 out. If this element is not specified, the container
>-	 * 	 must set its default timeout period.
>-	 * 
>-	 * 	 
>+	 * The session-timeout element defines the default
>+	 * session timeout interval for all sessions created
>+	 * in this web application. The specified timeout
>+	 * must be expressed in a whole number of minutes.
>+	 * If the timeout is 0 or less, the container ensures
>+	 * the default behaviour of sessions is never to time
>+	 * out. If this element is not specified, the container
>+	 * must set its default timeout period.
>+	 * 
>+	 * @since Java EE 5, Web 2.5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Session Timeout' attribute.
> 	 * @see #setSessionTimeout(BigInteger)
>@@ -79,6 +84,58 @@
> 	void setSessionTimeout(BigInteger value);
> 
> 	/**
>+	 * Returns the value of the 'Cookie Config' containment reference.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * The cookie-config element defines the configuration of the
>+	 * session tracking cookies created by this web application.
>+	 * 
>+	 * @since Java EE 6, Web 3.0
>+	 * 
>+	 * 
>+	 * @return the value of the 'Cookie Config' containment reference.
>+	 * @see #setCookieConfig(CookieConfigType)
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getSessionConfig_CookieConfig()
>+	 * @generated
>+	 */
>+	CookieConfigType getCookieConfig();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.SessionConfig#getCookieConfig Cookie Config}' containment reference.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Cookie Config' containment reference.
>+	 * @see #getCookieConfig()
>+	 * @generated
>+	 */
>+	void setCookieConfig(CookieConfigType value);
>+
>+	/**
>+	 * Returns the value of the 'Tracking Mode' attribute list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.web.TrackingModeType}.
>+	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.web.TrackingModeType}.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * The tracking-mode element defines the tracking modes
>+	 * for sessions created by this web application
>+	 * 
>+	 * @since Java EE 6, Web 3.0
>+	 * 
>+	 * 
>+	 * @return the value of the 'Tracking Mode' attribute list.
>+	 * @see org.eclipse.jst.javaee.web.TrackingModeType
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getSessionConfig_TrackingMode()
>+	 * @generated
>+	 */
>+	List<TrackingModeType> getTrackingMode();
>+
>+	/**
> 	 * Returns the value of the 'Id' attribute.
> 	 * 
> 	 * 
>Index: jee-models/org/eclipse/jst/javaee/web/Filter.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/Filter.java,v
>retrieving revision 1.2
>diff -u -r1.2 Filter.java
>--- jee-models/org/eclipse/jst/javaee/web/Filter.java	26 Jul 2007 16:56:11 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/web/Filter.java	14 Oct 2009 21:47:32 -0000
>@@ -12,7 +12,11 @@
> 
> import java.util.List;
> 
>+import org.eclipse.jst.javaee.core.Description;
>+import org.eclipse.jst.javaee.core.DisplayName;
>+import org.eclipse.jst.javaee.core.Icon;
> import org.eclipse.jst.javaee.core.JavaEEObject;
>+import org.eclipse.jst.javaee.core.ParamValue;
> 
> /**
> * 
>@@ -22,15 +26,16 @@
> * 
> * 
> * 
>- * 	The filterType is used to declare a filter in the web
>- * 	application. The filter is mapped to either a servlet or a
>- * 	URL pattern in the filter-mapping element, using the
>- * 	filter-name value to reference. Filters can access the
>- * 	initialization parameters declared in the deployment
>- * 	descriptor at runtime via the FilterConfig interface.
>- * 
>- * 	Used in: web-app
>- * 
>+ * The filterType is used to declare a filter in the web
>+ * application. The filter is mapped to either a servlet or a
>+ * URL pattern in the filter-mapping element, using the
>+ * filter-name value to reference. Filters can access the
>+ * initialization parameters declared in the deployment
>+ * descriptor at runtime via the FilterConfig interface.
>+ * 
>+ * Used in: web-app
>+ * 
>+ * @since Java EE 5, Web 2.5
> * 
> * 
> *
>@@ -42,6 +47,7 @@
> * <li>{@link org.eclipse.jst.javaee.web.Filter#getIcons Icons}</li>
> * <li>{@link org.eclipse.jst.javaee.web.Filter#getFilterName Filter Name}</li>
> * <li>{@link org.eclipse.jst.javaee.web.Filter#getFilterClass Filter Class}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.Filter#isAsyncSupported Async Supported}</li>
> * <li>{@link org.eclipse.jst.javaee.web.Filter#getInitParams Init Params}</li>
> * <li>{@link org.eclipse.jst.javaee.web.Filter#getId Id}</li>
> * </ul>
>@@ -65,7 +71,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getFilter_Descriptions()
> 	 * @generated
> 	 */
>-	List getDescriptions();
>+	List<Description> getDescriptions();
> 
> 	/**
> 	 * Returns the value of the 'Display Names' containment reference list.
>@@ -80,7 +86,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getFilter_DisplayNames()
> 	 * @generated
> 	 */
>-	List getDisplayNames();
>+	List<DisplayName> getDisplayNames();
> 
> 	/**
> 	 * Returns the value of the 'Icons' containment reference list.
>@@ -95,7 +101,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getFilter_Icons()
> 	 * @generated
> 	 */
>-	List getIcons();
>+	List<Icon> getIcons();
> 
> 	/**
> 	 * Returns the value of the 'Filter Name' attribute.
>@@ -129,9 +135,10 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The fully qualified classname of the filter.
>-	 * 
>-	 * 	 
>+	 * The fully qualified classname of the filter.
>+	 * 
>+	 * @since Java EE 5, Web 2.5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Filter Class' attribute.
> 	 * @see #setFilterClass(String)
>@@ -151,6 +158,59 @@
> 	void setFilterClass(String value);
> 
> 	/**
>+	 * Returns the value of the 'Async Supported' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * @since Java EE 6, Web 3.0
>+	 * 
>+	 * 
>+	 * @return the value of the 'Async Supported' attribute.
>+	 * @see #isSetAsyncSupported()
>+	 * @see #unsetAsyncSupported()
>+	 * @see #setAsyncSupported(boolean)
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getFilter_AsyncSupported()
>+	 * @generated
>+	 */
>+	boolean isAsyncSupported();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.Filter#isAsyncSupported Async Supported}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Async Supported' attribute.
>+	 * @see #isSetAsyncSupported()
>+	 * @see #unsetAsyncSupported()
>+	 * @see #isAsyncSupported()
>+	 * @generated
>+	 */
>+	void setAsyncSupported(boolean value);
>+
>+	/**
>+	 * Unsets the value of the '{@link org.eclipse.jst.javaee.web.Filter#isAsyncSupported Async Supported}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isSetAsyncSupported()
>+	 * @see #isAsyncSupported()
>+	 * @see #setAsyncSupported(boolean)
>+	 * @generated
>+	 */
>+	void unsetAsyncSupported();
>+
>+	/**
>+	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.web.Filter#isAsyncSupported Async Supported}' attribute is set.
>+	 * 
>+	 * 
>+	 * @return whether the value of the 'Async Supported' attribute is set.
>+	 * @see #unsetAsyncSupported()
>+	 * @see #isAsyncSupported()
>+	 * @see #setAsyncSupported(boolean)
>+	 * @generated
>+	 */
>+	boolean isSetAsyncSupported();
>+
>+	/**
> 	 * Returns the value of the 'Init Params' containment reference list.
> 	 * The list contents are of type {@link org.eclipse.jst.javaee.core.ParamValue}.
> 	 * 
>@@ -158,16 +218,17 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The init-param element contains a name/value pair as
>-	 * 	 an initialization param of a servlet filter
>-	 * 
>-	 * 	 
>+	 * The init-param element contains a name/value pair as
>+	 * an initialization param of a servlet filter
>+	 * 
>+	 * @since Java EE 5, Web 2.5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Init Params' containment reference list.
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getFilter_InitParams()
> 	 * @generated
> 	 */
>-	List getInitParams();
>+	List<ParamValue> getInitParams();
> 
> 	/**
> 	 * Returns the value of the 'Id' attribute.
>Index: jee-models/org/eclipse/jst/javaee/web/WebResourceCollection.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/WebResourceCollection.java,v
>retrieving revision 1.2
>diff -u -r1.2 WebResourceCollection.java
>--- jee-models/org/eclipse/jst/javaee/web/WebResourceCollection.java	26 Jul 2007 16:56:11 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/web/WebResourceCollection.java	14 Oct 2009 21:47:32 -0000
>@@ -12,7 +12,9 @@
> 
> import java.util.List;
> 
>+import org.eclipse.jst.javaee.core.Description;
> import org.eclipse.jst.javaee.core.JavaEEObject;
>+import org.eclipse.jst.javaee.core.UrlPatternType;
> 
> /**
> * 
>@@ -22,14 +24,19 @@
> * 
> * 
> * 
>- * 	The web-resource-collectionType is used to identify a subset
>- * 	of the resources and HTTP methods on those resources within
>- * 	a web application to which a security constraint applies. If
>- * 	no HTTP methods are specified, then the security constraint
>- * 	applies to all HTTP methods.
>- * 
>- * 	Used in: security-constraint
>- * 
>+ * The web-resource-collectionType is used to identify the
>+ * resources and HTTP methods on those resources to which a
>+ * security constraint applies. If no HTTP methods are specified,
>+ * then the security constraint applies to all HTTP methods.
>+ * If HTTP methods are specified by http-method-omission
>+ * elements, the security constraint applies to all methods
>+ * except those identified in the collection.
>+ * http-method-omission and http-method elements are never
>+ * mixed in the same collection. 
>+ * 
>+ * Used in: security-constraint
>+ * 
>+ * @since Java EE 5, Web 2.5
> * 
> * 
> *
>@@ -40,6 +47,7 @@
> * <li>{@link org.eclipse.jst.javaee.web.WebResourceCollection#getDescriptions Descriptions}</li>
> * <li>{@link org.eclipse.jst.javaee.web.WebResourceCollection#getUrlPatterns Url Patterns}</li>
> * <li>{@link org.eclipse.jst.javaee.web.WebResourceCollection#getHttpMethods Http Methods}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.WebResourceCollection#getHttpMethodOmission Http Method Omission}</li>
> * <li>{@link org.eclipse.jst.javaee.web.WebResourceCollection#getId Id}</li>
> * </ul>
> * 
>@@ -56,10 +64,11 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The web-resource-name contains the name of this web
>-	 * 	 resource collection.
>-	 * 
>-	 * 	 
>+	 * The web-resource-name contains the name of this web
>+	 * resource collection.
>+	 * 
>+	 * @since Java EE 5, Web 2.5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Web Resource Name' attribute.
> 	 * @see #setWebResourceName(String)
>@@ -91,7 +100,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebResourceCollection_Descriptions()
> 	 * @generated
> 	 */
>-	List getDescriptions();
>+	List<Description> getDescriptions();
> 
> 	/**
> 	 * Returns the value of the 'Url Patterns' containment reference list.
>@@ -106,7 +115,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebResourceCollection_UrlPatterns()
> 	 * @generated
> 	 */
>-	List getUrlPatterns();
>+	List<UrlPatternType> getUrlPatterns();
> 
> 	/**
> 	 * Returns the value of the 'Http Methods' attribute list.
>@@ -117,11 +126,40 @@
> 	 * there really should be more of a description here...
> 	 * 
> 	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * Each http-method names an HTTP method to which the
>+	 * constraint applies.
>+	 * 
>+	 * @since Java EE 5, Web 2.5
>+	 * 
>+	 * 
> 	 * @return the value of the 'Http Methods' attribute list.
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebResourceCollection_HttpMethods()
> 	 * @generated
> 	 */
>-	List getHttpMethods();
>+	List<String> getHttpMethods();
>+
>+	/**
>+	 * Returns the value of the 'Http Method Omission' attribute list.
>+	 * The list contents are of type {@link java.lang.String}.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * Each http-method-omission names an HTTP method to
>+	 * which the constraint does not apply.
>+	 * 
>+	 * @since Java EE 6, Web 3.0
>+	 * 
>+	 * 
>+	 * @return the value of the 'Http Method Omission' attribute list.
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebResourceCollection_HttpMethodOmission()
>+	 * @generated
>+	 */
>+	List<String> getHttpMethodOmission();
> 
> 	/**
> 	 * Returns the value of the 'Id' attribute.
>Index: jee-models/org/eclipse/jst/javaee/web/NullCharType.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/NullCharType.java,v
>retrieving revision 1.2
>diff -u -r1.2 NullCharType.java
>--- jee-models/org/eclipse/jst/javaee/web/NullCharType.java	26 Jul 2007 16:56:11 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/web/NullCharType.java	14 Oct 2009 21:47:32 -0000
>@@ -14,7 +14,7 @@
> import java.util.Collections;
> import java.util.List;
> 
>-import org.eclipse.emf.common.util.AbstractEnumerator;
>+import org.eclipse.emf.common.util.Enumerator;
> 
> /**
> * 
>@@ -24,7 +24,17 @@
> * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getNullCharType()
> * @generated
> */
>-public final class NullCharType extends AbstractEnumerator {
>+public enum NullCharType implements Enumerator
>+{
>+	/**
>+	 * The '' literal object.
>+	 * 
>+	 * 
>+	 * @see #_
>+	 * @generated
>+	 * @ordered
>+	 */
>+	__LITERAL(0, "_", ""); //$NON-NLS-1$ //$NON-NLS-2$
> 	/**
> 	 * The '' literal value.
> 	 * 
>@@ -40,16 +50,6 @@
> 	public static final int _ = 0;
> 
> 	/**
>-	 * The '' literal object.
>-	 * 
>-	 * 
>-	 * @see #_
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final NullCharType __LITERAL = new NullCharType(_, "_", ""); //$NON-NLS-1$ //$NON-NLS-2$
>-
>-	/**
> 	 * An array of all the 'Null Char Type' enumerators.
> 	 * 
> 	 * 
>@@ -66,7 +66,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
>+	public static final List<NullCharType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
> 
> 	/**
> 	 * Returns the 'Null Char Type' literal with the specified literal value.
>@@ -110,17 +110,77 @@
> 		switch (value) {
> 			case _: return __LITERAL;
> 		}
>-		return null;	
>+		return null;
> 	}
> 
> 	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final int value;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final String name;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final String literal;
>+
>+	/**
> 	 * Only this class can construct instances.
> 	 * 
> 	 * 
> 	 * @generated
> 	 */
> 	private NullCharType(int value, String name, String literal) {
>-		super(value, name, literal);
>+		this.value = value;
>+		this.name = name;
>+		this.literal = literal;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public int getValue() {
>+	 return value;
> 	}
> 
>-} //NullCharType
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getName() {
>+	 return name;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getLiteral() {
>+	 return literal;
>+	}
>+
>+	/**
>+	 * Returns the literal value of the enumerator, which is its string representation.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		return literal;
>+	}
>+}
>Index: jee-models/org/eclipse/jst/javaee/web/FormLoginConfig.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/FormLoginConfig.java,v
>retrieving revision 1.2
>diff -u -r1.2 FormLoginConfig.java
>--- jee-models/org/eclipse/jst/javaee/web/FormLoginConfig.java	26 Jul 2007 16:56:11 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/web/FormLoginConfig.java	14 Oct 2009 21:47:32 -0000
>@@ -20,12 +20,13 @@
> * 
> * 
> * 
>- * 	The form-login-configType specifies the login and error
>- * 	pages that should be used in form based login. If form based
>- * 	authentication is not used, these elements are ignored.
>- * 
>- * 	Used in: login-config
>+ * The form-login-configType specifies the login and error
>+ * pages that should be used in form based login. If form based
>+ * authentication is not used, these elements are ignored.
>+ * 
>+ * Used in: login-config
> * 
>+ * @since Java EE 5, Web 2.5 
> * 
> * 
> *
>@@ -50,12 +51,13 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The form-login-page element defines the location in the web
>-	 * 	 app where the page that can be used for login can be
>-	 * 	 found. The path begins with a leading / and is interpreted
>-	 * 	 relative to the root of the WAR.
>-	 * 
>-	 * 	 
>+	 * The form-login-page element defines the location in the web
>+	 * app where the page that can be used for login can be
>+	 * found. The path begins with a leading / and is interpreted
>+	 * relative to the root of the WAR.
>+	 * 
>+	 * @since Java EE 5, Web 2.5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Form Login Page' attribute.
> 	 * @see #setFormLoginPage(String)
>@@ -81,13 +83,14 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The form-error-page element defines the location in
>-	 * 	 the web app where the error page that is displayed
>-	 * 	 when login is not successful can be found.
>-	 * 	 The path begins with a leading / and is interpreted
>-	 * 	 relative to the root of the WAR.
>-	 * 
>-	 * 	 
>+	 * The form-error-page element defines the location in
>+	 * the web app where the error page that is displayed
>+	 * when login is not successful can be found. 
>+	 * The path begins with a leading / and is interpreted
>+	 * relative to the root of the WAR.
>+	 * 
>+	 * @since Java EE 5, Web 2.5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Form Error Page' attribute.
> 	 * @see #setFormErrorPage(String)
>Index: jee-models/org/eclipse/jst/javaee/web/ErrorPage.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/ErrorPage.java,v
>retrieving revision 1.2
>diff -u -r1.2 ErrorPage.java
>--- jee-models/org/eclipse/jst/javaee/web/ErrorPage.java	26 Jul 2007 16:56:11 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/web/ErrorPage.java	14 Oct 2009 21:47:32 -0000
>@@ -22,12 +22,19 @@
> * 
> * 
> * 
>- * 	The error-pageType contains a mapping between an error code
>- * 	or exception type to the path of a resource in the web
>- * 	application.
>- * 
>- * 	Used in: web-app
>- * 
>+ * The error-pageType contains a mapping between an error code
>+ * or exception type to the path of a resource in the web
>+ * application.
>+ * 
>+ * Error-page declarations using the exception-type element in
>+ * the deployment descriptor must be unique up to the class name of
>+ * the exception-type. Similarly, error-page declarations using the
>+ * status-code element must be unique in the deployment descriptor
>+ * up to the status code.
>+ * 
>+ * Used in: web-app
>+ * 
>+ * @since Java EE 5, Web 2.5
> * 
> * 
> *
>@@ -78,10 +85,11 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The exception-type contains a fully qualified class
>-	 * 	 name of a Java exception type.
>-	 * 
>-	 * 	 
>+	 * The exception-type contains a fully qualified class
>+	 * name of a Java exception type.
>+	 * 
>+	 * @since Java EE 5, Web 2.5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Exception Type' attribute.
> 	 * @see #setExceptionType(String)
>@@ -107,12 +115,13 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The location element contains the location of the
>-	 * 	 resource in the web application relative to the root of
>-	 * 	 the web application. The value of the location must have
>-	 * 	 a leading `/'.
>-	 * 
>-	 * 	 
>+	 * The location element contains the location of the
>+	 * resource in the web application relative to the root of
>+	 * the web application. The value of the location must have
>+	 * a leading `/'.
>+	 * 
>+	 * @since Java EE 5, Web 2.5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Location' attribute.
> 	 * @see #setLocation(String)
>Index: jee-models/org/eclipse/jst/javaee/web/LocaleEncodingMappingList.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/LocaleEncodingMappingList.java,v
>retrieving revision 1.2
>diff -u -r1.2 LocaleEncodingMappingList.java
>--- jee-models/org/eclipse/jst/javaee/web/LocaleEncodingMappingList.java	26 Jul 2007 16:56:11 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/web/LocaleEncodingMappingList.java	14 Oct 2009 21:47:32 -0000
>@@ -22,9 +22,10 @@
> * 
> * 
> * 
>- * 	The locale-encoding-mapping-list contains one or more
>- * 	locale-encoding-mapping(s).
>- * 
>+ * The locale-encoding-mapping-list contains one or more
>+ * locale-encoding-mapping(s).
>+ * 
>+ * @since Java EE 5, Web 2.5
> * 
> * 
> *
>@@ -54,7 +55,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getLocaleEncodingMappingList_LocalEncodingMappings()
> 	 * @generated
> 	 */
>-	List getLocalEncodingMappings();
>+	List<LocaleEncodingMapping> getLocalEncodingMappings();
> 
> 	/**
> 	 * Returns the value of the 'Id' attribute.
>Index: jee-models/org/eclipse/jst/javaee/web/FilterMapping.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/FilterMapping.java,v
>retrieving revision 1.2
>diff -u -r1.2 FilterMapping.java
>--- jee-models/org/eclipse/jst/javaee/web/FilterMapping.java	26 Jul 2007 16:56:11 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/web/FilterMapping.java	14 Oct 2009 21:47:32 -0000
>@@ -15,6 +15,7 @@
> import org.eclipse.emf.ecore.util.FeatureMap;
> 
> import org.eclipse.jst.javaee.core.JavaEEObject;
>+import org.eclipse.jst.javaee.core.UrlPatternType;
> 
> /**
> * 
>@@ -24,22 +25,23 @@
> * 
> * 
> * 
>- * 	Declaration of the filter mappings in this web
>- * 	application is done by using filter-mappingType.
>- * 	The container uses the filter-mapping
>- * 	declarations to decide which filters to apply to a request,
>- * 	and in what order. The container matches the request URI to
>- * 	a Servlet in the normal way. To determine which filters to
>- * 	apply it matches filter-mapping declarations either on
>- * 	servlet-name, or on url-pattern for each filter-mapping
>- * 	element, depending on which style is used. The order in
>- * 	which filters are invoked is the order in which
>- * 	filter-mapping declarations that match a request URI for a
>- * 	servlet appear in the list of filter-mapping elements.The
>- * 	filter-name value must be the value of the filter-name
>- * 	sub-elements of one of the filter declarations in the
>- * 	deployment descriptor.
>- * 
>+ * Declaration of the filter mappings in this web
>+ * application is done by using filter-mappingType. 
>+ * The container uses the filter-mapping
>+ * declarations to decide which filters to apply to a request,
>+ * and in what order. The container matches the request URI to
>+ * a Servlet in the normal way. To determine which filters to
>+ * apply it matches filter-mapping declarations either on
>+ * servlet-name, or on url-pattern for each filter-mapping
>+ * element, depending on which style is used. The order in
>+ * which filters are invoked is the order in which
>+ * filter-mapping declarations that match a request URI for a
>+ * servlet appear in the list of filter-mapping elements.The
>+ * filter-name value must be the value of the filter-name
>+ * sub-elements of one of the filter declarations in the
>+ * deployment descriptor.
>+ * 
>+ * @since Java EE 5, Web 2.5
> * 
> * 
> *
>@@ -113,7 +115,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getFilterMapping_UrlPatterns()
> 	 * @generated
> 	 */
>-	List getUrlPatterns();
>+	List<UrlPatternType> getUrlPatterns();
> 
> 	/**
> 	 * Returns the value of the 'Servlet Names' attribute list.
>@@ -128,7 +130,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getFilterMapping_ServletNames()
> 	 * @generated
> 	 */
>-	List getServletNames();
>+	List<String> getServletNames();
> 
> 	/**
> 	 * Returns the value of the 'Dispatchers' attribute list.
>@@ -145,7 +147,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getFilterMapping_Dispatchers()
> 	 * @generated
> 	 */
>-	List getDispatchers();
>+	List<DispatcherType> getDispatchers();
> 
> 	/**
> 	 * Returns the value of the 'Id' attribute.
>Index: jee-models/org/eclipse/jst/javaee/web/WebFactory.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/WebFactory.java,v
>retrieving revision 1.2
>diff -u -r1.2 WebFactory.java
>--- jee-models/org/eclipse/jst/javaee/web/WebFactory.java	26 Jul 2007 16:56:11 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/web/WebFactory.java	14 Oct 2009 21:47:32 -0000
>@@ -32,6 +32,15 @@
> 	WebFactory eINSTANCE = org.eclipse.jst.javaee.web.internal.impl.WebFactoryImpl.init();
> 
> 	/**
>+	 * Returns a new object of class 'Absolute Ordering Type'.
>+	 * 
>+	 * 
>+	 * @return a new object of class 'Absolute Ordering Type'.
>+	 * @generated
>+	 */
>+	AbsoluteOrderingType createAbsoluteOrderingType();
>+
>+	/**
> 	 * Returns a new object of class 'Auth Constraint'.
> 	 * 
> 	 * 
>@@ -41,6 +50,51 @@
> 	AuthConstraint createAuthConstraint();
> 
> 	/**
>+	 * Returns a new object of class 'Cookie Comment Type'.
>+	 * 
>+	 * 
>+	 * @return a new object of class 'Cookie Comment Type'.
>+	 * @generated
>+	 */
>+	CookieCommentType createCookieCommentType();
>+
>+	/**
>+	 * Returns a new object of class 'Cookie Config Type'.
>+	 * 
>+	 * 
>+	 * @return a new object of class 'Cookie Config Type'.
>+	 * @generated
>+	 */
>+	CookieConfigType createCookieConfigType();
>+
>+	/**
>+	 * Returns a new object of class 'Cookie Domain Type'.
>+	 * 
>+	 * 
>+	 * @return a new object of class 'Cookie Domain Type'.
>+	 * @generated
>+	 */
>+	CookieDomainType createCookieDomainType();
>+
>+	/**
>+	 * Returns a new object of class 'Cookie Name Type'.
>+	 * 
>+	 * 
>+	 * @return a new object of class 'Cookie Name Type'.
>+	 * @generated
>+	 */
>+	CookieNameType createCookieNameType();
>+
>+	/**
>+	 * Returns a new object of class 'Cookie Path Type'.
>+	 * 
>+	 * 
>+	 * @return a new object of class 'Cookie Path Type'.
>+	 * @generated
>+	 */
>+	CookiePathType createCookiePathType();
>+
>+	/**
> 	 * Returns a new object of class 'Error Page'.
> 	 * 
> 	 * 
>@@ -113,6 +167,42 @@
> 	MimeMapping createMimeMapping();
> 
> 	/**
>+	 * Returns a new object of class 'Multipart Config Type'.
>+	 * 
>+	 * 
>+	 * @return a new object of class 'Multipart Config Type'.
>+	 * @generated
>+	 */
>+	MultipartConfigType createMultipartConfigType();
>+
>+	/**
>+	 * Returns a new object of class 'Ordering Ordering Type'.
>+	 * 
>+	 * 
>+	 * @return a new object of class 'Ordering Ordering Type'.
>+	 * @generated
>+	 */
>+	OrderingOrderingType createOrderingOrderingType();
>+
>+	/**
>+	 * Returns a new object of class 'Ordering Others Type'.
>+	 * 
>+	 * 
>+	 * @return a new object of class 'Ordering Others Type'.
>+	 * @generated
>+	 */
>+	OrderingOthersType createOrderingOthersType();
>+
>+	/**
>+	 * Returns a new object of class 'Ordering Type'.
>+	 * 
>+	 * 
>+	 * @return a new object of class 'Ordering Type'.
>+	 * @generated
>+	 */
>+	OrderingType createOrderingType();
>+
>+	/**
> 	 * Returns a new object of class 'Security Constraint'.
> 	 * 
> 	 * 
>@@ -176,6 +266,15 @@
> 	WebAppDeploymentDescriptor createWebAppDeploymentDescriptor();
> 
> 	/**
>+	 * Returns a new object of class 'Fragment'.
>+	 * 
>+	 * 
>+	 * @return a new object of class 'Fragment'.
>+	 * @generated
>+	 */
>+	WebFragment createWebFragment();
>+
>+	/**
> 	 * Returns a new object of class 'Resource Collection'.
> 	 * 
> 	 * 
>Index: jee-models/org/eclipse/jst/javaee/web/AuthConstraint.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/AuthConstraint.java,v
>retrieving revision 1.2
>diff -u -r1.2 AuthConstraint.java
>--- jee-models/org/eclipse/jst/javaee/web/AuthConstraint.java	26 Jul 2007 16:56:11 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/web/AuthConstraint.java	14 Oct 2009 21:47:32 -0000
>@@ -12,6 +12,7 @@
> 
> import java.util.List;
> 
>+import org.eclipse.jst.javaee.core.Description;
> import org.eclipse.jst.javaee.core.JavaEEObject;
> 
> /**
>@@ -22,19 +23,20 @@
> * 
> * 
> * 
>- * 	The auth-constraintType indicates the user roles that
>- * 	should be permitted access to this resource
>- * 	collection. The role-name used here must either correspond
>- * 	to the role-name of one of the security-role elements
>- * 	defined for this web application, or be the specially
>- * 	reserved role-name "*" that is a compact syntax for
>- * 	indicating all roles in the web application. If both "*"
>- * 	and rolenames appear, the container interprets this as all
>- * 	roles. If no roles are defined, no user is allowed access
>- * 	to the portion of the web application described by the
>- * 	containing security-constraint. The container matches
>- * 	role names case sensitively when determining access.
>- * 
>+ * The auth-constraintType indicates the user roles that
>+ * should be permitted access to this resource
>+ * collection. The role-name used here must either correspond
>+ * to the role-name of one of the security-role elements
>+ * defined for this web application, or be the specially
>+ * reserved role-name "*" that is a compact syntax for
>+ * indicating all roles in the web application. If both "*"
>+ * and rolenames appear, the container interprets this as all
>+ * roles. If no roles are defined, no user is allowed access
>+ * to the portion of the web application described by the
>+ * containing security-constraint. The container matches
>+ * role names case sensitively when determining access.
>+ * 
>+ * @since Java EE 5, Web 2.5
> * 
> * 
> *
>@@ -65,7 +67,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getAuthConstraint_Descriptions()
> 	 * @generated
> 	 */
>-	List getDescriptions();
>+	List<Description> getDescriptions();
> 
> 	/**
> 	 * Returns the value of the 'Role Names' attribute list.
>@@ -80,7 +82,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getAuthConstraint_RoleNames()
> 	 * @generated
> 	 */
>-	List getRoleNames();
>+	List<String> getRoleNames();
> 
> 	/**
> 	 * Returns the value of the 'Id' attribute.
>Index: jee-models/org/eclipse/jst/javaee/web/WebAppVersionType.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/WebAppVersionType.java,v
>retrieving revision 1.2
>diff -u -r1.2 WebAppVersionType.java
>--- jee-models/org/eclipse/jst/javaee/web/WebAppVersionType.java	26 Jul 2007 16:56:11 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/web/WebAppVersionType.java	14 Oct 2009 21:47:32 -0000
>@@ -14,7 +14,7 @@
> import java.util.Collections;
> import java.util.List;
> 
>-import org.eclipse.emf.common.util.AbstractEnumerator;
>+import org.eclipse.emf.common.util.Enumerator;
> 
> /**
> * 
>@@ -24,16 +24,36 @@
> * 
> * 
> * 
>- * 	This type contains the recognized versions of
>- * 	web-application supported. It is used to designate the
>- * 	version of the web application.
>- * 
>+ * This type contains the recognized versions of
>+ * web-application supported. It is used to designate the
>+ * version of the web application.
>+ * 
>+ * @since Java EE 5, Web 2.5
> * 
> * 
> * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebAppVersionType()
> * @generated
> */
>-public final class WebAppVersionType extends AbstractEnumerator {
>+public enum WebAppVersionType implements Enumerator
>+{
>+	/**
>+	 * The '25' literal object.
>+	 * 
>+	 * 
>+	 * @see #_25
>+	 * @generated
>+	 * @ordered
>+	 */
>+	_25_LITERAL(0, "_25", "2.5"), //$NON-NLS-1$ //$NON-NLS-2$
>+	/**
>+	 * The '30' literal object.
>+	 * 
>+	 * 
>+	 * @see #_30
>+	 * @generated
>+	 * @ordered
>+	 */
>+	_30_LITERAL(1, "_30", "3.0"); //$NON-NLS-1$ //$NON-NLS-2$
> 	/**
> 	 * The '25' literal value.
> 	 * 
>@@ -49,14 +69,18 @@
> 	public static final int _25 = 0;
> 
> 	/**
>-	 * The '25' literal object.
>+	 * The '30' literal value.
> 	 * 
>+	 * 
>+	 * If the meaning of '30' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
> 	 * 
>-	 * @see #_25
>+	 * @see #_30_LITERAL
> 	 * @generated
> 	 * @ordered
> 	 */
>-	public static final WebAppVersionType _25_LITERAL = new WebAppVersionType(_25, "_25", "2.5"); //$NON-NLS-1$ //$NON-NLS-2$
>+	public static final int _30 = 1;
> 
> 	/**
> 	 * An array of all the 'App Version Type' enumerators.
>@@ -67,6 +91,7 @@
> 	private static final WebAppVersionType[] VALUES_ARRAY =
> 		new WebAppVersionType[] {
> 			_25_LITERAL,
>+			_30_LITERAL,
> 		};
> 
> 	/**
>@@ -75,7 +100,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
>+	public static final List<WebAppVersionType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
> 
> 	/**
> 	 * Returns the 'App Version Type' literal with the specified literal value.
>@@ -118,18 +143,79 @@
> 	public static WebAppVersionType get(int value) {
> 		switch (value) {
> 			case _25: return _25_LITERAL;
>+			case _30: return _30_LITERAL;
> 		}
>-		return null;	
>+		return null;
> 	}
> 
> 	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final int value;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final String name;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final String literal;
>+
>+	/**
> 	 * Only this class can construct instances.
> 	 * 
> 	 * 
> 	 * @generated
> 	 */
> 	private WebAppVersionType(int value, String name, String literal) {
>-		super(value, name, literal);
>+		this.value = value;
>+		this.name = name;
>+		this.literal = literal;
> 	}
> 
>-} //WebAppVersionType
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public int getValue() {
>+	 return value;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getName() {
>+	 return name;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getLiteral() {
>+	 return literal;
>+	}
>+
>+	/**
>+	 * Returns the literal value of the enumerator, which is its string representation.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		return literal;
>+	}
>+}
>Index: jee-models/org/eclipse/jst/javaee/web/Servlet.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/Servlet.java,v
>retrieving revision 1.2
>diff -u -r1.2 Servlet.java
>--- jee-models/org/eclipse/jst/javaee/web/Servlet.java	26 Jul 2007 16:56:11 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/web/Servlet.java	14 Oct 2009 21:47:32 -0000
>@@ -12,8 +12,13 @@
> 
> import java.util.List;
> 
>+import org.eclipse.jst.javaee.core.Description;
>+import org.eclipse.jst.javaee.core.DisplayName;
>+import org.eclipse.jst.javaee.core.Icon;
> import org.eclipse.jst.javaee.core.JavaEEObject;
>+import org.eclipse.jst.javaee.core.ParamValue;
> import org.eclipse.jst.javaee.core.RunAs;
>+import org.eclipse.jst.javaee.core.SecurityRoleRef;
> 
> /**
> * 
>@@ -23,14 +28,15 @@
> * 
> * 
> * 
>- * 	The servletType is used to declare a servlet.
>- * 	It contains the declarative data of a
>- * 	servlet. If a jsp-file is specified and the load-on-startup
>- * 	element is present, then the JSP should be precompiled and
>- * 	loaded.
>- * 
>- * 	Used in: web-app
>- * 
>+ * The servletType is used to declare a servlet.
>+ * It contains the declarative data of a
>+ * servlet. If a jsp-file is specified and the load-on-startup
>+ * element is present, then the JSP should be precompiled and
>+ * loaded.
>+ * 
>+ * Used in: web-app
>+ * 
>+ * @since Java EE 5, Web 2.5
> * 
> * 
> *
>@@ -45,8 +51,11 @@
> * <li>{@link org.eclipse.jst.javaee.web.Servlet#getJspFile Jsp File}</li>
> * <li>{@link org.eclipse.jst.javaee.web.Servlet#getInitParams Init Params}</li>
> * <li>{@link org.eclipse.jst.javaee.web.Servlet#getLoadOnStartup Load On Startup}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.Servlet#isEnabled Enabled}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.Servlet#isAsyncSupported Async Supported}</li>
> * <li>{@link org.eclipse.jst.javaee.web.Servlet#getRunAs Run As}</li>
> * <li>{@link org.eclipse.jst.javaee.web.Servlet#getSecurityRoleRefs Security Role Refs}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.Servlet#getMultipartConfig Multipart Config}</li>
> * <li>{@link org.eclipse.jst.javaee.web.Servlet#getId Id}</li>
> * </ul>
> * 
>@@ -69,7 +78,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getServlet_Descriptions()
> 	 * @generated
> 	 */
>-	List getDescriptions();
>+	List<Description> getDescriptions();
> 
> 	/**
> 	 * Returns the value of the 'Display Names' containment reference list.
>@@ -84,7 +93,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getServlet_DisplayNames()
> 	 * @generated
> 	 */
>-	List getDisplayNames();
>+	List<DisplayName> getDisplayNames();
> 
> 	/**
> 	 * Returns the value of the 'Icons' containment reference list.
>@@ -99,7 +108,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getServlet_Icons()
> 	 * @generated
> 	 */
>-	List getIcons();
>+	List<Icon> getIcons();
> 
> 	/**
> 	 * Returns the value of the 'Servlet Name' attribute.
>@@ -133,10 +142,11 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The servlet-class element contains the fully
>-	 * 	 qualified class name of the servlet.
>-	 * 
>-	 * 	 
>+	 * The servlet-class element contains the fully
>+	 * qualified class name of the servlet.
>+	 * 
>+	 * @since Java EE 5, Web 2.5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Servlet Class' attribute.
> 	 * @see #setServletClass(String)
>@@ -193,7 +203,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getServlet_InitParams()
> 	 * @generated
> 	 */
>-	List getInitParams();
>+	List<ParamValue> getInitParams();
> 
> 	/**
> 	 * Returns the value of the 'Load On Startup' attribute.
>@@ -202,24 +212,25 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The load-on-startup element indicates that this
>-	 * 	 servlet should be loaded (instantiated and have
>-	 * 	 its init() called) on the startup of the web
>-	 * 	 application. The optional contents of these
>-	 * 	 element must be an integer indicating the order in
>-	 * 	 which the servlet should be loaded. If the value
>-	 * 	 is a negative integer, or the element is not
>-	 * 	 present, the container is free to load the servlet
>-	 * 	 whenever it chooses. If the value is a positive
>-	 * 	 integer or 0, the container must load and
>-	 * 	 initialize the servlet as the application is
>-	 * 	 deployed. The container must guarantee that
>-	 * 	 servlets marked with lower integers are loaded
>-	 * 	 before servlets marked with higher integers. The
>-	 * 	 container may choose the order of loading of
>-	 * 	 servlets with the same load-on-start-up value.
>-	 * 
>-	 * 	 
>+	 * The load-on-startup element indicates that this
>+	 * servlet should be loaded (instantiated and have
>+	 * its init() called) on the startup of the web
>+	 * application. The optional contents of these
>+	 * element must be an integer indicating the order in
>+	 * which the servlet should be loaded. If the value
>+	 * is a negative integer, or the element is not
>+	 * present, the container is free to load the servlet
>+	 * whenever it chooses. If the value is a positive
>+	 * integer or 0, the container must load and
>+	 * initialize the servlet as the application is
>+	 * deployed. The container must guarantee that
>+	 * servlets marked with lower integers are loaded
>+	 * before servlets marked with higher integers. The
>+	 * container may choose the order of loading of
>+	 * servlets with the same load-on-start-up value.
>+	 * 
>+	 * @since Java EE 5, Web 2.5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Load On Startup' attribute.
> 	 * @see #setLoadOnStartup(Object)
>@@ -239,6 +250,112 @@
> 	void setLoadOnStartup(Object value);
> 
> 	/**
>+	 * Returns the value of the 'Enabled' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * @since Java EE 6, Web 3.0
>+	 * 
>+	 * 
>+	 * @return the value of the 'Enabled' attribute.
>+	 * @see #isSetEnabled()
>+	 * @see #unsetEnabled()
>+	 * @see #setEnabled(boolean)
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getServlet_Enabled()
>+	 * @generated
>+	 */
>+	boolean isEnabled();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.Servlet#isEnabled Enabled}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Enabled' attribute.
>+	 * @see #isSetEnabled()
>+	 * @see #unsetEnabled()
>+	 * @see #isEnabled()
>+	 * @generated
>+	 */
>+	void setEnabled(boolean value);
>+
>+	/**
>+	 * Unsets the value of the '{@link org.eclipse.jst.javaee.web.Servlet#isEnabled Enabled}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isSetEnabled()
>+	 * @see #isEnabled()
>+	 * @see #setEnabled(boolean)
>+	 * @generated
>+	 */
>+	void unsetEnabled();
>+
>+	/**
>+	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.web.Servlet#isEnabled Enabled}' attribute is set.
>+	 * 
>+	 * 
>+	 * @return whether the value of the 'Enabled' attribute is set.
>+	 * @see #unsetEnabled()
>+	 * @see #isEnabled()
>+	 * @see #setEnabled(boolean)
>+	 * @generated
>+	 */
>+	boolean isSetEnabled();
>+
>+	/**
>+	 * Returns the value of the 'Async Supported' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * @since Java EE 6, Web 3.0
>+	 * 
>+	 * 
>+	 * @return the value of the 'Async Supported' attribute.
>+	 * @see #isSetAsyncSupported()
>+	 * @see #unsetAsyncSupported()
>+	 * @see #setAsyncSupported(boolean)
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getServlet_AsyncSupported()
>+	 * @generated
>+	 */
>+	boolean isAsyncSupported();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.Servlet#isAsyncSupported Async Supported}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Async Supported' attribute.
>+	 * @see #isSetAsyncSupported()
>+	 * @see #unsetAsyncSupported()
>+	 * @see #isAsyncSupported()
>+	 * @generated
>+	 */
>+	void setAsyncSupported(boolean value);
>+
>+	/**
>+	 * Unsets the value of the '{@link org.eclipse.jst.javaee.web.Servlet#isAsyncSupported Async Supported}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isSetAsyncSupported()
>+	 * @see #isAsyncSupported()
>+	 * @see #setAsyncSupported(boolean)
>+	 * @generated
>+	 */
>+	void unsetAsyncSupported();
>+
>+	/**
>+	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.web.Servlet#isAsyncSupported Async Supported}' attribute is set.
>+	 * 
>+	 * 
>+	 * @return whether the value of the 'Async Supported' attribute is set.
>+	 * @see #unsetAsyncSupported()
>+	 * @see #isAsyncSupported()
>+	 * @see #setAsyncSupported(boolean)
>+	 * @generated
>+	 */
>+	boolean isSetAsyncSupported();
>+
>+	/**
> 	 * Returns the value of the 'Run As' containment reference.
> 	 * 
> 	 * 
>@@ -276,7 +393,33 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getServlet_SecurityRoleRefs()
> 	 * @generated
> 	 */
>-	List getSecurityRoleRefs();
>+	List<SecurityRoleRef> getSecurityRoleRefs();
>+
>+	/**
>+	 * Returns the value of the 'Multipart Config' containment reference.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * @since Java EE 6, Web 3.0
>+	 * 
>+	 * 
>+	 * @return the value of the 'Multipart Config' containment reference.
>+	 * @see #setMultipartConfig(MultipartConfigType)
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getServlet_MultipartConfig()
>+	 * @generated
>+	 */
>+	MultipartConfigType getMultipartConfig();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.Servlet#getMultipartConfig Multipart Config}' containment reference.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Multipart Config' containment reference.
>+	 * @see #getMultipartConfig()
>+	 * @generated
>+	 */
>+	void setMultipartConfig(MultipartConfigType value);
> 
> 	/**
> 	 * Returns the value of the 'Id' attribute.
>Index: jee-models/org/eclipse/jst/javaee/web/WebApp.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/WebApp.java,v
>retrieving revision 1.2
>diff -u -r1.2 WebApp.java
>--- jee-models/org/eclipse/jst/javaee/web/WebApp.java	26 Jul 2007 16:56:11 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/web/WebApp.java	14 Oct 2009 21:47:32 -0000
>@@ -14,7 +14,27 @@
> 
> import org.eclipse.emf.ecore.util.FeatureMap;
> 
>+import org.eclipse.jst.javaee.core.DataSourceType;
>+import org.eclipse.jst.javaee.core.Description;
>+import org.eclipse.jst.javaee.core.DisplayName;
>+import org.eclipse.jst.javaee.core.EjbLocalRef;
>+import org.eclipse.jst.javaee.core.EjbRef;
>+import org.eclipse.jst.javaee.core.EmptyType;
>+import org.eclipse.jst.javaee.core.EnvEntry;
>+import org.eclipse.jst.javaee.core.Icon;
> import org.eclipse.jst.javaee.core.JavaEEObject;
>+import org.eclipse.jst.javaee.core.LifecycleCallback;
>+import org.eclipse.jst.javaee.core.Listener;
>+import org.eclipse.jst.javaee.core.MessageDestination;
>+import org.eclipse.jst.javaee.core.MessageDestinationRef;
>+import org.eclipse.jst.javaee.core.ParamValue;
>+import org.eclipse.jst.javaee.core.PersistenceContextRef;
>+import org.eclipse.jst.javaee.core.PersistenceUnitRef;
>+import org.eclipse.jst.javaee.core.ResourceEnvRef;
>+import org.eclipse.jst.javaee.core.ResourceRef;
>+import org.eclipse.jst.javaee.core.SecurityRole;
>+import org.eclipse.jst.javaee.core.ServiceRef;
>+import org.eclipse.jst.javaee.jsp.JspConfig;
> 
> /**
> * 
>@@ -28,6 +48,7 @@
> * <li>{@link org.eclipse.jst.javaee.web.WebApp#getDescriptions Descriptions}</li>
> * <li>{@link org.eclipse.jst.javaee.web.WebApp#getDisplayNames Display Names}</li>
> * <li>{@link org.eclipse.jst.javaee.web.WebApp#getIcons Icons}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.WebApp#getName Name}</li>
> * <li>{@link org.eclipse.jst.javaee.web.WebApp#getDistributables Distributables}</li>
> * <li>{@link org.eclipse.jst.javaee.web.WebApp#getContextParams Context Params}</li>
> * <li>{@link org.eclipse.jst.javaee.web.WebApp#getFilters Filters}</li>
>@@ -54,8 +75,11 @@
> * <li>{@link org.eclipse.jst.javaee.web.WebApp#getPersistenceUnitRefs Persistence Unit Refs}</li>
> * <li>{@link org.eclipse.jst.javaee.web.WebApp#getPostConstructs Post Constructs}</li>
> * <li>{@link org.eclipse.jst.javaee.web.WebApp#getPreDestroys Pre Destroys}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.WebApp#getDataSource Data Source}</li>
> * <li>{@link org.eclipse.jst.javaee.web.WebApp#getMessageDestinations Message Destinations}</li>
> * <li>{@link org.eclipse.jst.javaee.web.WebApp#getLocalEncodingMappingsLists Local Encoding Mappings Lists}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.WebApp#getModuleName Module Name}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.WebApp#getAbsoluteOrdering Absolute Ordering}</li>
> * <li>{@link org.eclipse.jst.javaee.web.WebApp#getId Id}</li>
> * <li>{@link org.eclipse.jst.javaee.web.WebApp#isMetadataComplete Metadata Complete}</li>
> * <li>{@link org.eclipse.jst.javaee.web.WebApp#getVersion Version}</li>
>@@ -95,7 +119,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_Descriptions()
> 	 * @generated
> 	 */
>-	List getDescriptions();
>+	List<Description> getDescriptions();
> 
> 	/**
> 	 * Returns the value of the 'Display Names' containment reference list.
>@@ -110,7 +134,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_DisplayNames()
> 	 * @generated
> 	 */
>-	List getDisplayNames();
>+	List<DisplayName> getDisplayNames();
> 
> 	/**
> 	 * Returns the value of the 'Icons' containment reference list.
>@@ -125,7 +149,23 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_Icons()
> 	 * @generated
> 	 */
>-	List getIcons();
>+	List<Icon> getIcons();
>+
>+	/**
>+	 * Returns the value of the 'Name' attribute list.
>+	 * The list contents are of type {@link java.lang.String}.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * @since Java EE 6, Web 3.0
>+	 * 
>+	 * 
>+	 * @return the value of the 'Name' attribute list.
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_Name()
>+	 * @generated
>+	 */
>+	List<String> getName();
> 
> 	/**
> 	 * Returns the value of the 'Distributables' containment reference list.
>@@ -140,7 +180,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_Distributables()
> 	 * @generated
> 	 */
>-	List getDistributables();
>+	List<EmptyType> getDistributables();
> 
> 	/**
> 	 * Returns the value of the 'Context Params' containment reference list.
>@@ -150,17 +190,18 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The context-param element contains the declaration
>-	 * 	 of a web application's servlet context
>-	 * 	 initialization parameters.
>-	 * 
>-	 * 	 
>+	 * The context-param element contains the declaration
>+	 * of a web application's servlet context
>+	 * initialization parameters.
>+	 * 
>+	 * @since Java EE 5, Web 2.5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Context Params' containment reference list.
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_ContextParams()
> 	 * @generated
> 	 */
>-	List getContextParams();
>+	List<ParamValue> getContextParams();
> 
> 	/**
> 	 * Returns the value of the 'Filters' containment reference list.
>@@ -175,7 +216,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_Filters()
> 	 * @generated
> 	 */
>-	List getFilters();
>+	List<Filter> getFilters();
> 
> 	/**
> 	 * Returns the value of the 'Filter Mappings' containment reference list.
>@@ -190,7 +231,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_FilterMappings()
> 	 * @generated
> 	 */
>-	List getFilterMappings();
>+	List<FilterMapping> getFilterMappings();
> 
> 	/**
> 	 * Returns the value of the 'Listeners' containment reference list.
>@@ -205,7 +246,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_Listeners()
> 	 * @generated
> 	 */
>-	List getListeners();
>+	List<Listener> getListeners();
> 
> 	/**
> 	 * Returns the value of the 'Servlets' containment reference list.
>@@ -220,7 +261,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_Servlets()
> 	 * @generated
> 	 */
>-	List getServlets();
>+	List<Servlet> getServlets();
> 
> 	/**
> 	 * Returns the value of the 'Servlet Mappings' containment reference list.
>@@ -235,7 +276,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_ServletMappings()
> 	 * @generated
> 	 */
>-	List getServletMappings();
>+	List<ServletMapping> getServletMappings();
> 
> 	/**
> 	 * Returns the value of the 'Session Configs' containment reference list.
>@@ -250,7 +291,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_SessionConfigs()
> 	 * @generated
> 	 */
>-	List getSessionConfigs();
>+	List<SessionConfig> getSessionConfigs();
> 
> 	/**
> 	 * Returns the value of the 'Mime Mappings' containment reference list.
>@@ -265,7 +306,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_MimeMappings()
> 	 * @generated
> 	 */
>-	List getMimeMappings();
>+	List<MimeMapping> getMimeMappings();
> 
> 	/**
> 	 * Returns the value of the 'Welcome File Lists' containment reference list.
>@@ -280,7 +321,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_WelcomeFileLists()
> 	 * @generated
> 	 */
>-	List getWelcomeFileLists();
>+	List<WelcomeFileList> getWelcomeFileLists();
> 
> 	/**
> 	 * Returns the value of the 'Error Pages' containment reference list.
>@@ -295,7 +336,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_ErrorPages()
> 	 * @generated
> 	 */
>-	List getErrorPages();
>+	List<ErrorPage> getErrorPages();
> 
> 	/**
> 	 * Returns the value of the 'Jsp Configs' containment reference list.
>@@ -310,7 +351,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_JspConfigs()
> 	 * @generated
> 	 */
>-	List getJspConfigs();
>+	List<JspConfig> getJspConfigs();
> 
> 	/**
> 	 * Returns the value of the 'Security Constraints' containment reference list.
>@@ -325,7 +366,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_SecurityConstraints()
> 	 * @generated
> 	 */
>-	List getSecurityConstraints();
>+	List<SecurityConstraint> getSecurityConstraints();
> 
> 	/**
> 	 * Returns the value of the 'Login Configs' containment reference list.
>@@ -340,7 +381,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_LoginConfigs()
> 	 * @generated
> 	 */
>-	List getLoginConfigs();
>+	List<LoginConfig> getLoginConfigs();
> 
> 	/**
> 	 * Returns the value of the 'Security Roles' containment reference list.
>@@ -355,7 +396,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_SecurityRoles()
> 	 * @generated
> 	 */
>-	List getSecurityRoles();
>+	List<SecurityRole> getSecurityRoles();
> 
> 	/**
> 	 * Returns the value of the 'Env Entries' containment reference list.
>@@ -370,7 +411,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_EnvEntries()
> 	 * @generated
> 	 */
>-	List getEnvEntries();
>+	List<EnvEntry> getEnvEntries();
> 
> 	/**
> 	 * Returns the value of the 'Ejb Refs' containment reference list.
>@@ -385,7 +426,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_EjbRefs()
> 	 * @generated
> 	 */
>-	List getEjbRefs();
>+	List<EjbRef> getEjbRefs();
> 
> 	/**
> 	 * Returns the value of the 'Ejb Local Refs' containment reference list.
>@@ -400,7 +441,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_EjbLocalRefs()
> 	 * @generated
> 	 */
>-	List getEjbLocalRefs();
>+	List<EjbLocalRef> getEjbLocalRefs();
> 
> 	/**
> 	 * Returns the value of the 'Service Refs' containment reference list.
>@@ -415,7 +456,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_ServiceRefs()
> 	 * @generated
> 	 */
>-	List getServiceRefs();
>+	List<ServiceRef> getServiceRefs();
> 
> 	/**
> 	 * Returns the value of the 'Resource Refs' containment reference list.
>@@ -430,7 +471,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_ResourceRefs()
> 	 * @generated
> 	 */
>-	List getResourceRefs();
>+	List<ResourceRef> getResourceRefs();
> 
> 	/**
> 	 * Returns the value of the 'Resource Env Refs' containment reference list.
>@@ -445,7 +486,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_ResourceEnvRefs()
> 	 * @generated
> 	 */
>-	List getResourceEnvRefs();
>+	List<ResourceEnvRef> getResourceEnvRefs();
> 
> 	/**
> 	 * Returns the value of the 'Message Destination Refs' containment reference list.
>@@ -460,7 +501,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_MessageDestinationRefs()
> 	 * @generated
> 	 */
>-	List getMessageDestinationRefs();
>+	List<MessageDestinationRef> getMessageDestinationRefs();
> 
> 	/**
> 	 * Returns the value of the 'Persistence Context Refs' containment reference list.
>@@ -475,7 +516,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_PersistenceContextRefs()
> 	 * @generated
> 	 */
>-	List getPersistenceContextRefs();
>+	List<PersistenceContextRef> getPersistenceContextRefs();
> 
> 	/**
> 	 * Returns the value of the 'Persistence Unit Refs' containment reference list.
>@@ -490,7 +531,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_PersistenceUnitRefs()
> 	 * @generated
> 	 */
>-	List getPersistenceUnitRefs();
>+	List<PersistenceUnitRef> getPersistenceUnitRefs();
> 
> 	/**
> 	 * Returns the value of the 'Post Constructs' containment reference list.
>@@ -505,7 +546,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_PostConstructs()
> 	 * @generated
> 	 */
>-	List getPostConstructs();
>+	List<LifecycleCallback> getPostConstructs();
> 
> 	/**
> 	 * Returns the value of the 'Pre Destroys' containment reference list.
>@@ -520,7 +561,22 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_PreDestroys()
> 	 * @generated
> 	 */
>-	List getPreDestroys();
>+	List<LifecycleCallback> getPreDestroys();
>+
>+	/**
>+	 * Returns the value of the 'Data Source' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.DataSourceType}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Data Source' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Data Source' containment reference list.
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_DataSource()
>+	 * @generated
>+	 */
>+	List<DataSourceType> getDataSource();
> 
> 	/**
> 	 * Returns the value of the 'Message Destinations' containment reference list.
>@@ -535,7 +591,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_MessageDestinations()
> 	 * @generated
> 	 */
>-	List getMessageDestinations();
>+	List<MessageDestination> getMessageDestinations();
> 
> 	/**
> 	 * Returns the value of the 'Local Encoding Mappings Lists' containment reference list.
>@@ -546,11 +602,48 @@
> 	 * there really should be more of a description here...
> 	 * 
> 	 * 
>+	 * 
>+	 * 
>+	 * @since Java EE 6, Web 3.0
>+	 * 
>+	 * 
> 	 * @return the value of the 'Local Encoding Mappings Lists' containment reference list.
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_LocalEncodingMappingsLists()
> 	 * @generated
> 	 */
>-	List getLocalEncodingMappingsLists();
>+	List<LocaleEncodingMappingList> getLocalEncodingMappingsLists();
>+
>+	/**
>+	 * Returns the value of the 'Module Name' attribute list.
>+	 * The list contents are of type {@link java.lang.String}.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * @since Java EE 6, Web 3.0
>+	 * 
>+	 * 
>+	 * @return the value of the 'Module Name' attribute list.
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_ModuleName()
>+	 * @generated
>+	 */
>+	List<String> getModuleName();
>+
>+	/**
>+	 * Returns the value of the 'Absolute Ordering' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.web.AbsoluteOrderingType}.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * @since Java EE 6, Web 3.0
>+	 * 
>+	 * 
>+	 * @return the value of the 'Absolute Ordering' containment reference list.
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_AbsoluteOrdering()
>+	 * @generated
>+	 */
>+	List<AbsoluteOrderingType> getAbsoluteOrdering();
> 
> 	/**
> 	 * Returns the value of the 'Id' attribute.
>@@ -584,25 +677,26 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The metadata-complete attribute defines whether this
>-	 * 	 deployment descriptor and other related deployment
>-	 * 	 descriptors for this module (e.g., web service
>-	 * 	 descriptors) are complete, or whether the class
>-	 * 	 files available to this module and packaged with
>-	 * 	 this application should be examined for annotations
>-	 * 	 that specify deployment information.
>-	 * 
>-	 * 	 If metadata-complete is set to "true", the deployment
>-	 * 	 tool must ignore any annotations that specify deployment
>-	 * 	 information, which might be present in the class files
>-	 * 	 of the application.
>-	 * 
>-	 * 	 If metadata-complete is not specified or is set to
>-	 * 	 "false", the deployment tool must examine the class
>-	 * 	 files of the application for annotations, as
>-	 * 	 specified by the specifications.
>-	 * 
>-	 * 	
>+	 * The metadata-complete attribute defines whether this
>+	 * deployment descriptor and other related deployment
>+	 * descriptors for this module (e.g., web service
>+	 * descriptors) are complete, or whether the class
>+	 * files available to this module and packaged with
>+	 * this application should be examined for annotations
>+	 * that specify deployment information.
>+	 * 
>+	 * If metadata-complete is set to "true", the deployment
>+	 * tool must ignore any annotations that specify deployment
>+	 * information, which might be present in the class files
>+	 * of the application.
>+	 * 
>+	 * If metadata-complete is not specified or is set to
>+	 * "false", the deployment tool must examine the class
>+	 * files of the application for annotations, as
>+	 * specified by the specifications.
>+	 * 
>+	 * @since Java EE 5, Web 2.5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Metadata Complete' attribute.
> 	 * @see #isSetMetadataComplete()
>@@ -650,7 +744,6 @@
> 
> 	/**
> 	 * Returns the value of the 'Version' attribute.
>-	 * The default value is <code>"2.5"</code>.
> 	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.web.WebAppVersionType}.
> 	 * 
> 	 * 
>Index: jee-models/org/eclipse/jst/javaee/web/SecurityConstraint.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/SecurityConstraint.java,v
>retrieving revision 1.2
>diff -u -r1.2 SecurityConstraint.java
>--- jee-models/org/eclipse/jst/javaee/web/SecurityConstraint.java	26 Jul 2007 16:56:11 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/web/SecurityConstraint.java	14 Oct 2009 21:47:32 -0000
>@@ -12,6 +12,7 @@
> 
> import java.util.List;
> 
>+import org.eclipse.jst.javaee.core.DisplayName;
> import org.eclipse.jst.javaee.core.JavaEEObject;
> 
> /**
>@@ -22,12 +23,13 @@
> * 
> * 
> * 
>- * 	The security-constraintType is used to associate
>- * 	security constraints with one or more web resource
>- * 	collections
>- * 
>- * 	Used in: web-app
>- * 
>+ * The security-constraintType is used to associate
>+ * security constraints with one or more web resource
>+ * collections
>+ * 
>+ * Used in: web-app
>+ * 
>+ * @since Java EE 5, Web 2.5
> * 
> * 
> *
>@@ -60,7 +62,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getSecurityConstraint_DisplayNames()
> 	 * @generated
> 	 */
>-	List getDisplayNames();
>+	List<DisplayName> getDisplayNames();
> 
> 	/**
> 	 * Returns the value of the 'Web Resource Collections' containment reference list.
>@@ -75,7 +77,7 @@
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getSecurityConstraint_WebResourceCollections()
> 	 * @generated
> 	 */
>-	List getWebResourceCollections();
>+	List<WebResourceCollection> getWebResourceCollections();
> 
> 	/**
> 	 * Returns the value of the 'Auth Constraint' containment reference.
>Index: jee-models/org/eclipse/jst/javaee/web/WelcomeFileList.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/WelcomeFileList.java,v
>retrieving revision 1.2
>diff -u -r1.2 WelcomeFileList.java
>--- jee-models/org/eclipse/jst/javaee/web/WelcomeFileList.java	26 Jul 2007 16:56:11 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/web/WelcomeFileList.java	14 Oct 2009 21:47:32 -0000
>@@ -22,11 +22,12 @@
> * 
> * 
> * 
>- * 	The welcome-file-list contains an ordered list of welcome
>- * 	files elements.
>- * 
>- * 	Used in: web-app
>- * 
>+ * The welcome-file-list contains an ordered list of welcome
>+ * files elements.
>+ * 
>+ * Used in: web-app
>+ * 
>+ * @since Java EE 5, Web 2.5
> * 
> * 
> *
>@@ -51,16 +52,17 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The welcome-file element contains file name to use
>-	 * 	 as a default welcome file, such as index.html
>-	 * 
>-	 * 	 
>+	 * The welcome-file element contains file name to use
>+	 * as a default welcome file, such as index.html
>+	 * 
>+	 * @since Java EE 5, Web 2.5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Welcome Files' attribute list.
> 	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWelcomeFileList_WelcomeFiles()
> 	 * @generated
> 	 */
>-	List getWelcomeFiles();
>+	List<String> getWelcomeFiles();
> 
> 	/**
> 	 * Returns the value of the 'Id' attribute.
>Index: jee-models/org/eclipse/jst/javaee/web/internal/metadata/WebPackage.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/metadata/WebPackage.java,v
>retrieving revision 1.3
>diff -u -r1.3 WebPackage.java
>--- jee-models/org/eclipse/jst/javaee/web/internal/metadata/WebPackage.java	26 Jul 2007 16:56:13 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/web/internal/metadata/WebPackage.java	14 Oct 2009 21:47:33 -0000
>@@ -31,272 +31,250 @@
> * 
> * 
> * 
>- * @(#)web-app_2_5.xsds	1.62 05/08/06
>- * 
>- * 
>- * 
>- * Copyright 2003-2006 Sun Microsystems, Inc.
>- * 4150 Network Circle
>- * Santa Clara, California 95054
>- * U.S.A
>- * All rights reserved.
>- * 
>- * Sun Microsystems, Inc. has intellectual property rights
>- * relating to technology described in this document. In
>- * particular, and without limitation, these intellectual
>- * property rights may include one or more of the U.S. patents
>- * listed at http://www.sun.com/patents and one or more
>- * additional patents or pending patent applications in the
>- * U.S. and other countries.
>- * 
>- * This document and the technology which it describes are
>- * distributed under licenses restricting their use, copying,
>- * distribution, and decompilation. No part of this document
>- * may be reproduced in any form by any means without prior
>- * written authorization of Sun and its licensors, if any.
>- * 
>- * Third-party software, including font technology, is
>- * copyrighted and licensed from Sun suppliers.
>- * 
>- * Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
>- * JavaServer Pages, Enterprise JavaBeans and the Java Coffee
>- * Cup logo are trademarks or registered trademarks of Sun
>- * Microsystems, Inc. in the U.S. and other countries.
>- * 
>- * Federal Acquisitions: Commercial Software - Government Users
>- * Subject to Standard License Terms and Conditions.
> * 
>+ * $Id: web-common_3_0.xsd,v 1.4 2009/10/02 06:33:20 ccc Exp $
>+ * 
> * 
> * 
>+ * <![CDATA[[
>+ * This is the common XML Schema for the Servlet 3.0 deployment descriptor.
>+ * This file is in turn used by web.xml and web-fragment.xml
>+ * web application's war file. All Servlet deployment descriptors
>+ * must indicate the web common schema by using the Java EE
>+ * namespace:
> * 
>- * 
>- * 	This is the XML Schema for the Servlet 2.5 deployment descriptor.
>- * 	The deployment descriptor must be named "WEB-INF/web.xml" in the
>- * 	web application's war file. All Servlet deployment descriptors
>- * 	must indicate the web application schema by using the Java EE
>- * 	namespace:
>- * 
>- * 	http://java.sun.com/xml/ns/javaee
>- * 
>- * 	and by indicating the version of the schema by
>- * 	using the version element as shown below:
>- * 
>- * 	 &lt;web-app xmlns="http://java.sun.com/xml/ns/javaee"
>- * 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>- * 	 xsi:schemaLocation="..."
>- * 	 version="2.5"&gt;
>- * 	 ...
>- * 	 &lt;/web-app&gt;
>- * 
>- * 	The instance documents may indicate the published version of
>- * 	the schema using the xsi:schemaLocation attribute for Java EE
>- * 	namespace with the following location:
>- * 
>- * 	http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd
>- * 
>- * 	
>+ * http://java.sun.com/xml/ns/javaee 
>+ * 
>+ * and by indicating the version of the schema by 
>+ * using the version element as shown below: 
>+ * 
>+ * <web-app xmlns="http://java.sun.com/xml/ns/javaee"
>+ * xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>+ * xsi:schemaLocation="..."
>+ * version="3.0"> 
>+ * ...
>+ * </web-app>
>+ * 
>+ * The instance documents may indicate the published version of
>+ * the schema using the xsi:schemaLocation attribute for Java EE
>+ * namespace with the following location:
>+ * 
>+ * http://java.sun.com/xml/ns/javaee/web-common_3_0.xsd
>+ * 
>+ * ]]>
> * 
> * 
> * 
> * The following conventions apply to all Java EE
> * deployment descriptor elements unless indicated otherwise.
>- * 
>+ * 
> * - In elements that specify a pathname to a file within the
>- * 	same JAR file, relative filenames (i.e., those not
>- * 	starting with "/") are considered relative to the root of
>- * 	the JAR file's namespace. Absolute filenames (i.e., those
>- * 	starting with "/") also specify names in the root of the
>- * 	JAR file's namespace. In general, relative names are
>- * 	preferred. The exception is .war files where absolute
>- * 	names are preferred for consistency with the Servlet API.
>- * 
>- * 
>- * 
>- * @(#)javaee_5.xsds	1.65 06/02/17
>+ * same JAR file, relative filenames (i.e., those not
>+ * starting with "/") are considered relative to the root of
>+ * the JAR file's namespace. Absolute filenames (i.e., those
>+ * starting with "/") also specify names in the root of the
>+ * JAR file's namespace. In general, relative names are
>+ * preferred. The exception is .war files where absolute
>+ * names are preferred for consistency with the Servlet API.
>+ * 
> * 
> * 
> * 
>- * Copyright 2003-2006 Sun Microsystems, Inc.
>- * 4150 Network Circle
>- * Santa Clara, California 95054
>- * U.S.A
>- * All rights reserved.
>- * 
>- * Sun Microsystems, Inc. has intellectual property rights
>- * relating to technology described in this document. In
>- * particular, and without limitation, these intellectual
>- * property rights may include one or more of the U.S. patents
>- * listed at http://www.sun.com/patents and one or more
>- * additional patents or pending patent applications in the
>- * U.S. and other countries.
>- * 
>- * This document and the technology which it describes are
>- * distributed under licenses restricting their use, copying,
>- * distribution, and decompilation. No part of this document
>- * may be reproduced in any form by any means without prior
>- * written authorization of Sun and its licensors, if any.
>- * 
>- * Third-party software, including font technology, is
>- * copyrighted and licensed from Sun suppliers.
>- * 
>- * Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
>- * JavaServer Pages, Enterprise JavaBeans and the Java Coffee
>- * Cup logo are trademarks or registered trademarks of Sun
>- * Microsystems, Inc. in the U.S. and other countries.
>- * 
>- * Federal Acquisitions: Commercial Software - Government Users
>- * Subject to Standard License Terms and Conditions.
>- * 
>+ * $Id: javaee_6.xsd,v 1.3 2009/10/02 06:33:20 ccc Exp $
>+ * 
> * 
> * 
> * 
>- * The following definitions that appear in the common
>- * shareable schema(s) of J2EE deployment descriptors should be
>- * interpreted with respect to the context they are included:
>- * 
>- * Deployment Component may indicate one of the following:
>- * j2ee application;
>- * application client;
>- * web application;
>- * enterprise bean;
>- * resource adapter;
>- * 
>- * Deployment File may indicate one of the following:
>- * ear file;
>- * war file;
>- * jar file;
>- * rar file;
>- * 
>- * 
>- * 
>- * @(#)javaee_web_services_client_1_2.xsds	1.19 02/13/06
>+ * The following definitions that appear in the common
>+ * shareable schema(s) of Java EE deployment descriptors should be
>+ * interpreted with respect to the context they are included:
>+ * 
>+ * Deployment Component may indicate one of the following:
>+ * java ee application;
>+ * application client;
>+ * web application;
>+ * enterprise bean;
>+ * resource adapter; 
>+ * 
>+ * Deployment File may indicate one of the following:
>+ * ear file;
>+ * war file;
>+ * jar file;
>+ * rar file;
>+ * 
> * 
> * 
> * 
>- * Copyright 2003-2006 Sun Microsystems, Inc.
>- * 4150 Network Circle
>- * Santa Clara, California 95054
>- * U.S.A
>- * All rights reserved.
>- * 
>- * Sun Microsystems, Inc. has intellectual property rights
>- * relating to technology described in this document. In
>- * particular, and without limitation, these intellectual
>- * property rights may include one or more of the U.S. patents
>- * listed at http://www.sun.com/patents and one or more
>- * additional patents or pending patent applications in the
>- * U.S. and other countries.
>- * 
>- * This document and the technology which it describes are
>- * distributed under licenses restricting their use, copying,
>- * distribution, and decompilation. No part of this document
>- * may be reproduced in any form by any means without prior
>- * written authorization of Sun and its licensors, if any.
>- * 
>- * Third-party software, including font technology, is
>- * copyrighted and licensed from Sun suppliers.
>- * 
>- * Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
>- * JavaServer Pages, Enterprise JavaBeans and the Java Coffee
>- * Cup logo are trademarks or registered trademarks of Sun
>- * Microsystems, Inc. in the U.S. and other countries.
>- * 
>- * Federal Acquisitions: Commercial Software - Government Users
>- * Subject to Standard License Terms and Conditions.
>- * 
>+ * $Id: javaee_web_services_client_1_3.xsd,v 1.2 2009/09/29 20:31:42 ccc Exp $
>+ * 
> * 
> * 
> * 
> * (C) Copyright International Business Machines Corporation 2002
>- * 
>+ * 
> * 
> * 
>- * See http://www.w3.org/XML/1998/namespace.html and
>- * http://www.w3.org/TR/REC-xml for information about this namespace.
>- * 
>- * This schema document describes the XML namespace, in a form
>- * suitable for import by other schema documents. 
>- * 
>- * Note that local names in this namespace are intended to be defined
>- * only by the World Wide Web Consortium or its subgroups. The
>- * following names are currently defined in this namespace and should
>- * not be used with conflicting semantics by any Working Group,
>- * specification, or document instance:
>+ * <div xmlns="http://www.w3.org/1999/xhtml">
>+ * <h1>About the XML namespace</h1>
> * 
>- * base (as an attribute name): denotes an attribute whose value
>- * provides a URI to be used as the base for interpreting any
>- * relative URIs in the scope of the element on which it
>- * appears; its value is inherited. This name is reserved
>- * by virtue of its definition in the XML Base specification.
>- * 
>- * id (as an attribute name): denotes an attribute whose value
>- * should be interpreted as if declared to be of type ID.
>- * The xml:id specification is not yet a W3C Recommendation,
>- * but this attribute is included here to facilitate experimentation
>- * with the mechanisms it proposes. Note that it is _not_ included
>- * in the specialAttrs attribute group.
>- * 
>- * lang (as an attribute name): denotes an attribute whose value
>- * is a language code for the natural language of the content of
>- * any element; its value is inherited. This name is reserved
>- * by virtue of its definition in the XML specification.
>+ * <div class="bodytext">
>+ * 
>+ * This schema document describes the XML namespace, in a form
>+ * suitable for import by other schema documents.
>+ * 
>+ * 
>+ * See <a href="http://www.w3.org/XML/1998/namespace.html">
>+ * http://www.w3.org/XML/1998/namespace.html</a> and
>+ * <a href="http://www.w3.org/TR/REC-xml">
>+ * http://www.w3.org/TR/REC-xml</a> for information 
>+ * about this namespace.
>+ * 
>+ * 
>+ * Note that local names in this namespace are intended to be
>+ * defined only by the World Wide Web Consortium or its subgroups.
>+ * The names currently defined in this namespace are listed below.
>+ * They should not be used with conflicting semantics by any Working
>+ * Group, specification, or document instance.
>+ * 
>+ * 
>+ * See further below in this document for more information about <a href="#usage">how to refer to this schema document from your own
>+ * XSD schema documents</a> and about <a href="#nsversioning">the
>+ * namespace-versioning policy governing this schema document</a>.
>+ * 
>+ * </div>
>+ * </div>
> * 
>- * space (as an attribute name): denotes an attribute whose
>- * value is a keyword indicating what whitespace processing
>- * discipline is intended for the content of the element; its
>- * value is inherited. This name is reserved by virtue of its
>- * definition in the XML specification.
> * 
>- * Father (in any context at all): denotes Jon Bosak, the chair of 
>- * the original XML Working Group. This name is reserved by 
>- * the following decision of the W3C XML Plenary and 
>- * XML Coordination groups:
>- * 
>- * In appreciation for his vision, leadership and dedication
>- * the W3C XML Plenary on this 10th day of February, 2000
>- * reserves for Jon Bosak in perpetuity the XML name
>- * xml:Father
>+ * <div xmlns="http://www.w3.org/1999/xhtml">
>+ * 
>+ * <h3>Father (in any context at all)</h3> 
>+ * 
>+ * <div class="bodytext">
>+ * 
>+ * denotes Jon Bosak, the chair of 
>+ * the original XML Working Group. This name is reserved by 
>+ * the following decision of the W3C XML Plenary and 
>+ * XML Coordination groups:
>+ * 
>+ * <blockquote>
>+ * 
>+ * 	In appreciation for his vision, leadership and
>+ * 	dedication the W3C XML Plenary on this 10th day of
>+ * 	February, 2000, reserves for Jon Bosak in perpetuity
>+ * 	the XML name "xml:Father".
>+ * 
>+ * </blockquote>
>+ * </div>
>+ * </div>
> * 
>- * This schema defines attributes and an attribute group
>- * suitable for use by
>- * schemas wishing to allow xml:base, xml:lang, xml:space or xml:id
>- * attributes on elements they define.
>- * 
>- * To enable this, such a schema must import this schema
>- * for the XML namespace, e.g. as follows:
>- * &lt;schema . . .&gt;
>- * . . .
>- * &lt;import namespace="http://www.w3.org/XML/1998/namespace"
>- * schemaLocation="http://www.w3.org/2001/xml.xsd"/&gt;
> * 
>- * Subsequently, qualified reference to any of the attributes
>- * or the group defined below will have the desired effect, e.g.
>+ * <div id="usage" xml:id="usage" xmlns="http://www.w3.org/1999/xhtml">
>+ * <h2>
>+ * <a name="usage">About this schema document</a>
>+ * </h2>
>+ * 
>+ * <div class="bodytext">
>+ * 
>+ * This schema defines attributes and an attribute group suitable
>+ * for use by schemas wishing to allow <code>xml:base</code>,
>+ * <code>xml:lang</code>, <code>xml:space</code> or
>+ * <code>xml:id</code> attributes on elements they define.
>+ * 
>+ * 
>+ * To enable this, such a schema must import this schema for
>+ * the XML namespace, e.g. as follows:
>+ * 
>+ * <pre>
>+ * &lt;schema . . .&gt;
>+ * . . .
>+ * &lt;import namespace="http://www.w3.org/XML/1998/namespace"
>+ * schemaLocation="http://www.w3.org/2001/xml.xsd"/&gt;
>+ * </pre>
>+ * 
>+ * or
>+ * 
>+ * <pre>
>+ * &lt;import namespace="http://www.w3.org/XML/1998/namespace"
>+ * schemaLocation="http://www.w3.org/2009/01/xml.xsd"/&gt;
>+ * </pre>
>+ * 
>+ * Subsequently, qualified reference to any of the attributes or the
>+ * group defined below will have the desired effect, e.g.
>+ * 
>+ * <pre>
>+ * &lt;type . . .&gt;
>+ * . . .
>+ * &lt;attributeGroup ref="xml:specialAttrs"/&gt;
>+ * </pre>
>+ * 
>+ * will define a type which will schema-validate an instance element
>+ * with any of those attributes.
>+ * 
>+ * </div>
>+ * </div>
>+ * 
> * 
>- * &lt;type . . .&gt;
>- * . . .
>- * &lt;attributeGroup ref="xml:specialAttrs"/&gt;
>- * 
>- * will define a type which will schema-validate an instance
>- * element with any of those attributes
>- * In keeping with the XML Schema WG's standard versioning
>- * policy, this schema document will persist at
>- * http://www.w3.org/2005/08/xml.xsd.
>- * At the date of issue it can also be found at
>- * http://www.w3.org/2001/xml.xsd.
>- * The schema document at that URI may however change in the future,
>- * in order to remain compatible with the latest version of XML Schema
>- * itself, or with the XML namespace itself. In other words, if the XML
>- * Schema or XML namespaces change, the version of this document at
>- * http://www.w3.org/2001/xml.xsd will change
>- * accordingly; the version at
>- * http://www.w3.org/2005/08/xml.xsd will not change.
>+ * <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>
>+ * <div class="bodytext">
>+ * 
>+ * In keeping with the XML Schema WG's standard versioning
>+ * policy, this schema document will persist at
>+ * <a href="http://www.w3.org/2009/01/xml.xsd">
>+ * http://www.w3.org/2009/01/xml.xsd</a>.
>+ * 
>+ * 
>+ * At the date of issue it can also be found at
>+ * <a href="http://www.w3.org/2001/xml.xsd">
>+ * http://www.w3.org/2001/xml.xsd</a>.
>+ * 
>+ * 
>+ * The schema document at that URI may however change in the future,
>+ * in order to remain compatible with the latest version of XML
>+ * Schema itself, or with the XML namespace itself. In other words,
>+ * if the XML Schema or XML namespaces change, the version of this
>+ * document at <a href="http://www.w3.org/2001/xml.xsd">
>+ * http://www.w3.org/2001/xml.xsd 
>+ * </a> 
>+ * will change accordingly; the version at 
>+ * <a href="http://www.w3.org/2009/01/xml.xsd">
>+ * http://www.w3.org/2009/01/xml.xsd 
>+ * </a> 
>+ * will not change.
>+ * 
>+ * 
>+ * Previous dated (and unchanging) versions of this schema 
>+ * document are at:
>+ * 
>+ * <ul>
>+ * <li>
>+ * <a href="http://www.w3.org/2009/01/xml.xsd">
>+ * 	http://www.w3.org/2009/01/xml.xsd</a>
>+ * </li>
>+ * <li>
>+ * <a href="http://www.w3.org/2007/08/xml.xsd">
>+ * 	http://www.w3.org/2007/08/xml.xsd</a>
>+ * </li>
>+ * <li>
>+ * <a href="http://www.w3.org/2004/10/xml.xsd">
>+ * 	http://www.w3.org/2004/10/xml.xsd</a>
>+ * </li>
>+ * <li>
>+ * <a href="http://www.w3.org/2001/03/xml.xsd">
>+ * 	http://www.w3.org/2001/03/xml.xsd</a>
>+ * </li>
>+ * </ul>
>+ * </div>
>+ * </div>
> * 
> * 
>- * @(#)jsp_2_1.xsds	1.5 08/11/05
>+ * @(#)jsp_2_2.xsds	02/26/09
> * 
> * 
> * 
>- * Copyright 2003-2006 Sun Microsystems, Inc.
>+ * Copyright 2003-2009 Sun Microsystems, Inc.
> * 4150 Network Circle
> * Santa Clara, California 95054
> * U.S.A
>@@ -330,12 +308,12 @@
> * 
> * 
> * 
>- * This is the XML Schema for the JSP 2.1 deployment descriptor
>- * types. The JSP 2.1 schema contains all the special
>+ * This is the XML Schema for the JSP 2.2 deployment descriptor
>+ * types. The JSP 2.2 schema contains all the special
> * structures and datatypes that are necessary to use JSP files
> * from a web application.
> * 
>- * The contents of this schema is used by the web-app_2_5.xsd
>+ * The contents of this schema is used by the web-app_3_0.xsd
> * file to define JSP specific content.
> * 
> * 
>@@ -391,334 +369,336 @@
> 	WebPackage eINSTANCE = org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl.init();
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.AuthConstraintImpl Auth Constraint}' class.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.AbsoluteOrderingTypeImpl Absolute Ordering Type}' class.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.AuthConstraintImpl
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getAuthConstraint()
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.AbsoluteOrderingTypeImpl
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getAbsoluteOrderingType()
> 	 * @generated
> 	 */
>-	int AUTH_CONSTRAINT = 0;
>+	int ABSOLUTE_ORDERING_TYPE = 0;
> 
> 	/**
>-	 * The feature id for the 'Descriptions' containment reference list.
>+	 * The feature id for the 'Group' attribute list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int AUTH_CONSTRAINT__DESCRIPTIONS = 0;
>+	int ABSOLUTE_ORDERING_TYPE__GROUP = 0;
> 
> 	/**
>-	 * The feature id for the 'Role Names' attribute list.
>+	 * The feature id for the 'Name' attribute list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int AUTH_CONSTRAINT__ROLE_NAMES = 1;
>+	int ABSOLUTE_ORDERING_TYPE__NAME = 1;
> 
> 	/**
>-	 * The feature id for the 'Id' attribute.
>+	 * The feature id for the 'Others' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int AUTH_CONSTRAINT__ID = 2;
>+	int ABSOLUTE_ORDERING_TYPE__OTHERS = 2;
> 
> 	/**
>-	 * The number of structural features of the 'Auth Constraint' class.
>+	 * The number of structural features of the 'Absolute Ordering Type' class.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int AUTH_CONSTRAINT_FEATURE_COUNT = 3;
>+	int ABSOLUTE_ORDERING_TYPE_FEATURE_COUNT = 3;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.ErrorPageImpl Error Page}' class.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.AuthConstraintImpl Auth Constraint}' class.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.ErrorPageImpl
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getErrorPage()
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.AuthConstraintImpl
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getAuthConstraint()
> 	 * @generated
> 	 */
>-	int ERROR_PAGE = 1;
>+	int AUTH_CONSTRAINT = 1;
> 
> 	/**
>-	 * The feature id for the 'Error Code' attribute.
>+	 * The feature id for the 'Descriptions' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int ERROR_PAGE__ERROR_CODE = 0;
>+	int AUTH_CONSTRAINT__DESCRIPTIONS = 0;
> 
> 	/**
>-	 * The feature id for the 'Exception Type' attribute.
>+	 * The feature id for the 'Role Names' attribute list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int ERROR_PAGE__EXCEPTION_TYPE = 1;
>+	int AUTH_CONSTRAINT__ROLE_NAMES = 1;
> 
> 	/**
>-	 * The feature id for the 'Location' attribute.
>+	 * The feature id for the 'Id' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int ERROR_PAGE__LOCATION = 2;
>+	int AUTH_CONSTRAINT__ID = 2;
> 
> 	/**
>-	 * The feature id for the 'Id' attribute.
>+	 * The number of structural features of the 'Auth Constraint' class.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int ERROR_PAGE__ID = 3;
>+	int AUTH_CONSTRAINT_FEATURE_COUNT = 3;
> 
> 	/**
>-	 * The number of structural features of the 'Error Page' class.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.CookieCommentTypeImpl Cookie Comment Type}' class.
> 	 * 
> 	 * 
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.CookieCommentTypeImpl
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getCookieCommentType()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int ERROR_PAGE_FEATURE_COUNT = 4;
>+	int COOKIE_COMMENT_TYPE = 2;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.FilterImpl Filter}' class.
>+	 * The feature id for the 'Value' attribute.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.FilterImpl
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getFilter()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int FILTER = 2;
>+	int COOKIE_COMMENT_TYPE__VALUE = 0;
> 
> 	/**
>-	 * The feature id for the 'Descriptions' containment reference list.
>+	 * The number of structural features of the 'Cookie Comment Type' class.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int FILTER__DESCRIPTIONS = 0;
>+	int COOKIE_COMMENT_TYPE_FEATURE_COUNT = 1;
> 
> 	/**
>-	 * The feature id for the 'Display Names' containment reference list.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.CookieConfigTypeImpl Cookie Config Type}' class.
> 	 * 
> 	 * 
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.CookieConfigTypeImpl
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getCookieConfigType()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int FILTER__DISPLAY_NAMES = 1;
>+	int COOKIE_CONFIG_TYPE = 3;
> 
> 	/**
>-	 * The feature id for the 'Icons' containment reference list.
>+	 * The feature id for the 'Name' containment reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int FILTER__ICONS = 2;
>+	int COOKIE_CONFIG_TYPE__NAME = 0;
> 
> 	/**
>-	 * The feature id for the 'Filter Name' attribute.
>+	 * The feature id for the 'Domain' containment reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int FILTER__FILTER_NAME = 3;
>+	int COOKIE_CONFIG_TYPE__DOMAIN = 1;
> 
> 	/**
>-	 * The feature id for the 'Filter Class' attribute.
>+	 * The feature id for the 'Path' containment reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int FILTER__FILTER_CLASS = 4;
>+	int COOKIE_CONFIG_TYPE__PATH = 2;
> 
> 	/**
>-	 * The feature id for the 'Init Params' containment reference list.
>+	 * The feature id for the 'Comment' containment reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int FILTER__INIT_PARAMS = 5;
>+	int COOKIE_CONFIG_TYPE__COMMENT = 3;
> 
> 	/**
>-	 * The feature id for the 'Id' attribute.
>+	 * The feature id for the 'Http Only' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int FILTER__ID = 6;
>+	int COOKIE_CONFIG_TYPE__HTTP_ONLY = 4;
> 
> 	/**
>-	 * The number of structural features of the 'Filter' class.
>+	 * The feature id for the 'Secure' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int FILTER_FEATURE_COUNT = 7;
>+	int COOKIE_CONFIG_TYPE__SECURE = 5;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.FilterMappingImpl Filter Mapping}' class.
>+	 * The feature id for the 'Max Age' attribute.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.FilterMappingImpl
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getFilterMapping()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int FILTER_MAPPING = 3;
>+	int COOKIE_CONFIG_TYPE__MAX_AGE = 6;
> 
> 	/**
>-	 * The feature id for the 'Filter Name' attribute.
>+	 * The feature id for the 'Id' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int FILTER_MAPPING__FILTER_NAME = 0;
>+	int COOKIE_CONFIG_TYPE__ID = 7;
> 
> 	/**
>-	 * The feature id for the 'Group' attribute list.
>+	 * The number of structural features of the 'Cookie Config Type' class.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int FILTER_MAPPING__GROUP = 1;
>+	int COOKIE_CONFIG_TYPE_FEATURE_COUNT = 8;
> 
> 	/**
>-	 * The feature id for the 'Url Patterns' containment reference list.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.CookieDomainTypeImpl Cookie Domain Type}' class.
> 	 * 
> 	 * 
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.CookieDomainTypeImpl
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getCookieDomainType()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int FILTER_MAPPING__URL_PATTERNS = 2;
>+	int COOKIE_DOMAIN_TYPE = 4;
> 
> 	/**
>-	 * The feature id for the 'Servlet Names' attribute list.
>+	 * The feature id for the 'Value' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int FILTER_MAPPING__SERVLET_NAMES = 3;
>+	int COOKIE_DOMAIN_TYPE__VALUE = 0;
> 
> 	/**
>-	 * The feature id for the 'Dispatchers' attribute list.
>+	 * The number of structural features of the 'Cookie Domain Type' class.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int FILTER_MAPPING__DISPATCHERS = 4;
>+	int COOKIE_DOMAIN_TYPE_FEATURE_COUNT = 1;
> 
> 	/**
>-	 * The feature id for the 'Id' attribute.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.CookieNameTypeImpl Cookie Name Type}' class.
> 	 * 
> 	 * 
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.CookieNameTypeImpl
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getCookieNameType()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int FILTER_MAPPING__ID = 5;
>+	int COOKIE_NAME_TYPE = 5;
> 
> 	/**
>-	 * The number of structural features of the 'Filter Mapping' class.
>+	 * The feature id for the 'Value' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int FILTER_MAPPING_FEATURE_COUNT = 6;
>+	int COOKIE_NAME_TYPE__VALUE = 0;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.FormLoginConfigImpl Form Login Config}' class.
>+	 * The number of structural features of the 'Cookie Name Type' class.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.FormLoginConfigImpl
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getFormLoginConfig()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int FORM_LOGIN_CONFIG = 4;
>+	int COOKIE_NAME_TYPE_FEATURE_COUNT = 1;
> 
> 	/**
>-	 * The feature id for the 'Form Login Page' attribute.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.CookiePathTypeImpl Cookie Path Type}' class.
> 	 * 
> 	 * 
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.CookiePathTypeImpl
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getCookiePathType()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int FORM_LOGIN_CONFIG__FORM_LOGIN_PAGE = 0;
>+	int COOKIE_PATH_TYPE = 6;
> 
> 	/**
>-	 * The feature id for the 'Form Error Page' attribute.
>+	 * The feature id for the 'Value' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int FORM_LOGIN_CONFIG__FORM_ERROR_PAGE = 1;
>+	int COOKIE_PATH_TYPE__VALUE = 0;
> 
> 	/**
>-	 * The feature id for the 'Id' attribute.
>+	 * The number of structural features of the 'Cookie Path Type' class.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int FORM_LOGIN_CONFIG__ID = 2;
>+	int COOKIE_PATH_TYPE_FEATURE_COUNT = 1;
> 
> 	/**
>-	 * The number of structural features of the 'Form Login Config' class.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.ErrorPageImpl Error Page}' class.
> 	 * 
> 	 * 
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.ErrorPageImpl
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getErrorPage()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int FORM_LOGIN_CONFIG_FEATURE_COUNT = 3;
>+	int ERROR_PAGE = 7;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.LocaleEncodingMappingImpl Locale Encoding Mapping}' class.
>+	 * The feature id for the 'Error Code' attribute.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.LocaleEncodingMappingImpl
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getLocaleEncodingMapping()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int LOCALE_ENCODING_MAPPING = 5;
>+	int ERROR_PAGE__ERROR_CODE = 0;
> 
> 	/**
>-	 * The feature id for the 'Locale' attribute.
>+	 * The feature id for the 'Exception Type' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int LOCALE_ENCODING_MAPPING__LOCALE = 0;
>+	int ERROR_PAGE__EXCEPTION_TYPE = 1;
> 
> 	/**
>-	 * The feature id for the 'Encoding' attribute.
>+	 * The feature id for the 'Location' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int LOCALE_ENCODING_MAPPING__ENCODING = 1;
>+	int ERROR_PAGE__LOCATION = 2;
> 
> 	/**
> 	 * The feature id for the 'Id' attribute.
>@@ -727,90 +707,89 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int LOCALE_ENCODING_MAPPING__ID = 2;
>+	int ERROR_PAGE__ID = 3;
> 
> 	/**
>-	 * The number of structural features of the 'Locale Encoding Mapping' class.
>+	 * The number of structural features of the 'Error Page' class.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int LOCALE_ENCODING_MAPPING_FEATURE_COUNT = 3;
>+	int ERROR_PAGE_FEATURE_COUNT = 4;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.LocaleEncodingMappingListImpl Locale Encoding Mapping List}' class.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.FilterImpl Filter}' class.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.LocaleEncodingMappingListImpl
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getLocaleEncodingMappingList()
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.FilterImpl
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getFilter()
> 	 * @generated
> 	 */
>-	int LOCALE_ENCODING_MAPPING_LIST = 6;
>+	int FILTER = 8;
> 
> 	/**
>-	 * The feature id for the 'Local Encoding Mappings' containment reference list.
>+	 * The feature id for the 'Descriptions' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int LOCALE_ENCODING_MAPPING_LIST__LOCAL_ENCODING_MAPPINGS = 0;
>+	int FILTER__DESCRIPTIONS = 0;
> 
> 	/**
>-	 * The feature id for the 'Id' attribute.
>+	 * The feature id for the 'Display Names' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int LOCALE_ENCODING_MAPPING_LIST__ID = 1;
>+	int FILTER__DISPLAY_NAMES = 1;
> 
> 	/**
>-	 * The number of structural features of the 'Locale Encoding Mapping List' class.
>+	 * The feature id for the 'Icons' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int LOCALE_ENCODING_MAPPING_LIST_FEATURE_COUNT = 2;
>+	int FILTER__ICONS = 2;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.LoginConfigImpl Login Config}' class.
>+	 * The feature id for the 'Filter Name' attribute.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.LoginConfigImpl
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getLoginConfig()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int LOGIN_CONFIG = 7;
>+	int FILTER__FILTER_NAME = 3;
> 
> 	/**
>-	 * The feature id for the 'Auth Method' attribute.
>+	 * The feature id for the 'Filter Class' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int LOGIN_CONFIG__AUTH_METHOD = 0;
>+	int FILTER__FILTER_CLASS = 4;
> 
> 	/**
>-	 * The feature id for the 'Realm Name' attribute.
>+	 * The feature id for the 'Async Supported' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int LOGIN_CONFIG__REALM_NAME = 1;
>+	int FILTER__ASYNC_SUPPORTED = 5;
> 
> 	/**
>-	 * The feature id for the 'Form Login Config' containment reference.
>+	 * The feature id for the 'Init Params' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int LOGIN_CONFIG__FORM_LOGIN_CONFIG = 2;
>+	int FILTER__INIT_PARAMS = 6;
> 
> 	/**
> 	 * The feature id for the 'Id' attribute.
>@@ -819,808 +798,814 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int LOGIN_CONFIG__ID = 3;
>+	int FILTER__ID = 7;
> 
> 	/**
>-	 * The number of structural features of the 'Login Config' class.
>+	 * The number of structural features of the 'Filter' class.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int LOGIN_CONFIG_FEATURE_COUNT = 4;
>+	int FILTER_FEATURE_COUNT = 8;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.MimeMappingImpl Mime Mapping}' class.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.FilterMappingImpl Filter Mapping}' class.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.MimeMappingImpl
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getMimeMapping()
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.FilterMappingImpl
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getFilterMapping()
> 	 * @generated
> 	 */
>-	int MIME_MAPPING = 8;
>+	int FILTER_MAPPING = 9;
> 
> 	/**
>-	 * The feature id for the 'Extension' attribute.
>+	 * The feature id for the 'Filter Name' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int MIME_MAPPING__EXTENSION = 0;
>+	int FILTER_MAPPING__FILTER_NAME = 0;
> 
> 	/**
>-	 * The feature id for the 'Mime Type' attribute.
>+	 * The feature id for the 'Group' attribute list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int MIME_MAPPING__MIME_TYPE = 1;
>+	int FILTER_MAPPING__GROUP = 1;
> 
> 	/**
>-	 * The feature id for the 'Id' attribute.
>+	 * The feature id for the 'Url Patterns' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int MIME_MAPPING__ID = 2;
>+	int FILTER_MAPPING__URL_PATTERNS = 2;
> 
> 	/**
>-	 * The number of structural features of the 'Mime Mapping' class.
>+	 * The feature id for the 'Servlet Names' attribute list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int MIME_MAPPING_FEATURE_COUNT = 3;
>+	int FILTER_MAPPING__SERVLET_NAMES = 3;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.SecurityConstraintImpl Security Constraint}' class.
>+	 * The feature id for the 'Dispatchers' attribute list.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.SecurityConstraintImpl
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getSecurityConstraint()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int SECURITY_CONSTRAINT = 9;
>+	int FILTER_MAPPING__DISPATCHERS = 4;
> 
> 	/**
>-	 * The feature id for the 'Display Names' containment reference list.
>+	 * The feature id for the 'Id' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SECURITY_CONSTRAINT__DISPLAY_NAMES = 0;
>+	int FILTER_MAPPING__ID = 5;
> 
> 	/**
>-	 * The feature id for the 'Web Resource Collections' containment reference list.
>+	 * The number of structural features of the 'Filter Mapping' class.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SECURITY_CONSTRAINT__WEB_RESOURCE_COLLECTIONS = 1;
>+	int FILTER_MAPPING_FEATURE_COUNT = 6;
> 
> 	/**
>-	 * The feature id for the 'Auth Constraint' containment reference.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.FormLoginConfigImpl Form Login Config}' class.
> 	 * 
> 	 * 
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.FormLoginConfigImpl
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getFormLoginConfig()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int SECURITY_CONSTRAINT__AUTH_CONSTRAINT = 2;
>+	int FORM_LOGIN_CONFIG = 10;
> 
> 	/**
>-	 * The feature id for the 'User Data Constraint' containment reference.
>+	 * The feature id for the 'Form Login Page' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT = 3;
>+	int FORM_LOGIN_CONFIG__FORM_LOGIN_PAGE = 0;
> 
> 	/**
>-	 * The feature id for the 'Id' attribute.
>+	 * The feature id for the 'Form Error Page' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SECURITY_CONSTRAINT__ID = 4;
>+	int FORM_LOGIN_CONFIG__FORM_ERROR_PAGE = 1;
> 
> 	/**
>-	 * The number of structural features of the 'Security Constraint' class.
>+	 * The feature id for the 'Id' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SECURITY_CONSTRAINT_FEATURE_COUNT = 5;
>+	int FORM_LOGIN_CONFIG__ID = 2;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.ServletImpl Servlet}' class.
>+	 * The number of structural features of the 'Form Login Config' class.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.ServletImpl
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getServlet()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int SERVLET = 10;
>+	int FORM_LOGIN_CONFIG_FEATURE_COUNT = 3;
> 
> 	/**
>-	 * The feature id for the 'Descriptions' containment reference list.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.LocaleEncodingMappingImpl Locale Encoding Mapping}' class.
> 	 * 
> 	 * 
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.LocaleEncodingMappingImpl
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getLocaleEncodingMapping()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int SERVLET__DESCRIPTIONS = 0;
>+	int LOCALE_ENCODING_MAPPING = 11;
> 
> 	/**
>-	 * The feature id for the 'Display Names' containment reference list.
>+	 * The feature id for the 'Locale' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SERVLET__DISPLAY_NAMES = 1;
>+	int LOCALE_ENCODING_MAPPING__LOCALE = 0;
> 
> 	/**
>-	 * The feature id for the 'Icons' containment reference list.
>+	 * The feature id for the 'Encoding' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SERVLET__ICONS = 2;
>+	int LOCALE_ENCODING_MAPPING__ENCODING = 1;
> 
> 	/**
>-	 * The feature id for the 'Servlet Name' attribute.
>+	 * The feature id for the 'Id' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SERVLET__SERVLET_NAME = 3;
>+	int LOCALE_ENCODING_MAPPING__ID = 2;
> 
> 	/**
>-	 * The feature id for the 'Servlet Class' attribute.
>+	 * The number of structural features of the 'Locale Encoding Mapping' class.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SERVLET__SERVLET_CLASS = 4;
>+	int LOCALE_ENCODING_MAPPING_FEATURE_COUNT = 3;
> 
> 	/**
>-	 * The feature id for the 'Jsp File' attribute.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.LocaleEncodingMappingListImpl Locale Encoding Mapping List}' class.
> 	 * 
> 	 * 
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.LocaleEncodingMappingListImpl
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getLocaleEncodingMappingList()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int SERVLET__JSP_FILE = 5;
>+	int LOCALE_ENCODING_MAPPING_LIST = 12;
> 
> 	/**
>-	 * The feature id for the 'Init Params' containment reference list.
>+	 * The feature id for the 'Local Encoding Mappings' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SERVLET__INIT_PARAMS = 6;
>+	int LOCALE_ENCODING_MAPPING_LIST__LOCAL_ENCODING_MAPPINGS = 0;
> 
> 	/**
>-	 * The feature id for the 'Load On Startup' attribute.
>+	 * The feature id for the 'Id' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SERVLET__LOAD_ON_STARTUP = 7;
>+	int LOCALE_ENCODING_MAPPING_LIST__ID = 1;
> 
> 	/**
>-	 * The feature id for the 'Run As' containment reference.
>+	 * The number of structural features of the 'Locale Encoding Mapping List' class.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SERVLET__RUN_AS = 8;
>+	int LOCALE_ENCODING_MAPPING_LIST_FEATURE_COUNT = 2;
> 
> 	/**
>-	 * The feature id for the 'Security Role Refs' containment reference list.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.LoginConfigImpl Login Config}' class.
> 	 * 
> 	 * 
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.LoginConfigImpl
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getLoginConfig()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int SERVLET__SECURITY_ROLE_REFS = 9;
>+	int LOGIN_CONFIG = 13;
> 
> 	/**
>-	 * The feature id for the 'Id' attribute.
>+	 * The feature id for the 'Auth Method' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SERVLET__ID = 10;
>+	int LOGIN_CONFIG__AUTH_METHOD = 0;
> 
> 	/**
>-	 * The number of structural features of the 'Servlet' class.
>+	 * The feature id for the 'Realm Name' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SERVLET_FEATURE_COUNT = 11;
>+	int LOGIN_CONFIG__REALM_NAME = 1;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.ServletMappingImpl Servlet Mapping}' class.
>+	 * The feature id for the 'Form Login Config' containment reference.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.ServletMappingImpl
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getServletMapping()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int SERVLET_MAPPING = 11;
>+	int LOGIN_CONFIG__FORM_LOGIN_CONFIG = 2;
> 
> 	/**
>-	 * The feature id for the 'Servlet Name' attribute.
>+	 * The feature id for the 'Id' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SERVLET_MAPPING__SERVLET_NAME = 0;
>+	int LOGIN_CONFIG__ID = 3;
> 
> 	/**
>-	 * The feature id for the 'Url Patterns' containment reference list.
>+	 * The number of structural features of the 'Login Config' class.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SERVLET_MAPPING__URL_PATTERNS = 1;
>+	int LOGIN_CONFIG_FEATURE_COUNT = 4;
> 
> 	/**
>-	 * The feature id for the 'Id' attribute.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.MimeMappingImpl Mime Mapping}' class.
> 	 * 
> 	 * 
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.MimeMappingImpl
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getMimeMapping()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int SERVLET_MAPPING__ID = 2;
>+	int MIME_MAPPING = 14;
> 
> 	/**
>-	 * The number of structural features of the 'Servlet Mapping' class.
>+	 * The feature id for the 'Extension' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SERVLET_MAPPING_FEATURE_COUNT = 3;
>+	int MIME_MAPPING__EXTENSION = 0;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.SessionConfigImpl Session Config}' class.
>+	 * The feature id for the 'Mime Type' attribute.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.SessionConfigImpl
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getSessionConfig()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int SESSION_CONFIG = 12;
>+	int MIME_MAPPING__MIME_TYPE = 1;
> 
> 	/**
>-	 * The feature id for the 'Session Timeout' attribute.
>+	 * The feature id for the 'Id' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SESSION_CONFIG__SESSION_TIMEOUT = 0;
>+	int MIME_MAPPING__ID = 2;
> 
> 	/**
>-	 * The feature id for the 'Id' attribute.
>+	 * The number of structural features of the 'Mime Mapping' class.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SESSION_CONFIG__ID = 1;
>+	int MIME_MAPPING_FEATURE_COUNT = 3;
> 
> 	/**
>-	 * The number of structural features of the 'Session Config' class.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.MultipartConfigTypeImpl Multipart Config Type}' class.
> 	 * 
> 	 * 
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.MultipartConfigTypeImpl
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getMultipartConfigType()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int SESSION_CONFIG_FEATURE_COUNT = 2;
>+	int MULTIPART_CONFIG_TYPE = 15;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.UserDataConstraintImpl User Data Constraint}' class.
>+	 * The feature id for the 'Location' attribute.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.UserDataConstraintImpl
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getUserDataConstraint()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int USER_DATA_CONSTRAINT = 13;
>+	int MULTIPART_CONFIG_TYPE__LOCATION = 0;
> 
> 	/**
>-	 * The feature id for the 'Descriptions' containment reference list.
>+	 * The feature id for the 'Max File Size' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int USER_DATA_CONSTRAINT__DESCRIPTIONS = 0;
>+	int MULTIPART_CONFIG_TYPE__MAX_FILE_SIZE = 1;
> 
> 	/**
>-	 * The feature id for the 'Transport Guarantee' attribute.
>+	 * The feature id for the 'Max Request Size' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int USER_DATA_CONSTRAINT__TRANSPORT_GUARANTEE = 1;
>+	int MULTIPART_CONFIG_TYPE__MAX_REQUEST_SIZE = 2;
> 
> 	/**
>-	 * The feature id for the 'Id' attribute.
>+	 * The feature id for the 'File Size Threshold' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int USER_DATA_CONSTRAINT__ID = 2;
>+	int MULTIPART_CONFIG_TYPE__FILE_SIZE_THRESHOLD = 3;
> 
> 	/**
>-	 * The number of structural features of the 'User Data Constraint' class.
>+	 * The number of structural features of the 'Multipart Config Type' class.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int USER_DATA_CONSTRAINT_FEATURE_COUNT = 3;
>+	int MULTIPART_CONFIG_TYPE_FEATURE_COUNT = 4;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl App}' class.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.OrderingOrderingTypeImpl Ordering Ordering Type}' class.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebAppImpl
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getWebApp()
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.OrderingOrderingTypeImpl
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getOrderingOrderingType()
> 	 * @generated
> 	 */
>-	int WEB_APP = 14;
>+	int ORDERING_ORDERING_TYPE = 16;
> 
> 	/**
>-	 * The feature id for the 'Group' attribute list.
>+	 * The feature id for the 'Name' attribute list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int WEB_APP__GROUP = 0;
>+	int ORDERING_ORDERING_TYPE__NAME = 0;
> 
> 	/**
>-	 * The feature id for the 'Descriptions' containment reference list.
>+	 * The feature id for the 'Others' containment reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int WEB_APP__DESCRIPTIONS = 1;
>+	int ORDERING_ORDERING_TYPE__OTHERS = 1;
> 
> 	/**
>-	 * The feature id for the 'Display Names' containment reference list.
>+	 * The number of structural features of the 'Ordering Ordering Type' class.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int WEB_APP__DISPLAY_NAMES = 2;
>+	int ORDERING_ORDERING_TYPE_FEATURE_COUNT = 2;
> 
> 	/**
>-	 * The feature id for the 'Icons' containment reference list.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.OrderingOthersTypeImpl Ordering Others Type}' class.
> 	 * 
> 	 * 
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.OrderingOthersTypeImpl
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getOrderingOthersType()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int WEB_APP__ICONS = 3;
>+	int ORDERING_OTHERS_TYPE = 17;
> 
> 	/**
>-	 * The feature id for the 'Distributables' containment reference list.
>+	 * The feature id for the 'Id' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int WEB_APP__DISTRIBUTABLES = 4;
>+	int ORDERING_OTHERS_TYPE__ID = 0;
> 
> 	/**
>-	 * The feature id for the 'Context Params' containment reference list.
>+	 * The number of structural features of the 'Ordering Others Type' class.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int WEB_APP__CONTEXT_PARAMS = 5;
>+	int ORDERING_OTHERS_TYPE_FEATURE_COUNT = 1;
> 
> 	/**
>-	 * The feature id for the 'Filters' containment reference list.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.OrderingTypeImpl Ordering Type}' class.
> 	 * 
> 	 * 
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.OrderingTypeImpl
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getOrderingType()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int WEB_APP__FILTERS = 6;
>+	int ORDERING_TYPE = 18;
> 
> 	/**
>-	 * The feature id for the 'Filter Mappings' containment reference list.
>+	 * The feature id for the 'After' containment reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int WEB_APP__FILTER_MAPPINGS = 7;
>+	int ORDERING_TYPE__AFTER = 0;
> 
> 	/**
>-	 * The feature id for the 'Listeners' containment reference list.
>+	 * The feature id for the 'Before' containment reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int WEB_APP__LISTENERS = 8;
>+	int ORDERING_TYPE__BEFORE = 1;
> 
> 	/**
>-	 * The feature id for the 'Servlets' containment reference list.
>+	 * The number of structural features of the 'Ordering Type' class.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int WEB_APP__SERVLETS = 9;
>+	int ORDERING_TYPE_FEATURE_COUNT = 2;
> 
> 	/**
>-	 * The feature id for the 'Servlet Mappings' containment reference list.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.SecurityConstraintImpl Security Constraint}' class.
> 	 * 
> 	 * 
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.SecurityConstraintImpl
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getSecurityConstraint()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int WEB_APP__SERVLET_MAPPINGS = 10;
>+	int SECURITY_CONSTRAINT = 19;
> 
> 	/**
>-	 * The feature id for the 'Session Configs' containment reference list.
>+	 * The feature id for the 'Display Names' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int WEB_APP__SESSION_CONFIGS = 11;
>+	int SECURITY_CONSTRAINT__DISPLAY_NAMES = 0;
> 
> 	/**
>-	 * The feature id for the 'Mime Mappings' containment reference list.
>+	 * The feature id for the 'Web Resource Collections' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int WEB_APP__MIME_MAPPINGS = 12;
>+	int SECURITY_CONSTRAINT__WEB_RESOURCE_COLLECTIONS = 1;
> 
> 	/**
>-	 * The feature id for the 'Welcome File Lists' containment reference list.
>+	 * The feature id for the 'Auth Constraint' containment reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int WEB_APP__WELCOME_FILE_LISTS = 13;
>+	int SECURITY_CONSTRAINT__AUTH_CONSTRAINT = 2;
> 
> 	/**
>-	 * The feature id for the 'Error Pages' containment reference list.
>+	 * The feature id for the 'User Data Constraint' containment reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int WEB_APP__ERROR_PAGES = 14;
>+	int SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT = 3;
> 
> 	/**
>-	 * The feature id for the 'Jsp Configs' containment reference list.
>+	 * The feature id for the 'Id' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int WEB_APP__JSP_CONFIGS = 15;
>+	int SECURITY_CONSTRAINT__ID = 4;
> 
> 	/**
>-	 * The feature id for the 'Security Constraints' containment reference list.
>+	 * The number of structural features of the 'Security Constraint' class.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int WEB_APP__SECURITY_CONSTRAINTS = 16;
>+	int SECURITY_CONSTRAINT_FEATURE_COUNT = 5;
> 
> 	/**
>-	 * The feature id for the 'Login Configs' containment reference list.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.ServletImpl Servlet}' class.
> 	 * 
> 	 * 
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.ServletImpl
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getServlet()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int WEB_APP__LOGIN_CONFIGS = 17;
>+	int SERVLET = 20;
> 
> 	/**
>-	 * The feature id for the 'Security Roles' containment reference list.
>+	 * The feature id for the 'Descriptions' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int WEB_APP__SECURITY_ROLES = 18;
>+	int SERVLET__DESCRIPTIONS = 0;
> 
> 	/**
>-	 * The feature id for the 'Env Entries' containment reference list.
>+	 * The feature id for the 'Display Names' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int WEB_APP__ENV_ENTRIES = 19;
>+	int SERVLET__DISPLAY_NAMES = 1;
> 
> 	/**
>-	 * The feature id for the 'Ejb Refs' containment reference list.
>+	 * The feature id for the 'Icons' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int WEB_APP__EJB_REFS = 20;
>+	int SERVLET__ICONS = 2;
> 
> 	/**
>-	 * The feature id for the 'Ejb Local Refs' containment reference list.
>+	 * The feature id for the 'Servlet Name' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int WEB_APP__EJB_LOCAL_REFS = 21;
>+	int SERVLET__SERVLET_NAME = 3;
> 
> 	/**
>-	 * The feature id for the 'Service Refs' containment reference list.
>+	 * The feature id for the 'Servlet Class' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int WEB_APP__SERVICE_REFS = 22;
>+	int SERVLET__SERVLET_CLASS = 4;
> 
> 	/**
>-	 * The feature id for the 'Resource Refs' containment reference list.
>+	 * The feature id for the 'Jsp File' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int WEB_APP__RESOURCE_REFS = 23;
>+	int SERVLET__JSP_FILE = 5;
> 
> 	/**
>-	 * The feature id for the 'Resource Env Refs' containment reference list.
>+	 * The feature id for the 'Init Params' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int WEB_APP__RESOURCE_ENV_REFS = 24;
>+	int SERVLET__INIT_PARAMS = 6;
> 
> 	/**
>-	 * The feature id for the 'Message Destination Refs' containment reference list.
>+	 * The feature id for the 'Load On Startup' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int WEB_APP__MESSAGE_DESTINATION_REFS = 25;
>+	int SERVLET__LOAD_ON_STARTUP = 7;
> 
> 	/**
>-	 * The feature id for the 'Persistence Context Refs' containment reference list.
>+	 * The feature id for the 'Enabled' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int WEB_APP__PERSISTENCE_CONTEXT_REFS = 26;
>+	int SERVLET__ENABLED = 8;
> 
> 	/**
>-	 * The feature id for the 'Persistence Unit Refs' containment reference list.
>+	 * The feature id for the 'Async Supported' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int WEB_APP__PERSISTENCE_UNIT_REFS = 27;
>+	int SERVLET__ASYNC_SUPPORTED = 9;
> 
> 	/**
>-	 * The feature id for the 'Post Constructs' containment reference list.
>+	 * The feature id for the 'Run As' containment reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int WEB_APP__POST_CONSTRUCTS = 28;
>+	int SERVLET__RUN_AS = 10;
> 
> 	/**
>-	 * The feature id for the 'Pre Destroys' containment reference list.
>+	 * The feature id for the 'Security Role Refs' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int WEB_APP__PRE_DESTROYS = 29;
>+	int SERVLET__SECURITY_ROLE_REFS = 11;
> 
> 	/**
>-	 * The feature id for the 'Message Destinations' containment reference list.
>+	 * The feature id for the 'Multipart Config' containment reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int WEB_APP__MESSAGE_DESTINATIONS = 30;
>+	int SERVLET__MULTIPART_CONFIG = 12;
> 
> 	/**
>-	 * The feature id for the 'Local Encoding Mappings Lists' containment reference list.
>+	 * The feature id for the 'Id' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS = 31;
>+	int SERVLET__ID = 13;
> 
> 	/**
>-	 * The feature id for the 'Id' attribute.
>+	 * The number of structural features of the 'Servlet' class.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int WEB_APP__ID = 32;
>+	int SERVLET_FEATURE_COUNT = 14;
> 
> 	/**
>-	 * The feature id for the 'Metadata Complete' attribute.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.ServletMappingImpl Servlet Mapping}' class.
> 	 * 
> 	 * 
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.ServletMappingImpl
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getServletMapping()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int WEB_APP__METADATA_COMPLETE = 33;
>+	int SERVLET_MAPPING = 21;
> 
> 	/**
>-	 * The feature id for the 'Version' attribute.
>+	 * The feature id for the 'Servlet Name' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int WEB_APP__VERSION = 34;
>+	int SERVLET_MAPPING__SERVLET_NAME = 0;
> 
> 	/**
>-	 * The number of structural features of the 'App' class.
>+	 * The feature id for the 'Url Patterns' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int WEB_APP_FEATURE_COUNT = 35;
>+	int SERVLET_MAPPING__URL_PATTERNS = 1;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.WebAppDeploymentDescriptorImpl App Deployment Descriptor}' class.
>+	 * The feature id for the 'Id' attribute.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebAppDeploymentDescriptorImpl
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getWebAppDeploymentDescriptor()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int WEB_APP_DEPLOYMENT_DESCRIPTOR = 15;
>+	int SERVLET_MAPPING__ID = 2;
> 
> 	/**
>-	 * The feature id for the 'Mixed' attribute list.
>+	 * The number of structural features of the 'Servlet Mapping' class.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int WEB_APP_DEPLOYMENT_DESCRIPTOR__MIXED = 0;
>+	int SERVLET_MAPPING_FEATURE_COUNT = 3;
> 
> 	/**
>-	 * The feature id for the 'XMLNS Prefix Map' map.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.SessionConfigImpl Session Config}' class.
> 	 * 
> 	 * 
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.SessionConfigImpl
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getSessionConfig()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int WEB_APP_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP = 1;
>+	int SESSION_CONFIG = 22;
> 
> 	/**
>-	 * The feature id for the 'XSI Schema Location' map.
>+	 * The feature id for the 'Session Timeout' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int WEB_APP_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION = 2;
>+	int SESSION_CONFIG__SESSION_TIMEOUT = 0;
> 
> 	/**
>-	 * The feature id for the 'Web App' containment reference.
>+	 * The feature id for the 'Cookie Config' containment reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int WEB_APP_DEPLOYMENT_DESCRIPTOR__WEB_APP = 3;
>+	int SESSION_CONFIG__COOKIE_CONFIG = 1;
> 
> 	/**
>-	 * The number of structural features of the 'App Deployment Descriptor' class.
>+	 * The feature id for the 'Tracking Mode' attribute list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int WEB_APP_DEPLOYMENT_DESCRIPTOR_FEATURE_COUNT = 4;
>+	int SESSION_CONFIG__TRACKING_MODE = 2;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.WebResourceCollectionImpl Resource Collection}' class.
>+	 * The feature id for the 'Id' attribute.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebResourceCollectionImpl
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getWebResourceCollection()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int WEB_RESOURCE_COLLECTION = 16;
>+	int SESSION_CONFIG__ID = 3;
> 
> 	/**
>-	 * The feature id for the 'Web Resource Name' attribute.
>+	 * The number of structural features of the 'Session Config' class.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int WEB_RESOURCE_COLLECTION__WEB_RESOURCE_NAME = 0;
>+	int SESSION_CONFIG_FEATURE_COUNT = 4;
> 
> 	/**
>-	 * The feature id for the 'Descriptions' containment reference list.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.UserDataConstraintImpl User Data Constraint}' class.
> 	 * 
> 	 * 
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.UserDataConstraintImpl
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getUserDataConstraint()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int WEB_RESOURCE_COLLECTION__DESCRIPTIONS = 1;
>+	int USER_DATA_CONSTRAINT = 23;
> 
> 	/**
>-	 * The feature id for the 'Url Patterns' containment reference list.
>+	 * The feature id for the 'Descriptions' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int WEB_RESOURCE_COLLECTION__URL_PATTERNS = 2;
>+	int USER_DATA_CONSTRAINT__DESCRIPTIONS = 0;
> 
> 	/**
>-	 * The feature id for the 'Http Methods' attribute list.
>+	 * The feature id for the 'Transport Guarantee' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int WEB_RESOURCE_COLLECTION__HTTP_METHODS = 3;
>+	int USER_DATA_CONSTRAINT__TRANSPORT_GUARANTEE = 1;
> 
> 	/**
> 	 * The feature id for the 'Id' attribute.
>@@ -1629,1859 +1614,4315 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int WEB_RESOURCE_COLLECTION__ID = 4;
>+	int USER_DATA_CONSTRAINT__ID = 2;
> 
> 	/**
>-	 * The number of structural features of the 'Resource Collection' class.
>+	 * The number of structural features of the 'User Data Constraint' class.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int WEB_RESOURCE_COLLECTION_FEATURE_COUNT = 5;
>+	int USER_DATA_CONSTRAINT_FEATURE_COUNT = 3;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.WelcomeFileListImpl Welcome File List}' class.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl App}' class.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.WelcomeFileListImpl
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getWelcomeFileList()
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebAppImpl
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getWebApp()
> 	 * @generated
> 	 */
>-	int WELCOME_FILE_LIST = 17;
>+	int WEB_APP = 24;
> 
> 	/**
>-	 * The feature id for the 'Welcome Files' attribute list.
>+	 * The feature id for the 'Group' attribute list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int WELCOME_FILE_LIST__WELCOME_FILES = 0;
>+	int WEB_APP__GROUP = 0;
> 
> 	/**
>-	 * The feature id for the 'Id' attribute.
>+	 * The feature id for the 'Descriptions' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int WELCOME_FILE_LIST__ID = 1;
>+	int WEB_APP__DESCRIPTIONS = 1;
> 
> 	/**
>-	 * The number of structural features of the 'Welcome File List' class.
>+	 * The feature id for the 'Display Names' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int WELCOME_FILE_LIST_FEATURE_COUNT = 2;
>+	int WEB_APP__DISPLAY_NAMES = 2;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.DispatcherType Dispatcher Type}' enum.
>+	 * The feature id for the 'Icons' containment reference list.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.web.DispatcherType
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getDispatcherType()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int DISPATCHER_TYPE = 18;
>+	int WEB_APP__ICONS = 3;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.NullCharType Null Char Type}' enum.
>+	 * The feature id for the 'Name' attribute list.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.web.NullCharType
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getNullCharType()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int NULL_CHAR_TYPE = 19;
>+	int WEB_APP__NAME = 4;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.TransportGuaranteeType Transport Guarantee Type}' enum.
>+	 * The feature id for the 'Distributables' containment reference list.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.web.TransportGuaranteeType
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getTransportGuaranteeType()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int TRANSPORT_GUARANTEE_TYPE = 20;
>+	int WEB_APP__DISTRIBUTABLES = 5;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.WebAppVersionType App Version Type}' enum.
>+	 * The feature id for the 'Context Params' containment reference list.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.web.WebAppVersionType
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getWebAppVersionType()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int WEB_APP_VERSION_TYPE = 21;
>+	int WEB_APP__CONTEXT_PARAMS = 6;
> 
> 	/**
>-	 * The meta object id for the 'Auth Method Type' data type.
>+	 * The feature id for the 'Filters' containment reference list.
> 	 * 
> 	 * 
>-	 * @see java.lang.String
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getAuthMethodType()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int AUTH_METHOD_TYPE = 22;
>+	int WEB_APP__FILTERS = 7;
> 
> 	/**
>-	 * The meta object id for the 'Dispatcher Type Object' data type.
>+	 * The feature id for the 'Filter Mappings' containment reference list.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.web.DispatcherType
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getDispatcherTypeObject()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int DISPATCHER_TYPE_OBJECT = 23;
>+	int WEB_APP__FILTER_MAPPINGS = 8;
> 
> 	/**
>-	 * The meta object id for the 'Encoding Type' data type.
>+	 * The feature id for the 'Listeners' containment reference list.
> 	 * 
> 	 * 
>-	 * @see java.lang.String
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getEncodingType()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int ENCODING_TYPE = 24;
>+	int WEB_APP__LISTENERS = 9;
> 
> 	/**
>-	 * The meta object id for the 'Error Code Type' data type.
>+	 * The feature id for the 'Servlets' containment reference list.
> 	 * 
> 	 * 
>-	 * @see java.math.BigInteger
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getErrorCodeType()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int ERROR_CODE_TYPE = 25;
>+	int WEB_APP__SERVLETS = 10;
> 
> 	/**
>-	 * The meta object id for the 'Filter Name Type' data type.
>+	 * The feature id for the 'Servlet Mappings' containment reference list.
> 	 * 
> 	 * 
>-	 * @see java.lang.String
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getFilterNameType()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int FILTER_NAME_TYPE = 26;
>+	int WEB_APP__SERVLET_MAPPINGS = 11;
> 
> 	/**
>-	 * The meta object id for the 'Http Method Type' data type.
>+	 * The feature id for the 'Session Configs' containment reference list.
> 	 * 
> 	 * 
>-	 * @see java.lang.String
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getHttpMethodType()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int HTTP_METHOD_TYPE = 27;
>+	int WEB_APP__SESSION_CONFIGS = 12;
> 
> 	/**
>-	 * The meta object id for the 'Load On Startup Type' data type.
>+	 * The feature id for the 'Mime Mappings' containment reference list.
> 	 * 
> 	 * 
>-	 * @see java.lang.Object
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getLoadOnStartupType()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int LOAD_ON_STARTUP_TYPE = 28;
>+	int WEB_APP__MIME_MAPPINGS = 13;
> 
> 	/**
>-	 * The meta object id for the 'Locale Type' data type.
>+	 * The feature id for the 'Welcome File Lists' containment reference list.
> 	 * 
> 	 * 
>-	 * @see java.lang.String
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getLocaleType()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int LOCALE_TYPE = 29;
>+	int WEB_APP__WELCOME_FILE_LISTS = 14;
> 
> 	/**
>-	 * The meta object id for the 'Mime Type Type' data type.
>+	 * The feature id for the 'Error Pages' containment reference list.
> 	 * 
> 	 * 
>-	 * @see java.lang.String
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getMimeTypeType()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int MIME_TYPE_TYPE = 30;
>+	int WEB_APP__ERROR_PAGES = 15;
> 
> 	/**
>-	 * The meta object id for the 'Non Empty String Type' data type.
>+	 * The feature id for the 'Jsp Configs' containment reference list.
> 	 * 
> 	 * 
>-	 * @see java.lang.String
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getNonEmptyStringType()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int NON_EMPTY_STRING_TYPE = 31;
>+	int WEB_APP__JSP_CONFIGS = 16;
> 
> 	/**
>-	 * The meta object id for the 'Null Char Type Object' data type.
>+	 * The feature id for the 'Security Constraints' containment reference list.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.web.NullCharType
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getNullCharTypeObject()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int NULL_CHAR_TYPE_OBJECT = 32;
>+	int WEB_APP__SECURITY_CONSTRAINTS = 17;
> 
> 	/**
>-	 * The meta object id for the 'Servlet Name Type' data type.
>+	 * The feature id for the 'Login Configs' containment reference list.
> 	 * 
> 	 * 
>-	 * @see java.lang.String
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getServletNameType()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int SERVLET_NAME_TYPE = 33;
>+	int WEB_APP__LOGIN_CONFIGS = 18;
> 
> 	/**
>-	 * The meta object id for the 'Transport Guarantee Type Object' data type.
>+	 * The feature id for the 'Security Roles' containment reference list.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.web.TransportGuaranteeType
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getTransportGuaranteeTypeObject()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int TRANSPORT_GUARANTEE_TYPE_OBJECT = 34;
>+	int WEB_APP__SECURITY_ROLES = 19;
> 
> 	/**
>-	 * The meta object id for the 'War Path Type' data type.
>+	 * The feature id for the 'Env Entries' containment reference list.
> 	 * 
> 	 * 
>-	 * @see java.lang.String
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getWarPathType()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int WAR_PATH_TYPE = 35;
>+	int WEB_APP__ENV_ENTRIES = 20;
> 
> 	/**
>-	 * The meta object id for the 'App Version Type Object' data type.
>+	 * The feature id for the 'Ejb Refs' containment reference list.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.web.WebAppVersionType
>-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getWebAppVersionTypeObject()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int WEB_APP_VERSION_TYPE_OBJECT = 36;
>-
>+	int WEB_APP__EJB_REFS = 21;
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.AuthConstraint Auth Constraint}'.
>+	 * The feature id for the 'Ejb Local Refs' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'Auth Constraint'.
>-	 * @see org.eclipse.jst.javaee.web.AuthConstraint
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EClass getAuthConstraint();
>+	int WEB_APP__EJB_LOCAL_REFS = 22;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.AuthConstraint#getDescriptions Descriptions}'.
>+	 * The feature id for the 'Service Refs' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Descriptions'.
>-	 * @see org.eclipse.jst.javaee.web.AuthConstraint#getDescriptions()
>-	 * @see #getAuthConstraint()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EReference getAuthConstraint_Descriptions();
>+	int WEB_APP__SERVICE_REFS = 23;
> 
> 	/**
>-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.web.AuthConstraint#getRoleNames Role Names}'.
>+	 * The feature id for the 'Resource Refs' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute list 'Role Names'.
>-	 * @see org.eclipse.jst.javaee.web.AuthConstraint#getRoleNames()
>-	 * @see #getAuthConstraint()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getAuthConstraint_RoleNames();
>+	int WEB_APP__RESOURCE_REFS = 24;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.AuthConstraint#getId Id}'.
>+	 * The feature id for the 'Resource Env Refs' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.web.AuthConstraint#getId()
>-	 * @see #getAuthConstraint()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getAuthConstraint_Id();
>+	int WEB_APP__RESOURCE_ENV_REFS = 25;
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.ErrorPage Error Page}'.
>+	 * The feature id for the 'Message Destination Refs' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'Error Page'.
>-	 * @see org.eclipse.jst.javaee.web.ErrorPage
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EClass getErrorPage();
>+	int WEB_APP__MESSAGE_DESTINATION_REFS = 26;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.ErrorPage#getErrorCode Error Code}'.
>+	 * The feature id for the 'Persistence Context Refs' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Error Code'.
>-	 * @see org.eclipse.jst.javaee.web.ErrorPage#getErrorCode()
>-	 * @see #getErrorPage()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getErrorPage_ErrorCode();
>+	int WEB_APP__PERSISTENCE_CONTEXT_REFS = 27;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.ErrorPage#getExceptionType Exception Type}'.
>+	 * The feature id for the 'Persistence Unit Refs' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Exception Type'.
>-	 * @see org.eclipse.jst.javaee.web.ErrorPage#getExceptionType()
>-	 * @see #getErrorPage()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getErrorPage_ExceptionType();
>+	int WEB_APP__PERSISTENCE_UNIT_REFS = 28;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.ErrorPage#getLocation Location}'.
>+	 * The feature id for the 'Post Constructs' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Location'.
>-	 * @see org.eclipse.jst.javaee.web.ErrorPage#getLocation()
>-	 * @see #getErrorPage()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getErrorPage_Location();
>+	int WEB_APP__POST_CONSTRUCTS = 29;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.ErrorPage#getId Id}'.
>+	 * The feature id for the 'Pre Destroys' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.web.ErrorPage#getId()
>-	 * @see #getErrorPage()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getErrorPage_Id();
>+	int WEB_APP__PRE_DESTROYS = 30;
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.Filter Filter}'.
>+	 * The feature id for the 'Data Source' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'Filter'.
>-	 * @see org.eclipse.jst.javaee.web.Filter
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EClass getFilter();
>+	int WEB_APP__DATA_SOURCE = 31;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.Filter#getDescriptions Descriptions}'.
>+	 * The feature id for the 'Message Destinations' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Descriptions'.
>-	 * @see org.eclipse.jst.javaee.web.Filter#getDescriptions()
>-	 * @see #getFilter()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EReference getFilter_Descriptions();
>+	int WEB_APP__MESSAGE_DESTINATIONS = 32;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.Filter#getDisplayNames Display Names}'.
>+	 * The feature id for the 'Local Encoding Mappings Lists' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Display Names'.
>-	 * @see org.eclipse.jst.javaee.web.Filter#getDisplayNames()
>-	 * @see #getFilter()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EReference getFilter_DisplayNames();
>+	int WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS = 33;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.Filter#getIcons Icons}'.
>+	 * The feature id for the 'Module Name' attribute list.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Icons'.
>-	 * @see org.eclipse.jst.javaee.web.Filter#getIcons()
>-	 * @see #getFilter()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EReference getFilter_Icons();
>+	int WEB_APP__MODULE_NAME = 34;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.Filter#getFilterName Filter Name}'.
>+	 * The feature id for the 'Absolute Ordering' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Filter Name'.
>-	 * @see org.eclipse.jst.javaee.web.Filter#getFilterName()
>-	 * @see #getFilter()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getFilter_FilterName();
>+	int WEB_APP__ABSOLUTE_ORDERING = 35;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.Filter#getFilterClass Filter Class}'.
>+	 * The feature id for the 'Id' attribute.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Filter Class'.
>-	 * @see org.eclipse.jst.javaee.web.Filter#getFilterClass()
>-	 * @see #getFilter()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getFilter_FilterClass();
>+	int WEB_APP__ID = 36;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.Filter#getInitParams Init Params}'.
>+	 * The feature id for the 'Metadata Complete' attribute.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Init Params'.
>-	 * @see org.eclipse.jst.javaee.web.Filter#getInitParams()
>-	 * @see #getFilter()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EReference getFilter_InitParams();
>+	int WEB_APP__METADATA_COMPLETE = 37;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.Filter#getId Id}'.
>+	 * The feature id for the 'Version' attribute.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.web.Filter#getId()
>-	 * @see #getFilter()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getFilter_Id();
>+	int WEB_APP__VERSION = 38;
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.FilterMapping Filter Mapping}'.
>+	 * The number of structural features of the 'App' class.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'Filter Mapping'.
>-	 * @see org.eclipse.jst.javaee.web.FilterMapping
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EClass getFilterMapping();
>+	int WEB_APP_FEATURE_COUNT = 39;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.FilterMapping#getFilterName Filter Name}'.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.WebAppDeploymentDescriptorImpl App Deployment Descriptor}' class.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Filter Name'.
>-	 * @see org.eclipse.jst.javaee.web.FilterMapping#getFilterName()
>-	 * @see #getFilterMapping()
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebAppDeploymentDescriptorImpl
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getWebAppDeploymentDescriptor()
> 	 * @generated
> 	 */
>-	EAttribute getFilterMapping_FilterName();
>+	int WEB_APP_DEPLOYMENT_DESCRIPTOR = 25;
> 
> 	/**
>-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.web.FilterMapping#getGroup Group}'.
>+	 * The feature id for the 'Mixed' attribute list.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute list 'Group'.
>-	 * @see org.eclipse.jst.javaee.web.FilterMapping#getGroup()
>-	 * @see #getFilterMapping()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getFilterMapping_Group();
>+	int WEB_APP_DEPLOYMENT_DESCRIPTOR__MIXED = 0;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.FilterMapping#getUrlPatterns Url Patterns}'.
>+	 * The feature id for the 'XMLNS Prefix Map' map.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Url Patterns'.
>-	 * @see org.eclipse.jst.javaee.web.FilterMapping#getUrlPatterns()
>-	 * @see #getFilterMapping()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EReference getFilterMapping_UrlPatterns();
>+	int WEB_APP_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP = 1;
> 
> 	/**
>-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.web.FilterMapping#getServletNames Servlet Names}'.
>+	 * The feature id for the 'XSI Schema Location' map.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute list 'Servlet Names'.
>-	 * @see org.eclipse.jst.javaee.web.FilterMapping#getServletNames()
>-	 * @see #getFilterMapping()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getFilterMapping_ServletNames();
>+	int WEB_APP_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION = 2;
> 
> 	/**
>-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.web.FilterMapping#getDispatchers Dispatchers}'.
>+	 * The feature id for the 'Web App' containment reference.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute list 'Dispatchers'.
>-	 * @see org.eclipse.jst.javaee.web.FilterMapping#getDispatchers()
>-	 * @see #getFilterMapping()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getFilterMapping_Dispatchers();
>+	int WEB_APP_DEPLOYMENT_DESCRIPTOR__WEB_APP = 3;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.FilterMapping#getId Id}'.
>+	 * The number of structural features of the 'App Deployment Descriptor' class.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.web.FilterMapping#getId()
>-	 * @see #getFilterMapping()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getFilterMapping_Id();
>+	int WEB_APP_DEPLOYMENT_DESCRIPTOR_FEATURE_COUNT = 4;
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.FormLoginConfig Form Login Config}'.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl Fragment}' class.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'Form Login Config'.
>-	 * @see org.eclipse.jst.javaee.web.FormLoginConfig
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getWebFragment()
> 	 * @generated
> 	 */
>-	EClass getFormLoginConfig();
>+	int WEB_FRAGMENT = 26;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.FormLoginConfig#getFormLoginPage Form Login Page}'.
>+	 * The feature id for the 'Group' attribute list.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Form Login Page'.
>-	 * @see org.eclipse.jst.javaee.web.FormLoginConfig#getFormLoginPage()
>-	 * @see #getFormLoginConfig()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getFormLoginConfig_FormLoginPage();
>+	int WEB_FRAGMENT__GROUP = 0;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.FormLoginConfig#getFormErrorPage Form Error Page}'.
>+	 * The feature id for the 'Descriptions' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Form Error Page'.
>-	 * @see org.eclipse.jst.javaee.web.FormLoginConfig#getFormErrorPage()
>-	 * @see #getFormLoginConfig()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getFormLoginConfig_FormErrorPage();
>+	int WEB_FRAGMENT__DESCRIPTIONS = 1;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.FormLoginConfig#getId Id}'.
>+	 * The feature id for the 'Display Names' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.web.FormLoginConfig#getId()
>-	 * @see #getFormLoginConfig()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getFormLoginConfig_Id();
>+	int WEB_FRAGMENT__DISPLAY_NAMES = 2;
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.LocaleEncodingMapping Locale Encoding Mapping}'.
>+	 * The feature id for the 'Icons' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'Locale Encoding Mapping'.
>-	 * @see org.eclipse.jst.javaee.web.LocaleEncodingMapping
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EClass getLocaleEncodingMapping();
>+	int WEB_FRAGMENT__ICONS = 3;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.LocaleEncodingMapping#getLocale Locale}'.
>+	 * The feature id for the 'Name' attribute list.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Locale'.
>-	 * @see org.eclipse.jst.javaee.web.LocaleEncodingMapping#getLocale()
>-	 * @see #getLocaleEncodingMapping()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getLocaleEncodingMapping_Locale();
>+	int WEB_FRAGMENT__NAME = 4;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.LocaleEncodingMapping#getEncoding Encoding}'.
>+	 * The feature id for the 'Distributables' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Encoding'.
>-	 * @see org.eclipse.jst.javaee.web.LocaleEncodingMapping#getEncoding()
>-	 * @see #getLocaleEncodingMapping()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getLocaleEncodingMapping_Encoding();
>+	int WEB_FRAGMENT__DISTRIBUTABLES = 5;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.LocaleEncodingMapping#getId Id}'.
>+	 * The feature id for the 'Context Params' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.web.LocaleEncodingMapping#getId()
>-	 * @see #getLocaleEncodingMapping()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getLocaleEncodingMapping_Id();
>+	int WEB_FRAGMENT__CONTEXT_PARAMS = 6;
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.LocaleEncodingMappingList Locale Encoding Mapping List}'.
>+	 * The feature id for the 'Filters' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'Locale Encoding Mapping List'.
>-	 * @see org.eclipse.jst.javaee.web.LocaleEncodingMappingList
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EClass getLocaleEncodingMappingList();
>+	int WEB_FRAGMENT__FILTERS = 7;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.LocaleEncodingMappingList#getLocalEncodingMappings Local Encoding Mappings}'.
>+	 * The feature id for the 'Filter Mappings' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Local Encoding Mappings'.
>-	 * @see org.eclipse.jst.javaee.web.LocaleEncodingMappingList#getLocalEncodingMappings()
>-	 * @see #getLocaleEncodingMappingList()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EReference getLocaleEncodingMappingList_LocalEncodingMappings();
>+	int WEB_FRAGMENT__FILTER_MAPPINGS = 8;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.LocaleEncodingMappingList#getId Id}'.
>+	 * The feature id for the 'Listeners' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.web.LocaleEncodingMappingList#getId()
>-	 * @see #getLocaleEncodingMappingList()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getLocaleEncodingMappingList_Id();
>+	int WEB_FRAGMENT__LISTENERS = 9;
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.LoginConfig Login Config}'.
>+	 * The feature id for the 'Servlets' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'Login Config'.
>-	 * @see org.eclipse.jst.javaee.web.LoginConfig
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EClass getLoginConfig();
>+	int WEB_FRAGMENT__SERVLETS = 10;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.LoginConfig#getAuthMethod Auth Method}'.
>+	 * The feature id for the 'Servlet Mappings' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Auth Method'.
>-	 * @see org.eclipse.jst.javaee.web.LoginConfig#getAuthMethod()
>-	 * @see #getLoginConfig()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getLoginConfig_AuthMethod();
>+	int WEB_FRAGMENT__SERVLET_MAPPINGS = 11;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.LoginConfig#getRealmName Realm Name}'.
>+	 * The feature id for the 'Session Configs' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Realm Name'.
>-	 * @see org.eclipse.jst.javaee.web.LoginConfig#getRealmName()
>-	 * @see #getLoginConfig()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getLoginConfig_RealmName();
>+	int WEB_FRAGMENT__SESSION_CONFIGS = 12;
> 
> 	/**
>-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.web.LoginConfig#getFormLoginConfig Form Login Config}'.
>+	 * The feature id for the 'Mime Mappings' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference 'Form Login Config'.
>-	 * @see org.eclipse.jst.javaee.web.LoginConfig#getFormLoginConfig()
>-	 * @see #getLoginConfig()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EReference getLoginConfig_FormLoginConfig();
>+	int WEB_FRAGMENT__MIME_MAPPINGS = 13;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.LoginConfig#getId Id}'.
>+	 * The feature id for the 'Welcome File Lists' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.web.LoginConfig#getId()
>-	 * @see #getLoginConfig()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getLoginConfig_Id();
>+	int WEB_FRAGMENT__WELCOME_FILE_LISTS = 14;
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.MimeMapping Mime Mapping}'.
>+	 * The feature id for the 'Error Pages' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'Mime Mapping'.
>-	 * @see org.eclipse.jst.javaee.web.MimeMapping
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EClass getMimeMapping();
>+	int WEB_FRAGMENT__ERROR_PAGES = 15;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.MimeMapping#getExtension Extension}'.
>+	 * The feature id for the 'Jsp Configs' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Extension'.
>-	 * @see org.eclipse.jst.javaee.web.MimeMapping#getExtension()
>-	 * @see #getMimeMapping()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getMimeMapping_Extension();
>+	int WEB_FRAGMENT__JSP_CONFIGS = 16;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.MimeMapping#getMimeType Mime Type}'.
>+	 * The feature id for the 'Security Constraints' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Mime Type'.
>-	 * @see org.eclipse.jst.javaee.web.MimeMapping#getMimeType()
>-	 * @see #getMimeMapping()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getMimeMapping_MimeType();
>+	int WEB_FRAGMENT__SECURITY_CONSTRAINTS = 17;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.MimeMapping#getId Id}'.
>+	 * The feature id for the 'Login Configs' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.web.MimeMapping#getId()
>-	 * @see #getMimeMapping()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getMimeMapping_Id();
>+	int WEB_FRAGMENT__LOGIN_CONFIGS = 18;
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.SecurityConstraint Security Constraint}'.
>+	 * The feature id for the 'Security Roles' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'Security Constraint'.
>-	 * @see org.eclipse.jst.javaee.web.SecurityConstraint
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EClass getSecurityConstraint();
>+	int WEB_FRAGMENT__SECURITY_ROLES = 19;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.SecurityConstraint#getDisplayNames Display Names}'.
>+	 * The feature id for the 'Env Entries' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Display Names'.
>-	 * @see org.eclipse.jst.javaee.web.SecurityConstraint#getDisplayNames()
>-	 * @see #getSecurityConstraint()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EReference getSecurityConstraint_DisplayNames();
>+	int WEB_FRAGMENT__ENV_ENTRIES = 20;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.SecurityConstraint#getWebResourceCollections Web Resource Collections}'.
>+	 * The feature id for the 'Ejb Refs' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Web Resource Collections'.
>-	 * @see org.eclipse.jst.javaee.web.SecurityConstraint#getWebResourceCollections()
>-	 * @see #getSecurityConstraint()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EReference getSecurityConstraint_WebResourceCollections();
>+	int WEB_FRAGMENT__EJB_REFS = 21;
> 
> 	/**
>-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.web.SecurityConstraint#getAuthConstraint Auth Constraint}'.
>+	 * The feature id for the 'Ejb Local Refs' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference 'Auth Constraint'.
>-	 * @see org.eclipse.jst.javaee.web.SecurityConstraint#getAuthConstraint()
>-	 * @see #getSecurityConstraint()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EReference getSecurityConstraint_AuthConstraint();
>+	int WEB_FRAGMENT__EJB_LOCAL_REFS = 22;
> 
> 	/**
>-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.web.SecurityConstraint#getUserDataConstraint User Data Constraint}'.
>+	 * The feature id for the 'Service Refs' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference 'User Data Constraint'.
>-	 * @see org.eclipse.jst.javaee.web.SecurityConstraint#getUserDataConstraint()
>-	 * @see #getSecurityConstraint()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EReference getSecurityConstraint_UserDataConstraint();
>+	int WEB_FRAGMENT__SERVICE_REFS = 23;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.SecurityConstraint#getId Id}'.
>+	 * The feature id for the 'Resource Refs' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.web.SecurityConstraint#getId()
>-	 * @see #getSecurityConstraint()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getSecurityConstraint_Id();
>+	int WEB_FRAGMENT__RESOURCE_REFS = 24;
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.Servlet Servlet}'.
>+	 * The feature id for the 'Resource Env Refs' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'Servlet'.
>-	 * @see org.eclipse.jst.javaee.web.Servlet
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EClass getServlet();
>+	int WEB_FRAGMENT__RESOURCE_ENV_REFS = 25;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.Servlet#getDescriptions Descriptions}'.
>+	 * The feature id for the 'Message Destination Refs' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Descriptions'.
>-	 * @see org.eclipse.jst.javaee.web.Servlet#getDescriptions()
>-	 * @see #getServlet()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EReference getServlet_Descriptions();
>+	int WEB_FRAGMENT__MESSAGE_DESTINATION_REFS = 26;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.Servlet#getDisplayNames Display Names}'.
>+	 * The feature id for the 'Persistence Context Refs' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Display Names'.
>-	 * @see org.eclipse.jst.javaee.web.Servlet#getDisplayNames()
>-	 * @see #getServlet()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EReference getServlet_DisplayNames();
>+	int WEB_FRAGMENT__PERSISTENCE_CONTEXT_REFS = 27;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.Servlet#getIcons Icons}'.
>+	 * The feature id for the 'Persistence Unit Refs' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Icons'.
>-	 * @see org.eclipse.jst.javaee.web.Servlet#getIcons()
>-	 * @see #getServlet()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EReference getServlet_Icons();
>+	int WEB_FRAGMENT__PERSISTENCE_UNIT_REFS = 28;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.Servlet#getServletName Servlet Name}'.
>+	 * The feature id for the 'Post Constructs' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Servlet Name'.
>-	 * @see org.eclipse.jst.javaee.web.Servlet#getServletName()
>-	 * @see #getServlet()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getServlet_ServletName();
>+	int WEB_FRAGMENT__POST_CONSTRUCTS = 29;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.Servlet#getServletClass Servlet Class}'.
>+	 * The feature id for the 'Pre Destroys' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Servlet Class'.
>-	 * @see org.eclipse.jst.javaee.web.Servlet#getServletClass()
>-	 * @see #getServlet()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getServlet_ServletClass();
>+	int WEB_FRAGMENT__PRE_DESTROYS = 30;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.Servlet#getJspFile Jsp File}'.
>+	 * The feature id for the 'Data Source' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Jsp File'.
>-	 * @see org.eclipse.jst.javaee.web.Servlet#getJspFile()
>-	 * @see #getServlet()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getServlet_JspFile();
>+	int WEB_FRAGMENT__DATA_SOURCE = 31;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.Servlet#getInitParams Init Params}'.
>+	 * The feature id for the 'Message Destinations' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Init Params'.
>-	 * @see org.eclipse.jst.javaee.web.Servlet#getInitParams()
>-	 * @see #getServlet()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EReference getServlet_InitParams();
>+	int WEB_FRAGMENT__MESSAGE_DESTINATIONS = 32;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.Servlet#getLoadOnStartup Load On Startup}'.
>+	 * The feature id for the 'Local Encoding Mappings Lists' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Load On Startup'.
>-	 * @see org.eclipse.jst.javaee.web.Servlet#getLoadOnStartup()
>-	 * @see #getServlet()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getServlet_LoadOnStartup();
>+	int WEB_FRAGMENT__LOCAL_ENCODING_MAPPINGS_LISTS = 33;
> 
> 	/**
>-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.web.Servlet#getRunAs Run As}'.
>+	 * The feature id for the 'Ordering' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference 'Run As'.
>-	 * @see org.eclipse.jst.javaee.web.Servlet#getRunAs()
>-	 * @see #getServlet()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EReference getServlet_RunAs();
>+	int WEB_FRAGMENT__ORDERING = 34;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.Servlet#getSecurityRoleRefs Security Role Refs}'.
>+	 * The feature id for the 'Id' attribute.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Security Role Refs'.
>-	 * @see org.eclipse.jst.javaee.web.Servlet#getSecurityRoleRefs()
>-	 * @see #getServlet()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EReference getServlet_SecurityRoleRefs();
>+	int WEB_FRAGMENT__ID = 35;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.Servlet#getId Id}'.
>+	 * The feature id for the 'Metadata Complete' attribute.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.web.Servlet#getId()
>-	 * @see #getServlet()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getServlet_Id();
>+	int WEB_FRAGMENT__METADATA_COMPLETE = 36;
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.ServletMapping Servlet Mapping}'.
>+	 * The feature id for the 'Version' attribute.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'Servlet Mapping'.
>-	 * @see org.eclipse.jst.javaee.web.ServletMapping
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EClass getServletMapping();
>+	int WEB_FRAGMENT__VERSION = 37;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.ServletMapping#getServletName Servlet Name}'.
>+	 * The number of structural features of the 'Fragment' class.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Servlet Name'.
>-	 * @see org.eclipse.jst.javaee.web.ServletMapping#getServletName()
>-	 * @see #getServletMapping()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getServletMapping_ServletName();
>+	int WEB_FRAGMENT_FEATURE_COUNT = 38;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.ServletMapping#getUrlPatterns Url Patterns}'.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.WebResourceCollectionImpl Resource Collection}' class.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Url Patterns'.
>-	 * @see org.eclipse.jst.javaee.web.ServletMapping#getUrlPatterns()
>-	 * @see #getServletMapping()
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebResourceCollectionImpl
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getWebResourceCollection()
> 	 * @generated
> 	 */
>-	EReference getServletMapping_UrlPatterns();
>+	int WEB_RESOURCE_COLLECTION = 27;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.ServletMapping#getId Id}'.
>+	 * The feature id for the 'Web Resource Name' attribute.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.web.ServletMapping#getId()
>-	 * @see #getServletMapping()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getServletMapping_Id();
>+	int WEB_RESOURCE_COLLECTION__WEB_RESOURCE_NAME = 0;
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.SessionConfig Session Config}'.
>+	 * The feature id for the 'Descriptions' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'Session Config'.
>-	 * @see org.eclipse.jst.javaee.web.SessionConfig
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EClass getSessionConfig();
>+	int WEB_RESOURCE_COLLECTION__DESCRIPTIONS = 1;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.SessionConfig#getSessionTimeout Session Timeout}'.
>+	 * The feature id for the 'Url Patterns' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Session Timeout'.
>-	 * @see org.eclipse.jst.javaee.web.SessionConfig#getSessionTimeout()
>-	 * @see #getSessionConfig()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getSessionConfig_SessionTimeout();
>+	int WEB_RESOURCE_COLLECTION__URL_PATTERNS = 2;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.SessionConfig#getId Id}'.
>+	 * The feature id for the 'Http Methods' attribute list.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.web.SessionConfig#getId()
>-	 * @see #getSessionConfig()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getSessionConfig_Id();
>+	int WEB_RESOURCE_COLLECTION__HTTP_METHODS = 3;
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.UserDataConstraint User Data Constraint}'.
>+	 * The feature id for the 'Http Method Omission' attribute list.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'User Data Constraint'.
>-	 * @see org.eclipse.jst.javaee.web.UserDataConstraint
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EClass getUserDataConstraint();
>+	int WEB_RESOURCE_COLLECTION__HTTP_METHOD_OMISSION = 4;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.UserDataConstraint#getDescriptions Descriptions}'.
>+	 * The feature id for the 'Id' attribute.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Descriptions'.
>-	 * @see org.eclipse.jst.javaee.web.UserDataConstraint#getDescriptions()
>-	 * @see #getUserDataConstraint()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EReference getUserDataConstraint_Descriptions();
>+	int WEB_RESOURCE_COLLECTION__ID = 5;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.UserDataConstraint#getTransportGuarantee Transport Guarantee}'.
>+	 * The number of structural features of the 'Resource Collection' class.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Transport Guarantee'.
>-	 * @see org.eclipse.jst.javaee.web.UserDataConstraint#getTransportGuarantee()
>-	 * @see #getUserDataConstraint()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getUserDataConstraint_TransportGuarantee();
>+	int WEB_RESOURCE_COLLECTION_FEATURE_COUNT = 6;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.UserDataConstraint#getId Id}'.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.WelcomeFileListImpl Welcome File List}' class.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.web.UserDataConstraint#getId()
>-	 * @see #getUserDataConstraint()
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WelcomeFileListImpl
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getWelcomeFileList()
> 	 * @generated
> 	 */
>-	EAttribute getUserDataConstraint_Id();
>+	int WELCOME_FILE_LIST = 28;
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.WebApp App}'.
>+	 * The feature id for the 'Welcome Files' attribute list.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'App'.
>-	 * @see org.eclipse.jst.javaee.web.WebApp
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EClass getWebApp();
>+	int WELCOME_FILE_LIST__WELCOME_FILES = 0;
> 
> 	/**
>-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.web.WebApp#getGroup Group}'.
>+	 * The feature id for the 'Id' attribute.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute list 'Group'.
>-	 * @see org.eclipse.jst.javaee.web.WebApp#getGroup()
>-	 * @see #getWebApp()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getWebApp_Group();
>+	int WELCOME_FILE_LIST__ID = 1;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getDescriptions Descriptions}'.
>+	 * The number of structural features of the 'Welcome File List' class.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Descriptions'.
>-	 * @see org.eclipse.jst.javaee.web.WebApp#getDescriptions()
>-	 * @see #getWebApp()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EReference getWebApp_Descriptions();
>+	int WELCOME_FILE_LIST_FEATURE_COUNT = 2;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getDisplayNames Display Names}'.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.DispatcherType Dispatcher Type}' enum.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Display Names'.
>-	 * @see org.eclipse.jst.javaee.web.WebApp#getDisplayNames()
>-	 * @see #getWebApp()
>+	 * @see org.eclipse.jst.javaee.web.DispatcherType
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getDispatcherType()
> 	 * @generated
> 	 */
>-	EReference getWebApp_DisplayNames();
>+	int DISPATCHER_TYPE = 29;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getIcons Icons}'.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.NullCharType Null Char Type}' enum.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Icons'.
>-	 * @see org.eclipse.jst.javaee.web.WebApp#getIcons()
>-	 * @see #getWebApp()
>+	 * @see org.eclipse.jst.javaee.web.NullCharType
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getNullCharType()
> 	 * @generated
> 	 */
>-	EReference getWebApp_Icons();
>+	int NULL_CHAR_TYPE = 30;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getDistributables Distributables}'.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.TrackingModeType Tracking Mode Type}' enum.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Distributables'.
>-	 * @see org.eclipse.jst.javaee.web.WebApp#getDistributables()
>-	 * @see #getWebApp()
>+	 * @see org.eclipse.jst.javaee.web.TrackingModeType
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getTrackingModeType()
> 	 * @generated
> 	 */
>-	EReference getWebApp_Distributables();
>+	int TRACKING_MODE_TYPE = 31;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getContextParams Context Params}'.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.TransportGuaranteeType Transport Guarantee Type}' enum.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Context Params'.
>-	 * @see org.eclipse.jst.javaee.web.WebApp#getContextParams()
>-	 * @see #getWebApp()
>+	 * @see org.eclipse.jst.javaee.web.TransportGuaranteeType
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getTransportGuaranteeType()
> 	 * @generated
> 	 */
>-	EReference getWebApp_ContextParams();
>+	int TRANSPORT_GUARANTEE_TYPE = 32;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getFilters Filters}'.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.WebAppVersionType App Version Type}' enum.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Filters'.
>-	 * @see org.eclipse.jst.javaee.web.WebApp#getFilters()
>-	 * @see #getWebApp()
>+	 * @see org.eclipse.jst.javaee.web.WebAppVersionType
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getWebAppVersionType()
> 	 * @generated
> 	 */
>-	EReference getWebApp_Filters();
>+	int WEB_APP_VERSION_TYPE = 33;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getFilterMappings Filter Mappings}'.
>+	 * The meta object id for the 'Auth Method Type' data type.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Filter Mappings'.
>-	 * @see org.eclipse.jst.javaee.web.WebApp#getFilterMappings()
>-	 * @see #getWebApp()
>+	 * @see java.lang.String
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getAuthMethodType()
> 	 * @generated
> 	 */
>-	EReference getWebApp_FilterMappings();
>+	int AUTH_METHOD_TYPE = 34;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getListeners Listeners}'.
>+	 * The meta object id for the 'Dispatcher Type Object' data type.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Listeners'.
>-	 * @see org.eclipse.jst.javaee.web.WebApp#getListeners()
>-	 * @see #getWebApp()
>-	 * @generated
>+	 * @see org.eclipse.jst.javaee.web.DispatcherType
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getDispatcherTypeObject()
>+	 * @generated
> 	 */
>-	EReference getWebApp_Listeners();
>+	int DISPATCHER_TYPE_OBJECT = 35;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getServlets Servlets}'.
>+	 * The meta object id for the 'Encoding Type' data type.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Servlets'.
>-	 * @see org.eclipse.jst.javaee.web.WebApp#getServlets()
>-	 * @see #getWebApp()
>+	 * @see java.lang.String
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getEncodingType()
> 	 * @generated
> 	 */
>-	EReference getWebApp_Servlets();
>+	int ENCODING_TYPE = 36;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getServletMappings Servlet Mappings}'.
>+	 * The meta object id for the 'Error Code Type' data type.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Servlet Mappings'.
>-	 * @see org.eclipse.jst.javaee.web.WebApp#getServletMappings()
>-	 * @see #getWebApp()
>+	 * @see java.math.BigInteger
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getErrorCodeType()
> 	 * @generated
> 	 */
>-	EReference getWebApp_ServletMappings();
>+	int ERROR_CODE_TYPE = 37;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getSessionConfigs Session Configs}'.
>+	 * The meta object id for the 'Filter Name Type' data type.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Session Configs'.
>-	 * @see org.eclipse.jst.javaee.web.WebApp#getSessionConfigs()
>-	 * @see #getWebApp()
>+	 * @see java.lang.String
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getFilterNameType()
> 	 * @generated
> 	 */
>-	EReference getWebApp_SessionConfigs();
>+	int FILTER_NAME_TYPE = 38;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getMimeMappings Mime Mappings}'.
>+	 * The meta object id for the 'Http Method Type' data type.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Mime Mappings'.
>-	 * @see org.eclipse.jst.javaee.web.WebApp#getMimeMappings()
>-	 * @see #getWebApp()
>+	 * @see java.lang.String
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getHttpMethodType()
> 	 * @generated
> 	 */
>-	EReference getWebApp_MimeMappings();
>+	int HTTP_METHOD_TYPE = 39;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getWelcomeFileLists Welcome File Lists}'.
>+	 * The meta object id for the 'Load On Startup Type' data type.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Welcome File Lists'.
>-	 * @see org.eclipse.jst.javaee.web.WebApp#getWelcomeFileLists()
>-	 * @see #getWebApp()
>+	 * @see java.lang.Object
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getLoadOnStartupType()
> 	 * @generated
> 	 */
>-	EReference getWebApp_WelcomeFileLists();
>+	int LOAD_ON_STARTUP_TYPE = 40;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getErrorPages Error Pages}'.
>+	 * The meta object id for the 'Locale Type' data type.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Error Pages'.
>-	 * @see org.eclipse.jst.javaee.web.WebApp#getErrorPages()
>-	 * @see #getWebApp()
>+	 * @see java.lang.String
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getLocaleType()
> 	 * @generated
> 	 */
>-	EReference getWebApp_ErrorPages();
>+	int LOCALE_TYPE = 41;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getJspConfigs Jsp Configs}'.
>+	 * The meta object id for the 'Mime Type Type' data type.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Jsp Configs'.
>-	 * @see org.eclipse.jst.javaee.web.WebApp#getJspConfigs()
>-	 * @see #getWebApp()
>+	 * @see java.lang.String
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getMimeTypeType()
> 	 * @generated
> 	 */
>-	EReference getWebApp_JspConfigs();
>+	int MIME_TYPE_TYPE = 42;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getSecurityConstraints Security Constraints}'.
>+	 * The meta object id for the 'Non Empty String Type' data type.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Security Constraints'.
>-	 * @see org.eclipse.jst.javaee.web.WebApp#getSecurityConstraints()
>-	 * @see #getWebApp()
>+	 * @see java.lang.String
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getNonEmptyStringType()
> 	 * @generated
> 	 */
>-	EReference getWebApp_SecurityConstraints();
>+	int NON_EMPTY_STRING_TYPE = 43;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getLoginConfigs Login Configs}'.
>+	 * The meta object id for the 'Null Char Type Object' data type.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Login Configs'.
>-	 * @see org.eclipse.jst.javaee.web.WebApp#getLoginConfigs()
>-	 * @see #getWebApp()
>+	 * @see org.eclipse.jst.javaee.web.NullCharType
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getNullCharTypeObject()
> 	 * @generated
> 	 */
>-	EReference getWebApp_LoginConfigs();
>+	int NULL_CHAR_TYPE_OBJECT = 44;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getSecurityRoles Security Roles}'.
>+	 * The meta object id for the 'Servlet Name Type' data type.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Security Roles'.
>-	 * @see org.eclipse.jst.javaee.web.WebApp#getSecurityRoles()
>-	 * @see #getWebApp()
>+	 * @see java.lang.String
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getServletNameType()
> 	 * @generated
> 	 */
>-	EReference getWebApp_SecurityRoles();
>+	int SERVLET_NAME_TYPE = 45;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getEnvEntries Env Entries}'.
>+	 * The meta object id for the 'Tracking Mode Type Object' data type.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Env Entries'.
>-	 * @see org.eclipse.jst.javaee.web.WebApp#getEnvEntries()
>-	 * @see #getWebApp()
>+	 * @see org.eclipse.jst.javaee.web.TrackingModeType
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getTrackingModeTypeObject()
> 	 * @generated
> 	 */
>-	EReference getWebApp_EnvEntries();
>+	int TRACKING_MODE_TYPE_OBJECT = 46;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getEjbRefs Ejb Refs}'.
>+	 * The meta object id for the 'Transport Guarantee Type Object' data type.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Ejb Refs'.
>-	 * @see org.eclipse.jst.javaee.web.WebApp#getEjbRefs()
>-	 * @see #getWebApp()
>+	 * @see org.eclipse.jst.javaee.web.TransportGuaranteeType
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getTransportGuaranteeTypeObject()
> 	 * @generated
> 	 */
>-	EReference getWebApp_EjbRefs();
>+	int TRANSPORT_GUARANTEE_TYPE_OBJECT = 47;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getEjbLocalRefs Ejb Local Refs}'.
>+	 * The meta object id for the 'War Path Type' data type.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Ejb Local Refs'.
>-	 * @see org.eclipse.jst.javaee.web.WebApp#getEjbLocalRefs()
>-	 * @see #getWebApp()
>+	 * @see java.lang.String
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getWarPathType()
> 	 * @generated
> 	 */
>-	EReference getWebApp_EjbLocalRefs();
>+	int WAR_PATH_TYPE = 48;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getServiceRefs Service Refs}'.
>+	 * The meta object id for the 'App Version Type Object' data type.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Service Refs'.
>-	 * @see org.eclipse.jst.javaee.web.WebApp#getServiceRefs()
>-	 * @see #getWebApp()
>+	 * @see org.eclipse.jst.javaee.web.WebAppVersionType
>+	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getWebAppVersionTypeObject()
> 	 * @generated
> 	 */
>-	EReference getWebApp_ServiceRefs();
>+	int WEB_APP_VERSION_TYPE_OBJECT = 49;
>+
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getResourceRefs Resource Refs}'.
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.AbsoluteOrderingType Absolute Ordering Type}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Resource Refs'.
>-	 * @see org.eclipse.jst.javaee.web.WebApp#getResourceRefs()
>-	 * @see #getWebApp()
>+	 * @return the meta object for class 'Absolute Ordering Type'.
>+	 * @see org.eclipse.jst.javaee.web.AbsoluteOrderingType
> 	 * @generated
> 	 */
>-	EReference getWebApp_ResourceRefs();
>+	EClass getAbsoluteOrderingType();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getResourceEnvRefs Resource Env Refs}'.
>+	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.web.AbsoluteOrderingType#getGroup Group}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Resource Env Refs'.
>-	 * @see org.eclipse.jst.javaee.web.WebApp#getResourceEnvRefs()
>-	 * @see #getWebApp()
>+	 * @return the meta object for the attribute list 'Group'.
>+	 * @see org.eclipse.jst.javaee.web.AbsoluteOrderingType#getGroup()
>+	 * @see #getAbsoluteOrderingType()
> 	 * @generated
> 	 */
>-	EReference getWebApp_ResourceEnvRefs();
>+	EAttribute getAbsoluteOrderingType_Group();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getMessageDestinationRefs Message Destination Refs}'.
>+	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.web.AbsoluteOrderingType#getName Name}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Message Destination Refs'.
>-	 * @see org.eclipse.jst.javaee.web.WebApp#getMessageDestinationRefs()
>-	 * @see #getWebApp()
>+	 * @return the meta object for the attribute list 'Name'.
>+	 * @see org.eclipse.jst.javaee.web.AbsoluteOrderingType#getName()
>+	 * @see #getAbsoluteOrderingType()
> 	 * @generated
> 	 */
>-	EReference getWebApp_MessageDestinationRefs();
>+	EAttribute getAbsoluteOrderingType_Name();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getPersistenceContextRefs Persistence Context Refs}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.AbsoluteOrderingType#getOthers Others}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Persistence Context Refs'.
>-	 * @see org.eclipse.jst.javaee.web.WebApp#getPersistenceContextRefs()
>-	 * @see #getWebApp()
>+	 * @return the meta object for the containment reference list 'Others'.
>+	 * @see org.eclipse.jst.javaee.web.AbsoluteOrderingType#getOthers()
>+	 * @see #getAbsoluteOrderingType()
> 	 * @generated
> 	 */
>-	EReference getWebApp_PersistenceContextRefs();
>+	EReference getAbsoluteOrderingType_Others();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getPersistenceUnitRefs Persistence Unit Refs}'.
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.AuthConstraint Auth Constraint}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Persistence Unit Refs'.
>-	 * @see org.eclipse.jst.javaee.web.WebApp#getPersistenceUnitRefs()
>-	 * @see #getWebApp()
>+	 * @return the meta object for class 'Auth Constraint'.
>+	 * @see org.eclipse.jst.javaee.web.AuthConstraint
> 	 * @generated
> 	 */
>-	EReference getWebApp_PersistenceUnitRefs();
>+	EClass getAuthConstraint();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getPostConstructs Post Constructs}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.AuthConstraint#getDescriptions Descriptions}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Post Constructs'.
>-	 * @see org.eclipse.jst.javaee.web.WebApp#getPostConstructs()
>-	 * @see #getWebApp()
>+	 * @return the meta object for the containment reference list 'Descriptions'.
>+	 * @see org.eclipse.jst.javaee.web.AuthConstraint#getDescriptions()
>+	 * @see #getAuthConstraint()
> 	 * @generated
> 	 */
>-	EReference getWebApp_PostConstructs();
>+	EReference getAuthConstraint_Descriptions();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getPreDestroys Pre Destroys}'.
>+	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.web.AuthConstraint#getRoleNames Role Names}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Pre Destroys'.
>-	 * @see org.eclipse.jst.javaee.web.WebApp#getPreDestroys()
>-	 * @see #getWebApp()
>+	 * @return the meta object for the attribute list 'Role Names'.
>+	 * @see org.eclipse.jst.javaee.web.AuthConstraint#getRoleNames()
>+	 * @see #getAuthConstraint()
> 	 * @generated
> 	 */
>-	EReference getWebApp_PreDestroys();
>+	EAttribute getAuthConstraint_RoleNames();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getMessageDestinations Message Destinations}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.AuthConstraint#getId Id}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Message Destinations'.
>-	 * @see org.eclipse.jst.javaee.web.WebApp#getMessageDestinations()
>-	 * @see #getWebApp()
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.web.AuthConstraint#getId()
>+	 * @see #getAuthConstraint()
> 	 * @generated
> 	 */
>-	EReference getWebApp_MessageDestinations();
>+	EAttribute getAuthConstraint_Id();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getLocalEncodingMappingsLists Local Encoding Mappings Lists}'.
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.CookieCommentType Cookie Comment Type}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Local Encoding Mappings Lists'.
>-	 * @see org.eclipse.jst.javaee.web.WebApp#getLocalEncodingMappingsLists()
>-	 * @see #getWebApp()
>+	 * @return the meta object for class 'Cookie Comment Type'.
>+	 * @see org.eclipse.jst.javaee.web.CookieCommentType
> 	 * @generated
> 	 */
>-	EReference getWebApp_LocalEncodingMappingsLists();
>+	EClass getCookieCommentType();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.WebApp#getId Id}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.CookieCommentType#getValue Value}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.web.WebApp#getId()
>-	 * @see #getWebApp()
>+	 * @return the meta object for the attribute 'Value'.
>+	 * @see org.eclipse.jst.javaee.web.CookieCommentType#getValue()
>+	 * @see #getCookieCommentType()
> 	 * @generated
> 	 */
>-	EAttribute getWebApp_Id();
>+	EAttribute getCookieCommentType_Value();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.WebApp#isMetadataComplete Metadata Complete}'.
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.CookieConfigType Cookie Config Type}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Metadata Complete'.
>-	 * @see org.eclipse.jst.javaee.web.WebApp#isMetadataComplete()
>-	 * @see #getWebApp()
>+	 * @return the meta object for class 'Cookie Config Type'.
>+	 * @see org.eclipse.jst.javaee.web.CookieConfigType
> 	 * @generated
> 	 */
>-	EAttribute getWebApp_MetadataComplete();
>+	EClass getCookieConfigType();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.WebApp#getVersion Version}'.
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.web.CookieConfigType#getName Name}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Version'.
>-	 * @see org.eclipse.jst.javaee.web.WebApp#getVersion()
>-	 * @see #getWebApp()
>+	 * @return the meta object for the containment reference 'Name'.
>+	 * @see org.eclipse.jst.javaee.web.CookieConfigType#getName()
>+	 * @see #getCookieConfigType()
> 	 * @generated
> 	 */
>-	EAttribute getWebApp_Version();
>+	EReference getCookieConfigType_Name();
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.WebAppDeploymentDescriptor App Deployment Descriptor}'.
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.web.CookieConfigType#getDomain Domain}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'App Deployment Descriptor'.
>-	 * @see org.eclipse.jst.javaee.web.WebAppDeploymentDescriptor
>+	 * @return the meta object for the containment reference 'Domain'.
>+	 * @see org.eclipse.jst.javaee.web.CookieConfigType#getDomain()
>+	 * @see #getCookieConfigType()
> 	 * @generated
> 	 */
>-	EClass getWebAppDeploymentDescriptor();
>+	EReference getCookieConfigType_Domain();
> 
> 	/**
>-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.web.WebAppDeploymentDescriptor#getMixed Mixed}'.
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.web.CookieConfigType#getPath Path}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute list 'Mixed'.
>-	 * @see org.eclipse.jst.javaee.web.WebAppDeploymentDescriptor#getMixed()
>-	 * @see #getWebAppDeploymentDescriptor()
>+	 * @return the meta object for the containment reference 'Path'.
>+	 * @see org.eclipse.jst.javaee.web.CookieConfigType#getPath()
>+	 * @see #getCookieConfigType()
> 	 * @generated
> 	 */
>-	EAttribute getWebAppDeploymentDescriptor_Mixed();
>+	EReference getCookieConfigType_Path();
> 
> 	/**
>-	 * Returns the meta object for the map '{@link org.eclipse.jst.javaee.web.WebAppDeploymentDescriptor#getXMLNSPrefixMap XMLNS Prefix Map}'.
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.web.CookieConfigType#getComment Comment}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the map 'XMLNS Prefix Map'.
>-	 * @see org.eclipse.jst.javaee.web.WebAppDeploymentDescriptor#getXMLNSPrefixMap()
>-	 * @see #getWebAppDeploymentDescriptor()
>+	 * @return the meta object for the containment reference 'Comment'.
>+	 * @see org.eclipse.jst.javaee.web.CookieConfigType#getComment()
>+	 * @see #getCookieConfigType()
> 	 * @generated
> 	 */
>-	EReference getWebAppDeploymentDescriptor_XMLNSPrefixMap();
>+	EReference getCookieConfigType_Comment();
> 
> 	/**
>-	 * Returns the meta object for the map '{@link org.eclipse.jst.javaee.web.WebAppDeploymentDescriptor#getXSISchemaLocation XSI Schema Location}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.CookieConfigType#isHttpOnly Http Only}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the map 'XSI Schema Location'.
>-	 * @see org.eclipse.jst.javaee.web.WebAppDeploymentDescriptor#getXSISchemaLocation()
>-	 * @see #getWebAppDeploymentDescriptor()
>+	 * @return the meta object for the attribute 'Http Only'.
>+	 * @see org.eclipse.jst.javaee.web.CookieConfigType#isHttpOnly()
>+	 * @see #getCookieConfigType()
> 	 * @generated
> 	 */
>-	EReference getWebAppDeploymentDescriptor_XSISchemaLocation();
>+	EAttribute getCookieConfigType_HttpOnly();
> 
> 	/**
>-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.web.WebAppDeploymentDescriptor#getWebApp Web App}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.CookieConfigType#isSecure Secure}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference 'Web App'.
>-	 * @see org.eclipse.jst.javaee.web.WebAppDeploymentDescriptor#getWebApp()
>-	 * @see #getWebAppDeploymentDescriptor()
>+	 * @return the meta object for the attribute 'Secure'.
>+	 * @see org.eclipse.jst.javaee.web.CookieConfigType#isSecure()
>+	 * @see #getCookieConfigType()
> 	 * @generated
> 	 */
>-	EReference getWebAppDeploymentDescriptor_WebApp();
>+	EAttribute getCookieConfigType_Secure();
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.WebResourceCollection Resource Collection}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.CookieConfigType#getMaxAge Max Age}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'Resource Collection'.
>-	 * @see org.eclipse.jst.javaee.web.WebResourceCollection
>+	 * @return the meta object for the attribute 'Max Age'.
>+	 * @see org.eclipse.jst.javaee.web.CookieConfigType#getMaxAge()
>+	 * @see #getCookieConfigType()
> 	 * @generated
> 	 */
>-	EClass getWebResourceCollection();
>+	EAttribute getCookieConfigType_MaxAge();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.WebResourceCollection#getWebResourceName Web Resource Name}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.CookieConfigType#getId Id}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Web Resource Name'.
>-	 * @see org.eclipse.jst.javaee.web.WebResourceCollection#getWebResourceName()
>-	 * @see #getWebResourceCollection()
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.web.CookieConfigType#getId()
>+	 * @see #getCookieConfigType()
> 	 * @generated
> 	 */
>-	EAttribute getWebResourceCollection_WebResourceName();
>+	EAttribute getCookieConfigType_Id();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebResourceCollection#getDescriptions Descriptions}'.
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.CookieDomainType Cookie Domain Type}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Descriptions'.
>-	 * @see org.eclipse.jst.javaee.web.WebResourceCollection#getDescriptions()
>-	 * @see #getWebResourceCollection()
>+	 * @return the meta object for class 'Cookie Domain Type'.
>+	 * @see org.eclipse.jst.javaee.web.CookieDomainType
> 	 * @generated
> 	 */
>-	EReference getWebResourceCollection_Descriptions();
>+	EClass getCookieDomainType();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebResourceCollection#getUrlPatterns Url Patterns}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.CookieDomainType#getValue Value}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Url Patterns'.
>-	 * @see org.eclipse.jst.javaee.web.WebResourceCollection#getUrlPatterns()
>-	 * @see #getWebResourceCollection()
>+	 * @return the meta object for the attribute 'Value'.
>+	 * @see org.eclipse.jst.javaee.web.CookieDomainType#getValue()
>+	 * @see #getCookieDomainType()
> 	 * @generated
> 	 */
>-	EReference getWebResourceCollection_UrlPatterns();
>+	EAttribute getCookieDomainType_Value();
> 
> 	/**
>-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.web.WebResourceCollection#getHttpMethods Http Methods}'.
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.CookieNameType Cookie Name Type}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute list 'Http Methods'.
>-	 * @see org.eclipse.jst.javaee.web.WebResourceCollection#getHttpMethods()
>-	 * @see #getWebResourceCollection()
>+	 * @return the meta object for class 'Cookie Name Type'.
>+	 * @see org.eclipse.jst.javaee.web.CookieNameType
> 	 * @generated
> 	 */
>-	EAttribute getWebResourceCollection_HttpMethods();
>+	EClass getCookieNameType();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.WebResourceCollection#getId Id}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.CookieNameType#getValue Value}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.web.WebResourceCollection#getId()
>-	 * @see #getWebResourceCollection()
>+	 * @return the meta object for the attribute 'Value'.
>+	 * @see org.eclipse.jst.javaee.web.CookieNameType#getValue()
>+	 * @see #getCookieNameType()
> 	 * @generated
> 	 */
>-	EAttribute getWebResourceCollection_Id();
>+	EAttribute getCookieNameType_Value();
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.WelcomeFileList Welcome File List}'.
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.CookiePathType Cookie Path Type}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'Welcome File List'.
>-	 * @see org.eclipse.jst.javaee.web.WelcomeFileList
>+	 * @return the meta object for class 'Cookie Path Type'.
>+	 * @see org.eclipse.jst.javaee.web.CookiePathType
> 	 * @generated
> 	 */
>-	EClass getWelcomeFileList();
>+	EClass getCookiePathType();
> 
> 	/**
>-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.web.WelcomeFileList#getWelcomeFiles Welcome Files}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.CookiePathType#getValue Value}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute list 'Welcome Files'.
>-	 * @see org.eclipse.jst.javaee.web.WelcomeFileList#getWelcomeFiles()
>-	 * @see #getWelcomeFileList()
>+	 * @return the meta object for the attribute 'Value'.
>+	 * @see org.eclipse.jst.javaee.web.CookiePathType#getValue()
>+	 * @see #getCookiePathType()
> 	 * @generated
> 	 */
>-	EAttribute getWelcomeFileList_WelcomeFiles();
>+	EAttribute getCookiePathType_Value();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.WelcomeFileList#getId Id}'.
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.ErrorPage Error Page}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for class 'Error Page'.
>+	 * @see org.eclipse.jst.javaee.web.ErrorPage
>+	 * @generated
>+	 */
>+	EClass getErrorPage();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.ErrorPage#getErrorCode Error Code}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Error Code'.
>+	 * @see org.eclipse.jst.javaee.web.ErrorPage#getErrorCode()
>+	 * @see #getErrorPage()
>+	 * @generated
>+	 */
>+	EAttribute getErrorPage_ErrorCode();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.ErrorPage#getExceptionType Exception Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Exception Type'.
>+	 * @see org.eclipse.jst.javaee.web.ErrorPage#getExceptionType()
>+	 * @see #getErrorPage()
>+	 * @generated
>+	 */
>+	EAttribute getErrorPage_ExceptionType();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.ErrorPage#getLocation Location}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Location'.
>+	 * @see org.eclipse.jst.javaee.web.ErrorPage#getLocation()
>+	 * @see #getErrorPage()
>+	 * @generated
>+	 */
>+	EAttribute getErrorPage_Location();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.ErrorPage#getId Id}'.
> 	 * 
> 	 * 
> 	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.web.WelcomeFileList#getId()
>-	 * @see #getWelcomeFileList()
>+	 * @see org.eclipse.jst.javaee.web.ErrorPage#getId()
>+	 * @see #getErrorPage()
> 	 * @generated
> 	 */
>-	EAttribute getWelcomeFileList_Id();
>+	EAttribute getErrorPage_Id();
> 
> 	/**
>-	 * Returns the meta object for enum '{@link org.eclipse.jst.javaee.web.DispatcherType Dispatcher Type}'.
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.Filter Filter}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for enum 'Dispatcher Type'.
>-	 * @see org.eclipse.jst.javaee.web.DispatcherType
>+	 * @return the meta object for class 'Filter'.
>+	 * @see org.eclipse.jst.javaee.web.Filter
> 	 * @generated
> 	 */
>-	EEnum getDispatcherType();
>+	EClass getFilter();
> 
> 	/**
>-	 * Returns the meta object for enum '{@link org.eclipse.jst.javaee.web.NullCharType Null Char Type}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.Filter#getDescriptions Descriptions}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for enum 'Null Char Type'.
>-	 * @see org.eclipse.jst.javaee.web.NullCharType
>+	 * @return the meta object for the containment reference list 'Descriptions'.
>+	 * @see org.eclipse.jst.javaee.web.Filter#getDescriptions()
>+	 * @see #getFilter()
> 	 * @generated
> 	 */
>-	EEnum getNullCharType();
>+	EReference getFilter_Descriptions();
> 
> 	/**
>-	 * Returns the meta object for enum '{@link org.eclipse.jst.javaee.web.TransportGuaranteeType Transport Guarantee Type}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.Filter#getDisplayNames Display Names}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for enum 'Transport Guarantee Type'.
>-	 * @see org.eclipse.jst.javaee.web.TransportGuaranteeType
>+	 * @return the meta object for the containment reference list 'Display Names'.
>+	 * @see org.eclipse.jst.javaee.web.Filter#getDisplayNames()
>+	 * @see #getFilter()
> 	 * @generated
> 	 */
>-	EEnum getTransportGuaranteeType();
>+	EReference getFilter_DisplayNames();
> 
> 	/**
>-	 * Returns the meta object for enum '{@link org.eclipse.jst.javaee.web.WebAppVersionType App Version Type}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.Filter#getIcons Icons}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for enum 'App Version Type'.
>-	 * @see org.eclipse.jst.javaee.web.WebAppVersionType
>+	 * @return the meta object for the containment reference list 'Icons'.
>+	 * @see org.eclipse.jst.javaee.web.Filter#getIcons()
>+	 * @see #getFilter()
> 	 * @generated
> 	 */
>-	EEnum getWebAppVersionType();
>+	EReference getFilter_Icons();
> 
> 	/**
>-	 * Returns the meta object for data type '{@link java.lang.String Auth Method Type}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.Filter#getFilterName Filter Name}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for data type 'Auth Method Type'.
>-	 * @see java.lang.String
>+	 * @return the meta object for the attribute 'Filter Name'.
>+	 * @see org.eclipse.jst.javaee.web.Filter#getFilterName()
>+	 * @see #getFilter()
> 	 * @generated
> 	 */
>-	EDataType getAuthMethodType();
>+	EAttribute getFilter_FilterName();
> 
> 	/**
>-	 * Returns the meta object for data type '{@link org.eclipse.jst.javaee.web.DispatcherType Dispatcher Type Object}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.Filter#getFilterClass Filter Class}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for data type 'Dispatcher Type Object'.
>-	 * @see org.eclipse.jst.javaee.web.DispatcherType
>+	 * @return the meta object for the attribute 'Filter Class'.
>+	 * @see org.eclipse.jst.javaee.web.Filter#getFilterClass()
>+	 * @see #getFilter()
> 	 * @generated
> 	 */
>-	EDataType getDispatcherTypeObject();
>+	EAttribute getFilter_FilterClass();
> 
> 	/**
>-	 * Returns the meta object for data type '{@link java.lang.String Encoding Type}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.Filter#isAsyncSupported Async Supported}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for data type 'Encoding Type'.
>-	 * @see java.lang.String
>+	 * @return the meta object for the attribute 'Async Supported'.
>+	 * @see org.eclipse.jst.javaee.web.Filter#isAsyncSupported()
>+	 * @see #getFilter()
> 	 * @generated
> 	 */
>-	EDataType getEncodingType();
>+	EAttribute getFilter_AsyncSupported();
> 
> 	/**
>-	 * Returns the meta object for data type '{@link java.math.BigInteger Error Code Type}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.Filter#getInitParams Init Params}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for data type 'Error Code Type'.
>-	 * @see java.math.BigInteger
>+	 * @return the meta object for the containment reference list 'Init Params'.
>+	 * @see org.eclipse.jst.javaee.web.Filter#getInitParams()
>+	 * @see #getFilter()
> 	 * @generated
> 	 */
>-	EDataType getErrorCodeType();
>+	EReference getFilter_InitParams();
> 
> 	/**
>-	 * Returns the meta object for data type '{@link java.lang.String Filter Name Type}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.Filter#getId Id}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for data type 'Filter Name Type'.
>-	 * @see java.lang.String
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.web.Filter#getId()
>+	 * @see #getFilter()
> 	 * @generated
> 	 */
>-	EDataType getFilterNameType();
>+	EAttribute getFilter_Id();
> 
> 	/**
>-	 * Returns the meta object for data type '{@link java.lang.String Http Method Type}'.
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.FilterMapping Filter Mapping}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for data type 'Http Method Type'.
>-	 * @see java.lang.String
>+	 * @return the meta object for class 'Filter Mapping'.
>+	 * @see org.eclipse.jst.javaee.web.FilterMapping
> 	 * @generated
> 	 */
>-	EDataType getHttpMethodType();
>+	EClass getFilterMapping();
> 
> 	/**
>-	 * Returns the meta object for data type '{@link java.lang.Object Load On Startup Type}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.FilterMapping#getFilterName Filter Name}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for data type 'Load On Startup Type'.
>-	 * @see java.lang.Object
>+	 * @return the meta object for the attribute 'Filter Name'.
>+	 * @see org.eclipse.jst.javaee.web.FilterMapping#getFilterName()
>+	 * @see #getFilterMapping()
> 	 * @generated
> 	 */
>-	EDataType getLoadOnStartupType();
>+	EAttribute getFilterMapping_FilterName();
> 
> 	/**
>-	 * Returns the meta object for data type '{@link java.lang.String Locale Type}'.
>+	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.web.FilterMapping#getGroup Group}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for data type 'Locale Type'.
>-	 * @see java.lang.String
>+	 * @return the meta object for the attribute list 'Group'.
>+	 * @see org.eclipse.jst.javaee.web.FilterMapping#getGroup()
>+	 * @see #getFilterMapping()
> 	 * @generated
> 	 */
>-	EDataType getLocaleType();
>+	EAttribute getFilterMapping_Group();
> 
> 	/**
>-	 * Returns the meta object for data type '{@link java.lang.String Mime Type Type}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.FilterMapping#getUrlPatterns Url Patterns}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for data type 'Mime Type Type'.
>-	 * @see java.lang.String
>+	 * @return the meta object for the containment reference list 'Url Patterns'.
>+	 * @see org.eclipse.jst.javaee.web.FilterMapping#getUrlPatterns()
>+	 * @see #getFilterMapping()
> 	 * @generated
> 	 */
>-	EDataType getMimeTypeType();
>+	EReference getFilterMapping_UrlPatterns();
> 
> 	/**
>-	 * Returns the meta object for data type '{@link java.lang.String Non Empty String Type}'.
>+	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.web.FilterMapping#getServletNames Servlet Names}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for data type 'Non Empty String Type'.
>-	 * @see java.lang.String
>+	 * @return the meta object for the attribute list 'Servlet Names'.
>+	 * @see org.eclipse.jst.javaee.web.FilterMapping#getServletNames()
>+	 * @see #getFilterMapping()
> 	 * @generated
> 	 */
>-	EDataType getNonEmptyStringType();
>+	EAttribute getFilterMapping_ServletNames();
> 
> 	/**
>-	 * Returns the meta object for data type '{@link org.eclipse.jst.javaee.web.NullCharType Null Char Type Object}'.
>+	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.web.FilterMapping#getDispatchers Dispatchers}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for data type 'Null Char Type Object'.
>-	 * @see org.eclipse.jst.javaee.web.NullCharType
>+	 * @return the meta object for the attribute list 'Dispatchers'.
>+	 * @see org.eclipse.jst.javaee.web.FilterMapping#getDispatchers()
>+	 * @see #getFilterMapping()
> 	 * @generated
> 	 */
>-	EDataType getNullCharTypeObject();
>+	EAttribute getFilterMapping_Dispatchers();
> 
> 	/**
>-	 * Returns the meta object for data type '{@link java.lang.String Servlet Name Type}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.FilterMapping#getId Id}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for data type 'Servlet Name Type'.
>-	 * @see java.lang.String
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.web.FilterMapping#getId()
>+	 * @see #getFilterMapping()
> 	 * @generated
> 	 */
>-	EDataType getServletNameType();
>+	EAttribute getFilterMapping_Id();
> 
> 	/**
>-	 * Returns the meta object for data type '{@link org.eclipse.jst.javaee.web.TransportGuaranteeType Transport Guarantee Type Object}'.
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.FormLoginConfig Form Login Config}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for data type 'Transport Guarantee Type Object'.
>-	 * @see org.eclipse.jst.javaee.web.TransportGuaranteeType
>+	 * @return the meta object for class 'Form Login Config'.
>+	 * @see org.eclipse.jst.javaee.web.FormLoginConfig
> 	 * @generated
> 	 */
>-	EDataType getTransportGuaranteeTypeObject();
>+	EClass getFormLoginConfig();
> 
> 	/**
>-	 * Returns the meta object for data type '{@link java.lang.String War Path Type}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.FormLoginConfig#getFormLoginPage Form Login Page}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for data type 'War Path Type'.
>-	 * @see java.lang.String
>+	 * @return the meta object for the attribute 'Form Login Page'.
>+	 * @see org.eclipse.jst.javaee.web.FormLoginConfig#getFormLoginPage()
>+	 * @see #getFormLoginConfig()
> 	 * @generated
> 	 */
>-	EDataType getWarPathType();
>+	EAttribute getFormLoginConfig_FormLoginPage();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.FormLoginConfig#getFormErrorPage Form Error Page}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Form Error Page'.
>+	 * @see org.eclipse.jst.javaee.web.FormLoginConfig#getFormErrorPage()
>+	 * @see #getFormLoginConfig()
>+	 * @generated
>+	 */
>+	EAttribute getFormLoginConfig_FormErrorPage();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.FormLoginConfig#getId Id}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.web.FormLoginConfig#getId()
>+	 * @see #getFormLoginConfig()
>+	 * @generated
>+	 */
>+	EAttribute getFormLoginConfig_Id();
>+
>+	/**
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.LocaleEncodingMapping Locale Encoding Mapping}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for class 'Locale Encoding Mapping'.
>+	 * @see org.eclipse.jst.javaee.web.LocaleEncodingMapping
>+	 * @generated
>+	 */
>+	EClass getLocaleEncodingMapping();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.LocaleEncodingMapping#getLocale Locale}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Locale'.
>+	 * @see org.eclipse.jst.javaee.web.LocaleEncodingMapping#getLocale()
>+	 * @see #getLocaleEncodingMapping()
>+	 * @generated
>+	 */
>+	EAttribute getLocaleEncodingMapping_Locale();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.LocaleEncodingMapping#getEncoding Encoding}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Encoding'.
>+	 * @see org.eclipse.jst.javaee.web.LocaleEncodingMapping#getEncoding()
>+	 * @see #getLocaleEncodingMapping()
>+	 * @generated
>+	 */
>+	EAttribute getLocaleEncodingMapping_Encoding();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.LocaleEncodingMapping#getId Id}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.web.LocaleEncodingMapping#getId()
>+	 * @see #getLocaleEncodingMapping()
>+	 * @generated
>+	 */
>+	EAttribute getLocaleEncodingMapping_Id();
>+
>+	/**
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.LocaleEncodingMappingList Locale Encoding Mapping List}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for class 'Locale Encoding Mapping List'.
>+	 * @see org.eclipse.jst.javaee.web.LocaleEncodingMappingList
>+	 * @generated
>+	 */
>+	EClass getLocaleEncodingMappingList();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.LocaleEncodingMappingList#getLocalEncodingMappings Local Encoding Mappings}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Local Encoding Mappings'.
>+	 * @see org.eclipse.jst.javaee.web.LocaleEncodingMappingList#getLocalEncodingMappings()
>+	 * @see #getLocaleEncodingMappingList()
>+	 * @generated
>+	 */
>+	EReference getLocaleEncodingMappingList_LocalEncodingMappings();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.LocaleEncodingMappingList#getId Id}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.web.LocaleEncodingMappingList#getId()
>+	 * @see #getLocaleEncodingMappingList()
>+	 * @generated
>+	 */
>+	EAttribute getLocaleEncodingMappingList_Id();
>+
>+	/**
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.LoginConfig Login Config}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for class 'Login Config'.
>+	 * @see org.eclipse.jst.javaee.web.LoginConfig
>+	 * @generated
>+	 */
>+	EClass getLoginConfig();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.LoginConfig#getAuthMethod Auth Method}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Auth Method'.
>+	 * @see org.eclipse.jst.javaee.web.LoginConfig#getAuthMethod()
>+	 * @see #getLoginConfig()
>+	 * @generated
>+	 */
>+	EAttribute getLoginConfig_AuthMethod();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.LoginConfig#getRealmName Realm Name}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Realm Name'.
>+	 * @see org.eclipse.jst.javaee.web.LoginConfig#getRealmName()
>+	 * @see #getLoginConfig()
>+	 * @generated
>+	 */
>+	EAttribute getLoginConfig_RealmName();
>+
>+	/**
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.web.LoginConfig#getFormLoginConfig Form Login Config}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference 'Form Login Config'.
>+	 * @see org.eclipse.jst.javaee.web.LoginConfig#getFormLoginConfig()
>+	 * @see #getLoginConfig()
>+	 * @generated
>+	 */
>+	EReference getLoginConfig_FormLoginConfig();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.LoginConfig#getId Id}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.web.LoginConfig#getId()
>+	 * @see #getLoginConfig()
>+	 * @generated
>+	 */
>+	EAttribute getLoginConfig_Id();
>+
>+	/**
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.MimeMapping Mime Mapping}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for class 'Mime Mapping'.
>+	 * @see org.eclipse.jst.javaee.web.MimeMapping
>+	 * @generated
>+	 */
>+	EClass getMimeMapping();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.MimeMapping#getExtension Extension}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Extension'.
>+	 * @see org.eclipse.jst.javaee.web.MimeMapping#getExtension()
>+	 * @see #getMimeMapping()
>+	 * @generated
>+	 */
>+	EAttribute getMimeMapping_Extension();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.MimeMapping#getMimeType Mime Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Mime Type'.
>+	 * @see org.eclipse.jst.javaee.web.MimeMapping#getMimeType()
>+	 * @see #getMimeMapping()
>+	 * @generated
>+	 */
>+	EAttribute getMimeMapping_MimeType();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.MimeMapping#getId Id}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.web.MimeMapping#getId()
>+	 * @see #getMimeMapping()
>+	 * @generated
>+	 */
>+	EAttribute getMimeMapping_Id();
>+
>+	/**
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.MultipartConfigType Multipart Config Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for class 'Multipart Config Type'.
>+	 * @see org.eclipse.jst.javaee.web.MultipartConfigType
>+	 * @generated
>+	 */
>+	EClass getMultipartConfigType();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.MultipartConfigType#getLocation Location}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Location'.
>+	 * @see org.eclipse.jst.javaee.web.MultipartConfigType#getLocation()
>+	 * @see #getMultipartConfigType()
>+	 * @generated
>+	 */
>+	EAttribute getMultipartConfigType_Location();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.MultipartConfigType#getMaxFileSize Max File Size}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Max File Size'.
>+	 * @see org.eclipse.jst.javaee.web.MultipartConfigType#getMaxFileSize()
>+	 * @see #getMultipartConfigType()
>+	 * @generated
>+	 */
>+	EAttribute getMultipartConfigType_MaxFileSize();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.MultipartConfigType#getMaxRequestSize Max Request Size}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Max Request Size'.
>+	 * @see org.eclipse.jst.javaee.web.MultipartConfigType#getMaxRequestSize()
>+	 * @see #getMultipartConfigType()
>+	 * @generated
>+	 */
>+	EAttribute getMultipartConfigType_MaxRequestSize();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.MultipartConfigType#getFileSizeThreshold File Size Threshold}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'File Size Threshold'.
>+	 * @see org.eclipse.jst.javaee.web.MultipartConfigType#getFileSizeThreshold()
>+	 * @see #getMultipartConfigType()
>+	 * @generated
>+	 */
>+	EAttribute getMultipartConfigType_FileSizeThreshold();
>+
>+	/**
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.OrderingOrderingType Ordering Ordering Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for class 'Ordering Ordering Type'.
>+	 * @see org.eclipse.jst.javaee.web.OrderingOrderingType
>+	 * @generated
>+	 */
>+	EClass getOrderingOrderingType();
>+
>+	/**
>+	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.web.OrderingOrderingType#getName Name}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute list 'Name'.
>+	 * @see org.eclipse.jst.javaee.web.OrderingOrderingType#getName()
>+	 * @see #getOrderingOrderingType()
>+	 * @generated
>+	 */
>+	EAttribute getOrderingOrderingType_Name();
>+
>+	/**
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.web.OrderingOrderingType#getOthers Others}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference 'Others'.
>+	 * @see org.eclipse.jst.javaee.web.OrderingOrderingType#getOthers()
>+	 * @see #getOrderingOrderingType()
>+	 * @generated
>+	 */
>+	EReference getOrderingOrderingType_Others();
>+
>+	/**
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.OrderingOthersType Ordering Others Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for class 'Ordering Others Type'.
>+	 * @see org.eclipse.jst.javaee.web.OrderingOthersType
>+	 * @generated
>+	 */
>+	EClass getOrderingOthersType();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.OrderingOthersType#getId Id}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.web.OrderingOthersType#getId()
>+	 * @see #getOrderingOthersType()
>+	 * @generated
>+	 */
>+	EAttribute getOrderingOthersType_Id();
>+
>+	/**
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.OrderingType Ordering Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for class 'Ordering Type'.
>+	 * @see org.eclipse.jst.javaee.web.OrderingType
>+	 * @generated
>+	 */
>+	EClass getOrderingType();
>+
>+	/**
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.web.OrderingType#getAfter After}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference 'After'.
>+	 * @see org.eclipse.jst.javaee.web.OrderingType#getAfter()
>+	 * @see #getOrderingType()
>+	 * @generated
>+	 */
>+	EReference getOrderingType_After();
>+
>+	/**
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.web.OrderingType#getBefore Before}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference 'Before'.
>+	 * @see org.eclipse.jst.javaee.web.OrderingType#getBefore()
>+	 * @see #getOrderingType()
>+	 * @generated
>+	 */
>+	EReference getOrderingType_Before();
>+
>+	/**
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.SecurityConstraint Security Constraint}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for class 'Security Constraint'.
>+	 * @see org.eclipse.jst.javaee.web.SecurityConstraint
>+	 * @generated
>+	 */
>+	EClass getSecurityConstraint();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.SecurityConstraint#getDisplayNames Display Names}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Display Names'.
>+	 * @see org.eclipse.jst.javaee.web.SecurityConstraint#getDisplayNames()
>+	 * @see #getSecurityConstraint()
>+	 * @generated
>+	 */
>+	EReference getSecurityConstraint_DisplayNames();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.SecurityConstraint#getWebResourceCollections Web Resource Collections}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Web Resource Collections'.
>+	 * @see org.eclipse.jst.javaee.web.SecurityConstraint#getWebResourceCollections()
>+	 * @see #getSecurityConstraint()
>+	 * @generated
>+	 */
>+	EReference getSecurityConstraint_WebResourceCollections();
>+
>+	/**
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.web.SecurityConstraint#getAuthConstraint Auth Constraint}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference 'Auth Constraint'.
>+	 * @see org.eclipse.jst.javaee.web.SecurityConstraint#getAuthConstraint()
>+	 * @see #getSecurityConstraint()
>+	 * @generated
>+	 */
>+	EReference getSecurityConstraint_AuthConstraint();
>+
>+	/**
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.web.SecurityConstraint#getUserDataConstraint User Data Constraint}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference 'User Data Constraint'.
>+	 * @see org.eclipse.jst.javaee.web.SecurityConstraint#getUserDataConstraint()
>+	 * @see #getSecurityConstraint()
>+	 * @generated
>+	 */
>+	EReference getSecurityConstraint_UserDataConstraint();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.SecurityConstraint#getId Id}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.web.SecurityConstraint#getId()
>+	 * @see #getSecurityConstraint()
>+	 * @generated
>+	 */
>+	EAttribute getSecurityConstraint_Id();
>+
>+	/**
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.Servlet Servlet}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for class 'Servlet'.
>+	 * @see org.eclipse.jst.javaee.web.Servlet
>+	 * @generated
>+	 */
>+	EClass getServlet();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.Servlet#getDescriptions Descriptions}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Descriptions'.
>+	 * @see org.eclipse.jst.javaee.web.Servlet#getDescriptions()
>+	 * @see #getServlet()
>+	 * @generated
>+	 */
>+	EReference getServlet_Descriptions();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.Servlet#getDisplayNames Display Names}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Display Names'.
>+	 * @see org.eclipse.jst.javaee.web.Servlet#getDisplayNames()
>+	 * @see #getServlet()
>+	 * @generated
>+	 */
>+	EReference getServlet_DisplayNames();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.Servlet#getIcons Icons}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Icons'.
>+	 * @see org.eclipse.jst.javaee.web.Servlet#getIcons()
>+	 * @see #getServlet()
>+	 * @generated
>+	 */
>+	EReference getServlet_Icons();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.Servlet#getServletName Servlet Name}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Servlet Name'.
>+	 * @see org.eclipse.jst.javaee.web.Servlet#getServletName()
>+	 * @see #getServlet()
>+	 * @generated
>+	 */
>+	EAttribute getServlet_ServletName();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.Servlet#getServletClass Servlet Class}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Servlet Class'.
>+	 * @see org.eclipse.jst.javaee.web.Servlet#getServletClass()
>+	 * @see #getServlet()
>+	 * @generated
>+	 */
>+	EAttribute getServlet_ServletClass();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.Servlet#getJspFile Jsp File}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Jsp File'.
>+	 * @see org.eclipse.jst.javaee.web.Servlet#getJspFile()
>+	 * @see #getServlet()
>+	 * @generated
>+	 */
>+	EAttribute getServlet_JspFile();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.Servlet#getInitParams Init Params}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Init Params'.
>+	 * @see org.eclipse.jst.javaee.web.Servlet#getInitParams()
>+	 * @see #getServlet()
>+	 * @generated
>+	 */
>+	EReference getServlet_InitParams();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.Servlet#getLoadOnStartup Load On Startup}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Load On Startup'.
>+	 * @see org.eclipse.jst.javaee.web.Servlet#getLoadOnStartup()
>+	 * @see #getServlet()
>+	 * @generated
>+	 */
>+	EAttribute getServlet_LoadOnStartup();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.Servlet#isEnabled Enabled}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Enabled'.
>+	 * @see org.eclipse.jst.javaee.web.Servlet#isEnabled()
>+	 * @see #getServlet()
>+	 * @generated
>+	 */
>+	EAttribute getServlet_Enabled();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.Servlet#isAsyncSupported Async Supported}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Async Supported'.
>+	 * @see org.eclipse.jst.javaee.web.Servlet#isAsyncSupported()
>+	 * @see #getServlet()
>+	 * @generated
>+	 */
>+	EAttribute getServlet_AsyncSupported();
>+
>+	/**
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.web.Servlet#getRunAs Run As}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference 'Run As'.
>+	 * @see org.eclipse.jst.javaee.web.Servlet#getRunAs()
>+	 * @see #getServlet()
>+	 * @generated
>+	 */
>+	EReference getServlet_RunAs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.Servlet#getSecurityRoleRefs Security Role Refs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Security Role Refs'.
>+	 * @see org.eclipse.jst.javaee.web.Servlet#getSecurityRoleRefs()
>+	 * @see #getServlet()
>+	 * @generated
>+	 */
>+	EReference getServlet_SecurityRoleRefs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.web.Servlet#getMultipartConfig Multipart Config}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference 'Multipart Config'.
>+	 * @see org.eclipse.jst.javaee.web.Servlet#getMultipartConfig()
>+	 * @see #getServlet()
>+	 * @generated
>+	 */
>+	EReference getServlet_MultipartConfig();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.Servlet#getId Id}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.web.Servlet#getId()
>+	 * @see #getServlet()
>+	 * @generated
>+	 */
>+	EAttribute getServlet_Id();
>+
>+	/**
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.ServletMapping Servlet Mapping}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for class 'Servlet Mapping'.
>+	 * @see org.eclipse.jst.javaee.web.ServletMapping
>+	 * @generated
>+	 */
>+	EClass getServletMapping();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.ServletMapping#getServletName Servlet Name}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Servlet Name'.
>+	 * @see org.eclipse.jst.javaee.web.ServletMapping#getServletName()
>+	 * @see #getServletMapping()
>+	 * @generated
>+	 */
>+	EAttribute getServletMapping_ServletName();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.ServletMapping#getUrlPatterns Url Patterns}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Url Patterns'.
>+	 * @see org.eclipse.jst.javaee.web.ServletMapping#getUrlPatterns()
>+	 * @see #getServletMapping()
>+	 * @generated
>+	 */
>+	EReference getServletMapping_UrlPatterns();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.ServletMapping#getId Id}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.web.ServletMapping#getId()
>+	 * @see #getServletMapping()
>+	 * @generated
>+	 */
>+	EAttribute getServletMapping_Id();
>+
>+	/**
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.SessionConfig Session Config}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for class 'Session Config'.
>+	 * @see org.eclipse.jst.javaee.web.SessionConfig
>+	 * @generated
>+	 */
>+	EClass getSessionConfig();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.SessionConfig#getSessionTimeout Session Timeout}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Session Timeout'.
>+	 * @see org.eclipse.jst.javaee.web.SessionConfig#getSessionTimeout()
>+	 * @see #getSessionConfig()
>+	 * @generated
>+	 */
>+	EAttribute getSessionConfig_SessionTimeout();
>+
>+	/**
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.web.SessionConfig#getCookieConfig Cookie Config}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference 'Cookie Config'.
>+	 * @see org.eclipse.jst.javaee.web.SessionConfig#getCookieConfig()
>+	 * @see #getSessionConfig()
>+	 * @generated
>+	 */
>+	EReference getSessionConfig_CookieConfig();
>+
>+	/**
>+	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.web.SessionConfig#getTrackingMode Tracking Mode}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute list 'Tracking Mode'.
>+	 * @see org.eclipse.jst.javaee.web.SessionConfig#getTrackingMode()
>+	 * @see #getSessionConfig()
>+	 * @generated
>+	 */
>+	EAttribute getSessionConfig_TrackingMode();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.SessionConfig#getId Id}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.web.SessionConfig#getId()
>+	 * @see #getSessionConfig()
>+	 * @generated
>+	 */
>+	EAttribute getSessionConfig_Id();
>+
>+	/**
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.UserDataConstraint User Data Constraint}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for class 'User Data Constraint'.
>+	 * @see org.eclipse.jst.javaee.web.UserDataConstraint
>+	 * @generated
>+	 */
>+	EClass getUserDataConstraint();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.UserDataConstraint#getDescriptions Descriptions}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Descriptions'.
>+	 * @see org.eclipse.jst.javaee.web.UserDataConstraint#getDescriptions()
>+	 * @see #getUserDataConstraint()
>+	 * @generated
>+	 */
>+	EReference getUserDataConstraint_Descriptions();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.UserDataConstraint#getTransportGuarantee Transport Guarantee}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Transport Guarantee'.
>+	 * @see org.eclipse.jst.javaee.web.UserDataConstraint#getTransportGuarantee()
>+	 * @see #getUserDataConstraint()
>+	 * @generated
>+	 */
>+	EAttribute getUserDataConstraint_TransportGuarantee();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.UserDataConstraint#getId Id}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.web.UserDataConstraint#getId()
>+	 * @see #getUserDataConstraint()
>+	 * @generated
>+	 */
>+	EAttribute getUserDataConstraint_Id();
>+
>+	/**
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.WebApp App}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for class 'App'.
>+	 * @see org.eclipse.jst.javaee.web.WebApp
>+	 * @generated
>+	 */
>+	EClass getWebApp();
>+
>+	/**
>+	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.web.WebApp#getGroup Group}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute list 'Group'.
>+	 * @see org.eclipse.jst.javaee.web.WebApp#getGroup()
>+	 * @see #getWebApp()
>+	 * @generated
>+	 */
>+	EAttribute getWebApp_Group();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getDescriptions Descriptions}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Descriptions'.
>+	 * @see org.eclipse.jst.javaee.web.WebApp#getDescriptions()
>+	 * @see #getWebApp()
>+	 * @generated
>+	 */
>+	EReference getWebApp_Descriptions();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getDisplayNames Display Names}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Display Names'.
>+	 * @see org.eclipse.jst.javaee.web.WebApp#getDisplayNames()
>+	 * @see #getWebApp()
>+	 * @generated
>+	 */
>+	EReference getWebApp_DisplayNames();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getIcons Icons}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Icons'.
>+	 * @see org.eclipse.jst.javaee.web.WebApp#getIcons()
>+	 * @see #getWebApp()
>+	 * @generated
>+	 */
>+	EReference getWebApp_Icons();
>+
>+	/**
>+	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.web.WebApp#getName Name}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute list 'Name'.
>+	 * @see org.eclipse.jst.javaee.web.WebApp#getName()
>+	 * @see #getWebApp()
>+	 * @generated
>+	 */
>+	EAttribute getWebApp_Name();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getDistributables Distributables}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Distributables'.
>+	 * @see org.eclipse.jst.javaee.web.WebApp#getDistributables()
>+	 * @see #getWebApp()
>+	 * @generated
>+	 */
>+	EReference getWebApp_Distributables();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getContextParams Context Params}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Context Params'.
>+	 * @see org.eclipse.jst.javaee.web.WebApp#getContextParams()
>+	 * @see #getWebApp()
>+	 * @generated
>+	 */
>+	EReference getWebApp_ContextParams();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getFilters Filters}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Filters'.
>+	 * @see org.eclipse.jst.javaee.web.WebApp#getFilters()
>+	 * @see #getWebApp()
>+	 * @generated
>+	 */
>+	EReference getWebApp_Filters();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getFilterMappings Filter Mappings}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Filter Mappings'.
>+	 * @see org.eclipse.jst.javaee.web.WebApp#getFilterMappings()
>+	 * @see #getWebApp()
>+	 * @generated
>+	 */
>+	EReference getWebApp_FilterMappings();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getListeners Listeners}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Listeners'.
>+	 * @see org.eclipse.jst.javaee.web.WebApp#getListeners()
>+	 * @see #getWebApp()
>+	 * @generated
>+	 */
>+	EReference getWebApp_Listeners();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getServlets Servlets}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Servlets'.
>+	 * @see org.eclipse.jst.javaee.web.WebApp#getServlets()
>+	 * @see #getWebApp()
>+	 * @generated
>+	 */
>+	EReference getWebApp_Servlets();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getServletMappings Servlet Mappings}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Servlet Mappings'.
>+	 * @see org.eclipse.jst.javaee.web.WebApp#getServletMappings()
>+	 * @see #getWebApp()
>+	 * @generated
>+	 */
>+	EReference getWebApp_ServletMappings();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getSessionConfigs Session Configs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Session Configs'.
>+	 * @see org.eclipse.jst.javaee.web.WebApp#getSessionConfigs()
>+	 * @see #getWebApp()
>+	 * @generated
>+	 */
>+	EReference getWebApp_SessionConfigs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getMimeMappings Mime Mappings}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Mime Mappings'.
>+	 * @see org.eclipse.jst.javaee.web.WebApp#getMimeMappings()
>+	 * @see #getWebApp()
>+	 * @generated
>+	 */
>+	EReference getWebApp_MimeMappings();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getWelcomeFileLists Welcome File Lists}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Welcome File Lists'.
>+	 * @see org.eclipse.jst.javaee.web.WebApp#getWelcomeFileLists()
>+	 * @see #getWebApp()
>+	 * @generated
>+	 */
>+	EReference getWebApp_WelcomeFileLists();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getErrorPages Error Pages}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Error Pages'.
>+	 * @see org.eclipse.jst.javaee.web.WebApp#getErrorPages()
>+	 * @see #getWebApp()
>+	 * @generated
>+	 */
>+	EReference getWebApp_ErrorPages();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getJspConfigs Jsp Configs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Jsp Configs'.
>+	 * @see org.eclipse.jst.javaee.web.WebApp#getJspConfigs()
>+	 * @see #getWebApp()
>+	 * @generated
>+	 */
>+	EReference getWebApp_JspConfigs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getSecurityConstraints Security Constraints}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Security Constraints'.
>+	 * @see org.eclipse.jst.javaee.web.WebApp#getSecurityConstraints()
>+	 * @see #getWebApp()
>+	 * @generated
>+	 */
>+	EReference getWebApp_SecurityConstraints();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getLoginConfigs Login Configs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Login Configs'.
>+	 * @see org.eclipse.jst.javaee.web.WebApp#getLoginConfigs()
>+	 * @see #getWebApp()
>+	 * @generated
>+	 */
>+	EReference getWebApp_LoginConfigs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getSecurityRoles Security Roles}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Security Roles'.
>+	 * @see org.eclipse.jst.javaee.web.WebApp#getSecurityRoles()
>+	 * @see #getWebApp()
>+	 * @generated
>+	 */
>+	EReference getWebApp_SecurityRoles();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getEnvEntries Env Entries}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Env Entries'.
>+	 * @see org.eclipse.jst.javaee.web.WebApp#getEnvEntries()
>+	 * @see #getWebApp()
>+	 * @generated
>+	 */
>+	EReference getWebApp_EnvEntries();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getEjbRefs Ejb Refs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Ejb Refs'.
>+	 * @see org.eclipse.jst.javaee.web.WebApp#getEjbRefs()
>+	 * @see #getWebApp()
>+	 * @generated
>+	 */
>+	EReference getWebApp_EjbRefs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getEjbLocalRefs Ejb Local Refs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Ejb Local Refs'.
>+	 * @see org.eclipse.jst.javaee.web.WebApp#getEjbLocalRefs()
>+	 * @see #getWebApp()
>+	 * @generated
>+	 */
>+	EReference getWebApp_EjbLocalRefs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getServiceRefs Service Refs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Service Refs'.
>+	 * @see org.eclipse.jst.javaee.web.WebApp#getServiceRefs()
>+	 * @see #getWebApp()
>+	 * @generated
>+	 */
>+	EReference getWebApp_ServiceRefs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getResourceRefs Resource Refs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Resource Refs'.
>+	 * @see org.eclipse.jst.javaee.web.WebApp#getResourceRefs()
>+	 * @see #getWebApp()
>+	 * @generated
>+	 */
>+	EReference getWebApp_ResourceRefs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getResourceEnvRefs Resource Env Refs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Resource Env Refs'.
>+	 * @see org.eclipse.jst.javaee.web.WebApp#getResourceEnvRefs()
>+	 * @see #getWebApp()
>+	 * @generated
>+	 */
>+	EReference getWebApp_ResourceEnvRefs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getMessageDestinationRefs Message Destination Refs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Message Destination Refs'.
>+	 * @see org.eclipse.jst.javaee.web.WebApp#getMessageDestinationRefs()
>+	 * @see #getWebApp()
>+	 * @generated
>+	 */
>+	EReference getWebApp_MessageDestinationRefs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getPersistenceContextRefs Persistence Context Refs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Persistence Context Refs'.
>+	 * @see org.eclipse.jst.javaee.web.WebApp#getPersistenceContextRefs()
>+	 * @see #getWebApp()
>+	 * @generated
>+	 */
>+	EReference getWebApp_PersistenceContextRefs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getPersistenceUnitRefs Persistence Unit Refs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Persistence Unit Refs'.
>+	 * @see org.eclipse.jst.javaee.web.WebApp#getPersistenceUnitRefs()
>+	 * @see #getWebApp()
>+	 * @generated
>+	 */
>+	EReference getWebApp_PersistenceUnitRefs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getPostConstructs Post Constructs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Post Constructs'.
>+	 * @see org.eclipse.jst.javaee.web.WebApp#getPostConstructs()
>+	 * @see #getWebApp()
>+	 * @generated
>+	 */
>+	EReference getWebApp_PostConstructs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getPreDestroys Pre Destroys}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Pre Destroys'.
>+	 * @see org.eclipse.jst.javaee.web.WebApp#getPreDestroys()
>+	 * @see #getWebApp()
>+	 * @generated
>+	 */
>+	EReference getWebApp_PreDestroys();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getDataSource Data Source}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Data Source'.
>+	 * @see org.eclipse.jst.javaee.web.WebApp#getDataSource()
>+	 * @see #getWebApp()
>+	 * @generated
>+	 */
>+	EReference getWebApp_DataSource();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getMessageDestinations Message Destinations}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Message Destinations'.
>+	 * @see org.eclipse.jst.javaee.web.WebApp#getMessageDestinations()
>+	 * @see #getWebApp()
>+	 * @generated
>+	 */
>+	EReference getWebApp_MessageDestinations();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getLocalEncodingMappingsLists Local Encoding Mappings Lists}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Local Encoding Mappings Lists'.
>+	 * @see org.eclipse.jst.javaee.web.WebApp#getLocalEncodingMappingsLists()
>+	 * @see #getWebApp()
>+	 * @generated
>+	 */
>+	EReference getWebApp_LocalEncodingMappingsLists();
>+
>+	/**
>+	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.web.WebApp#getModuleName Module Name}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute list 'Module Name'.
>+	 * @see org.eclipse.jst.javaee.web.WebApp#getModuleName()
>+	 * @see #getWebApp()
>+	 * @generated
>+	 */
>+	EAttribute getWebApp_ModuleName();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getAbsoluteOrdering Absolute Ordering}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Absolute Ordering'.
>+	 * @see org.eclipse.jst.javaee.web.WebApp#getAbsoluteOrdering()
>+	 * @see #getWebApp()
>+	 * @generated
>+	 */
>+	EReference getWebApp_AbsoluteOrdering();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.WebApp#getId Id}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.web.WebApp#getId()
>+	 * @see #getWebApp()
>+	 * @generated
>+	 */
>+	EAttribute getWebApp_Id();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.WebApp#isMetadataComplete Metadata Complete}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Metadata Complete'.
>+	 * @see org.eclipse.jst.javaee.web.WebApp#isMetadataComplete()
>+	 * @see #getWebApp()
>+	 * @generated
>+	 */
>+	EAttribute getWebApp_MetadataComplete();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.WebApp#getVersion Version}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Version'.
>+	 * @see org.eclipse.jst.javaee.web.WebApp#getVersion()
>+	 * @see #getWebApp()
>+	 * @generated
>+	 */
>+	EAttribute getWebApp_Version();
>+
>+	/**
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.WebAppDeploymentDescriptor App Deployment Descriptor}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for class 'App Deployment Descriptor'.
>+	 * @see org.eclipse.jst.javaee.web.WebAppDeploymentDescriptor
>+	 * @generated
>+	 */
>+	EClass getWebAppDeploymentDescriptor();
>+
>+	/**
>+	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.web.WebAppDeploymentDescriptor#getMixed Mixed}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute list 'Mixed'.
>+	 * @see org.eclipse.jst.javaee.web.WebAppDeploymentDescriptor#getMixed()
>+	 * @see #getWebAppDeploymentDescriptor()
>+	 * @generated
>+	 */
>+	EAttribute getWebAppDeploymentDescriptor_Mixed();
>+
>+	/**
>+	 * Returns the meta object for the map '{@link org.eclipse.jst.javaee.web.WebAppDeploymentDescriptor#getXMLNSPrefixMap XMLNS Prefix Map}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the map 'XMLNS Prefix Map'.
>+	 * @see org.eclipse.jst.javaee.web.WebAppDeploymentDescriptor#getXMLNSPrefixMap()
>+	 * @see #getWebAppDeploymentDescriptor()
>+	 * @generated
>+	 */
>+	EReference getWebAppDeploymentDescriptor_XMLNSPrefixMap();
>+
>+	/**
>+	 * Returns the meta object for the map '{@link org.eclipse.jst.javaee.web.WebAppDeploymentDescriptor#getXSISchemaLocation XSI Schema Location}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the map 'XSI Schema Location'.
>+	 * @see org.eclipse.jst.javaee.web.WebAppDeploymentDescriptor#getXSISchemaLocation()
>+	 * @see #getWebAppDeploymentDescriptor()
>+	 * @generated
>+	 */
>+	EReference getWebAppDeploymentDescriptor_XSISchemaLocation();
>+
>+	/**
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.web.WebAppDeploymentDescriptor#getWebApp Web App}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference 'Web App'.
>+	 * @see org.eclipse.jst.javaee.web.WebAppDeploymentDescriptor#getWebApp()
>+	 * @see #getWebAppDeploymentDescriptor()
>+	 * @generated
>+	 */
>+	EReference getWebAppDeploymentDescriptor_WebApp();
>+
>+	/**
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.WebFragment Fragment}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for class 'Fragment'.
>+	 * @see org.eclipse.jst.javaee.web.WebFragment
>+	 * @generated
>+	 */
>+	EClass getWebFragment();
>+
>+	/**
>+	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.web.WebFragment#getGroup Group}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute list 'Group'.
>+	 * @see org.eclipse.jst.javaee.web.WebFragment#getGroup()
>+	 * @see #getWebFragment()
>+	 * @generated
>+	 */
>+	EAttribute getWebFragment_Group();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebFragment#getDescriptions Descriptions}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Descriptions'.
>+	 * @see org.eclipse.jst.javaee.web.WebFragment#getDescriptions()
>+	 * @see #getWebFragment()
>+	 * @generated
>+	 */
>+	EReference getWebFragment_Descriptions();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebFragment#getDisplayNames Display Names}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Display Names'.
>+	 * @see org.eclipse.jst.javaee.web.WebFragment#getDisplayNames()
>+	 * @see #getWebFragment()
>+	 * @generated
>+	 */
>+	EReference getWebFragment_DisplayNames();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebFragment#getIcons Icons}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Icons'.
>+	 * @see org.eclipse.jst.javaee.web.WebFragment#getIcons()
>+	 * @see #getWebFragment()
>+	 * @generated
>+	 */
>+	EReference getWebFragment_Icons();
>+
>+	/**
>+	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.web.WebFragment#getName Name}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute list 'Name'.
>+	 * @see org.eclipse.jst.javaee.web.WebFragment#getName()
>+	 * @see #getWebFragment()
>+	 * @generated
>+	 */
>+	EAttribute getWebFragment_Name();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebFragment#getDistributables Distributables}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Distributables'.
>+	 * @see org.eclipse.jst.javaee.web.WebFragment#getDistributables()
>+	 * @see #getWebFragment()
>+	 * @generated
>+	 */
>+	EReference getWebFragment_Distributables();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebFragment#getContextParams Context Params}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Context Params'.
>+	 * @see org.eclipse.jst.javaee.web.WebFragment#getContextParams()
>+	 * @see #getWebFragment()
>+	 * @generated
>+	 */
>+	EReference getWebFragment_ContextParams();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebFragment#getFilters Filters}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Filters'.
>+	 * @see org.eclipse.jst.javaee.web.WebFragment#getFilters()
>+	 * @see #getWebFragment()
>+	 * @generated
>+	 */
>+	EReference getWebFragment_Filters();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebFragment#getFilterMappings Filter Mappings}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Filter Mappings'.
>+	 * @see org.eclipse.jst.javaee.web.WebFragment#getFilterMappings()
>+	 * @see #getWebFragment()
>+	 * @generated
>+	 */
>+	EReference getWebFragment_FilterMappings();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebFragment#getListeners Listeners}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Listeners'.
>+	 * @see org.eclipse.jst.javaee.web.WebFragment#getListeners()
>+	 * @see #getWebFragment()
>+	 * @generated
>+	 */
>+	EReference getWebFragment_Listeners();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebFragment#getServlets Servlets}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Servlets'.
>+	 * @see org.eclipse.jst.javaee.web.WebFragment#getServlets()
>+	 * @see #getWebFragment()
>+	 * @generated
>+	 */
>+	EReference getWebFragment_Servlets();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebFragment#getServletMappings Servlet Mappings}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Servlet Mappings'.
>+	 * @see org.eclipse.jst.javaee.web.WebFragment#getServletMappings()
>+	 * @see #getWebFragment()
>+	 * @generated
>+	 */
>+	EReference getWebFragment_ServletMappings();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebFragment#getSessionConfigs Session Configs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Session Configs'.
>+	 * @see org.eclipse.jst.javaee.web.WebFragment#getSessionConfigs()
>+	 * @see #getWebFragment()
>+	 * @generated
>+	 */
>+	EReference getWebFragment_SessionConfigs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebFragment#getMimeMappings Mime Mappings}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Mime Mappings'.
>+	 * @see org.eclipse.jst.javaee.web.WebFragment#getMimeMappings()
>+	 * @see #getWebFragment()
>+	 * @generated
>+	 */
>+	EReference getWebFragment_MimeMappings();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebFragment#getWelcomeFileLists Welcome File Lists}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Welcome File Lists'.
>+	 * @see org.eclipse.jst.javaee.web.WebFragment#getWelcomeFileLists()
>+	 * @see #getWebFragment()
>+	 * @generated
>+	 */
>+	EReference getWebFragment_WelcomeFileLists();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebFragment#getErrorPages Error Pages}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Error Pages'.
>+	 * @see org.eclipse.jst.javaee.web.WebFragment#getErrorPages()
>+	 * @see #getWebFragment()
>+	 * @generated
>+	 */
>+	EReference getWebFragment_ErrorPages();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebFragment#getJspConfigs Jsp Configs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Jsp Configs'.
>+	 * @see org.eclipse.jst.javaee.web.WebFragment#getJspConfigs()
>+	 * @see #getWebFragment()
>+	 * @generated
>+	 */
>+	EReference getWebFragment_JspConfigs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebFragment#getSecurityConstraints Security Constraints}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Security Constraints'.
>+	 * @see org.eclipse.jst.javaee.web.WebFragment#getSecurityConstraints()
>+	 * @see #getWebFragment()
>+	 * @generated
>+	 */
>+	EReference getWebFragment_SecurityConstraints();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebFragment#getLoginConfigs Login Configs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Login Configs'.
>+	 * @see org.eclipse.jst.javaee.web.WebFragment#getLoginConfigs()
>+	 * @see #getWebFragment()
>+	 * @generated
>+	 */
>+	EReference getWebFragment_LoginConfigs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebFragment#getSecurityRoles Security Roles}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Security Roles'.
>+	 * @see org.eclipse.jst.javaee.web.WebFragment#getSecurityRoles()
>+	 * @see #getWebFragment()
>+	 * @generated
>+	 */
>+	EReference getWebFragment_SecurityRoles();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebFragment#getEnvEntries Env Entries}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Env Entries'.
>+	 * @see org.eclipse.jst.javaee.web.WebFragment#getEnvEntries()
>+	 * @see #getWebFragment()
>+	 * @generated
>+	 */
>+	EReference getWebFragment_EnvEntries();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebFragment#getEjbRefs Ejb Refs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Ejb Refs'.
>+	 * @see org.eclipse.jst.javaee.web.WebFragment#getEjbRefs()
>+	 * @see #getWebFragment()
>+	 * @generated
>+	 */
>+	EReference getWebFragment_EjbRefs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebFragment#getEjbLocalRefs Ejb Local Refs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Ejb Local Refs'.
>+	 * @see org.eclipse.jst.javaee.web.WebFragment#getEjbLocalRefs()
>+	 * @see #getWebFragment()
>+	 * @generated
>+	 */
>+	EReference getWebFragment_EjbLocalRefs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebFragment#getServiceRefs Service Refs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Service Refs'.
>+	 * @see org.eclipse.jst.javaee.web.WebFragment#getServiceRefs()
>+	 * @see #getWebFragment()
>+	 * @generated
>+	 */
>+	EReference getWebFragment_ServiceRefs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebFragment#getResourceRefs Resource Refs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Resource Refs'.
>+	 * @see org.eclipse.jst.javaee.web.WebFragment#getResourceRefs()
>+	 * @see #getWebFragment()
>+	 * @generated
>+	 */
>+	EReference getWebFragment_ResourceRefs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebFragment#getResourceEnvRefs Resource Env Refs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Resource Env Refs'.
>+	 * @see org.eclipse.jst.javaee.web.WebFragment#getResourceEnvRefs()
>+	 * @see #getWebFragment()
>+	 * @generated
>+	 */
>+	EReference getWebFragment_ResourceEnvRefs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebFragment#getMessageDestinationRefs Message Destination Refs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Message Destination Refs'.
>+	 * @see org.eclipse.jst.javaee.web.WebFragment#getMessageDestinationRefs()
>+	 * @see #getWebFragment()
>+	 * @generated
>+	 */
>+	EReference getWebFragment_MessageDestinationRefs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebFragment#getPersistenceContextRefs Persistence Context Refs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Persistence Context Refs'.
>+	 * @see org.eclipse.jst.javaee.web.WebFragment#getPersistenceContextRefs()
>+	 * @see #getWebFragment()
>+	 * @generated
>+	 */
>+	EReference getWebFragment_PersistenceContextRefs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebFragment#getPersistenceUnitRefs Persistence Unit Refs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Persistence Unit Refs'.
>+	 * @see org.eclipse.jst.javaee.web.WebFragment#getPersistenceUnitRefs()
>+	 * @see #getWebFragment()
>+	 * @generated
>+	 */
>+	EReference getWebFragment_PersistenceUnitRefs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebFragment#getPostConstructs Post Constructs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Post Constructs'.
>+	 * @see org.eclipse.jst.javaee.web.WebFragment#getPostConstructs()
>+	 * @see #getWebFragment()
>+	 * @generated
>+	 */
>+	EReference getWebFragment_PostConstructs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebFragment#getPreDestroys Pre Destroys}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Pre Destroys'.
>+	 * @see org.eclipse.jst.javaee.web.WebFragment#getPreDestroys()
>+	 * @see #getWebFragment()
>+	 * @generated
>+	 */
>+	EReference getWebFragment_PreDestroys();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebFragment#getDataSource Data Source}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Data Source'.
>+	 * @see org.eclipse.jst.javaee.web.WebFragment#getDataSource()
>+	 * @see #getWebFragment()
>+	 * @generated
>+	 */
>+	EReference getWebFragment_DataSource();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebFragment#getMessageDestinations Message Destinations}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Message Destinations'.
>+	 * @see org.eclipse.jst.javaee.web.WebFragment#getMessageDestinations()
>+	 * @see #getWebFragment()
>+	 * @generated
>+	 */
>+	EReference getWebFragment_MessageDestinations();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebFragment#getLocalEncodingMappingsLists Local Encoding Mappings Lists}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Local Encoding Mappings Lists'.
>+	 * @see org.eclipse.jst.javaee.web.WebFragment#getLocalEncodingMappingsLists()
>+	 * @see #getWebFragment()
>+	 * @generated
>+	 */
>+	EReference getWebFragment_LocalEncodingMappingsLists();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebFragment#getOrdering Ordering}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Ordering'.
>+	 * @see org.eclipse.jst.javaee.web.WebFragment#getOrdering()
>+	 * @see #getWebFragment()
>+	 * @generated
>+	 */
>+	EReference getWebFragment_Ordering();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.WebFragment#getId Id}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.web.WebFragment#getId()
>+	 * @see #getWebFragment()
>+	 * @generated
>+	 */
>+	EAttribute getWebFragment_Id();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.WebFragment#isMetadataComplete Metadata Complete}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Metadata Complete'.
>+	 * @see org.eclipse.jst.javaee.web.WebFragment#isMetadataComplete()
>+	 * @see #getWebFragment()
>+	 * @generated
>+	 */
>+	EAttribute getWebFragment_MetadataComplete();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.WebFragment#getVersion Version}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Version'.
>+	 * @see org.eclipse.jst.javaee.web.WebFragment#getVersion()
>+	 * @see #getWebFragment()
>+	 * @generated
>+	 */
>+	EAttribute getWebFragment_Version();
>+
>+	/**
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.WebResourceCollection Resource Collection}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for class 'Resource Collection'.
>+	 * @see org.eclipse.jst.javaee.web.WebResourceCollection
>+	 * @generated
>+	 */
>+	EClass getWebResourceCollection();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.WebResourceCollection#getWebResourceName Web Resource Name}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Web Resource Name'.
>+	 * @see org.eclipse.jst.javaee.web.WebResourceCollection#getWebResourceName()
>+	 * @see #getWebResourceCollection()
>+	 * @generated
>+	 */
>+	EAttribute getWebResourceCollection_WebResourceName();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebResourceCollection#getDescriptions Descriptions}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Descriptions'.
>+	 * @see org.eclipse.jst.javaee.web.WebResourceCollection#getDescriptions()
>+	 * @see #getWebResourceCollection()
>+	 * @generated
>+	 */
>+	EReference getWebResourceCollection_Descriptions();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebResourceCollection#getUrlPatterns Url Patterns}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Url Patterns'.
>+	 * @see org.eclipse.jst.javaee.web.WebResourceCollection#getUrlPatterns()
>+	 * @see #getWebResourceCollection()
>+	 * @generated
>+	 */
>+	EReference getWebResourceCollection_UrlPatterns();
>+
>+	/**
>+	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.web.WebResourceCollection#getHttpMethods Http Methods}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute list 'Http Methods'.
>+	 * @see org.eclipse.jst.javaee.web.WebResourceCollection#getHttpMethods()
>+	 * @see #getWebResourceCollection()
>+	 * @generated
>+	 */
>+	EAttribute getWebResourceCollection_HttpMethods();
>+
>+	/**
>+	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.web.WebResourceCollection#getHttpMethodOmission Http Method Omission}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute list 'Http Method Omission'.
>+	 * @see org.eclipse.jst.javaee.web.WebResourceCollection#getHttpMethodOmission()
>+	 * @see #getWebResourceCollection()
>+	 * @generated
>+	 */
>+	EAttribute getWebResourceCollection_HttpMethodOmission();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.WebResourceCollection#getId Id}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.web.WebResourceCollection#getId()
>+	 * @see #getWebResourceCollection()
>+	 * @generated
>+	 */
>+	EAttribute getWebResourceCollection_Id();
>+
>+	/**
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.WelcomeFileList Welcome File List}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for class 'Welcome File List'.
>+	 * @see org.eclipse.jst.javaee.web.WelcomeFileList
>+	 * @generated
>+	 */
>+	EClass getWelcomeFileList();
>+
>+	/**
>+	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.web.WelcomeFileList#getWelcomeFiles Welcome Files}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute list 'Welcome Files'.
>+	 * @see org.eclipse.jst.javaee.web.WelcomeFileList#getWelcomeFiles()
>+	 * @see #getWelcomeFileList()
>+	 * @generated
>+	 */
>+	EAttribute getWelcomeFileList_WelcomeFiles();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.WelcomeFileList#getId Id}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.web.WelcomeFileList#getId()
>+	 * @see #getWelcomeFileList()
>+	 * @generated
>+	 */
>+	EAttribute getWelcomeFileList_Id();
>+
>+	/**
>+	 * Returns the meta object for enum '{@link org.eclipse.jst.javaee.web.DispatcherType Dispatcher Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for enum 'Dispatcher Type'.
>+	 * @see org.eclipse.jst.javaee.web.DispatcherType
>+	 * @generated
>+	 */
>+	EEnum getDispatcherType();
>+
>+	/**
>+	 * Returns the meta object for enum '{@link org.eclipse.jst.javaee.web.NullCharType Null Char Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for enum 'Null Char Type'.
>+	 * @see org.eclipse.jst.javaee.web.NullCharType
>+	 * @generated
>+	 */
>+	EEnum getNullCharType();
>+
>+	/**
>+	 * Returns the meta object for enum '{@link org.eclipse.jst.javaee.web.TrackingModeType Tracking Mode Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for enum 'Tracking Mode Type'.
>+	 * @see org.eclipse.jst.javaee.web.TrackingModeType
>+	 * @generated
>+	 */
>+	EEnum getTrackingModeType();
>+
>+	/**
>+	 * Returns the meta object for enum '{@link org.eclipse.jst.javaee.web.TransportGuaranteeType Transport Guarantee Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for enum 'Transport Guarantee Type'.
>+	 * @see org.eclipse.jst.javaee.web.TransportGuaranteeType
>+	 * @generated
>+	 */
>+	EEnum getTransportGuaranteeType();
>+
>+	/**
>+	 * Returns the meta object for enum '{@link org.eclipse.jst.javaee.web.WebAppVersionType App Version Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for enum 'App Version Type'.
>+	 * @see org.eclipse.jst.javaee.web.WebAppVersionType
>+	 * @generated
>+	 */
>+	EEnum getWebAppVersionType();
>+
>+	/**
>+	 * Returns the meta object for data type '{@link java.lang.String Auth Method Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for data type 'Auth Method Type'.
>+	 * @see java.lang.String
>+	 * @generated
>+	 */
>+	EDataType getAuthMethodType();
>+
>+	/**
>+	 * Returns the meta object for data type '{@link org.eclipse.jst.javaee.web.DispatcherType Dispatcher Type Object}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for data type 'Dispatcher Type Object'.
>+	 * @see org.eclipse.jst.javaee.web.DispatcherType
>+	 * @generated
>+	 */
>+	EDataType getDispatcherTypeObject();
>+
>+	/**
>+	 * Returns the meta object for data type '{@link java.lang.String Encoding Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for data type 'Encoding Type'.
>+	 * @see java.lang.String
>+	 * @generated
>+	 */
>+	EDataType getEncodingType();
>+
>+	/**
>+	 * Returns the meta object for data type '{@link java.math.BigInteger Error Code Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for data type 'Error Code Type'.
>+	 * @see java.math.BigInteger
>+	 * @generated
>+	 */
>+	EDataType getErrorCodeType();
>+
>+	/**
>+	 * Returns the meta object for data type '{@link java.lang.String Filter Name Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for data type 'Filter Name Type'.
>+	 * @see java.lang.String
>+	 * @generated
>+	 */
>+	EDataType getFilterNameType();
>+
>+	/**
>+	 * Returns the meta object for data type '{@link java.lang.String Http Method Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for data type 'Http Method Type'.
>+	 * @see java.lang.String
>+	 * @generated
>+	 */
>+	EDataType getHttpMethodType();
>+
>+	/**
>+	 * Returns the meta object for data type '{@link java.lang.Object Load On Startup Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for data type 'Load On Startup Type'.
>+	 * @see java.lang.Object
>+	 * @generated
>+	 */
>+	EDataType getLoadOnStartupType();
>+
>+	/**
>+	 * Returns the meta object for data type '{@link java.lang.String Locale Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for data type 'Locale Type'.
>+	 * @see java.lang.String
>+	 * @generated
>+	 */
>+	EDataType getLocaleType();
>+
>+	/**
>+	 * Returns the meta object for data type '{@link java.lang.String Mime Type Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for data type 'Mime Type Type'.
>+	 * @see java.lang.String
>+	 * @generated
>+	 */
>+	EDataType getMimeTypeType();
>+
>+	/**
>+	 * Returns the meta object for data type '{@link java.lang.String Non Empty String Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for data type 'Non Empty String Type'.
>+	 * @see java.lang.String
>+	 * @generated
>+	 */
>+	EDataType getNonEmptyStringType();
>+
>+	/**
>+	 * Returns the meta object for data type '{@link org.eclipse.jst.javaee.web.NullCharType Null Char Type Object}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for data type 'Null Char Type Object'.
>+	 * @see org.eclipse.jst.javaee.web.NullCharType
>+	 * @generated
>+	 */
>+	EDataType getNullCharTypeObject();
>+
>+	/**
>+	 * Returns the meta object for data type '{@link java.lang.String Servlet Name Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for data type 'Servlet Name Type'.
>+	 * @see java.lang.String
>+	 * @generated
>+	 */
>+	EDataType getServletNameType();
>+
>+	/**
>+	 * Returns the meta object for data type '{@link org.eclipse.jst.javaee.web.TrackingModeType Tracking Mode Type Object}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for data type 'Tracking Mode Type Object'.
>+	 * @see org.eclipse.jst.javaee.web.TrackingModeType
>+	 * @generated
>+	 */
>+	EDataType getTrackingModeTypeObject();
>+
>+	/**
>+	 * Returns the meta object for data type '{@link org.eclipse.jst.javaee.web.TransportGuaranteeType Transport Guarantee Type Object}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for data type 'Transport Guarantee Type Object'.
>+	 * @see org.eclipse.jst.javaee.web.TransportGuaranteeType
>+	 * @generated
>+	 */
>+	EDataType getTransportGuaranteeTypeObject();
>+
>+	/**
>+	 * Returns the meta object for data type '{@link java.lang.String War Path Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for data type 'War Path Type'.
>+	 * @see java.lang.String
>+	 * @generated
>+	 */
>+	EDataType getWarPathType();
>+
>+	/**
>+	 * Returns the meta object for data type '{@link org.eclipse.jst.javaee.web.WebAppVersionType App Version Type Object}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for data type 'App Version Type Object'.
>+	 * @see org.eclipse.jst.javaee.web.WebAppVersionType
>+	 * @generated
>+	 */
>+	EDataType getWebAppVersionTypeObject();
>+
>+	/**
>+	 * Returns the factory that creates the instances of the model.
>+	 * 
>+	 * 
>+	 * @return the factory that creates the instances of the model.
>+	 * @generated
>+	 */
>+	WebFactory getWebFactory();
>+
>+	/**
>+	 * 
>+	 * Defines literals for the meta objects that represent
>+	 * <ul>
>+	 * <li>each class,</li>
>+	 * <li>each feature of each class,</li>
>+	 * <li>each enum,</li>
>+	 * <li>and each data type</li>
>+	 * </ul>
>+	 * 
>+	 * @generated
>+	 */
>+	interface Literals {
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.AbsoluteOrderingTypeImpl Absolute Ordering Type}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.AbsoluteOrderingTypeImpl
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getAbsoluteOrderingType()
>+		 * @generated
>+		 */
>+		EClass ABSOLUTE_ORDERING_TYPE = eINSTANCE.getAbsoluteOrderingType();
>+
>+		/**
>+		 * The meta object literal for the 'Group' attribute list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute ABSOLUTE_ORDERING_TYPE__GROUP = eINSTANCE.getAbsoluteOrderingType_Group();
>+
>+		/**
>+		 * The meta object literal for the 'Name' attribute list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute ABSOLUTE_ORDERING_TYPE__NAME = eINSTANCE.getAbsoluteOrderingType_Name();
>+
>+		/**
>+		 * The meta object literal for the 'Others' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference ABSOLUTE_ORDERING_TYPE__OTHERS = eINSTANCE.getAbsoluteOrderingType_Others();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.AuthConstraintImpl Auth Constraint}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.AuthConstraintImpl
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getAuthConstraint()
>+		 * @generated
>+		 */
>+		EClass AUTH_CONSTRAINT = eINSTANCE.getAuthConstraint();
>+
>+		/**
>+		 * The meta object literal for the 'Descriptions' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference AUTH_CONSTRAINT__DESCRIPTIONS = eINSTANCE.getAuthConstraint_Descriptions();
>+
>+		/**
>+		 * The meta object literal for the 'Role Names' attribute list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute AUTH_CONSTRAINT__ROLE_NAMES = eINSTANCE.getAuthConstraint_RoleNames();
>+
>+		/**
>+		 * The meta object literal for the 'Id' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute AUTH_CONSTRAINT__ID = eINSTANCE.getAuthConstraint_Id();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.CookieCommentTypeImpl Cookie Comment Type}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.CookieCommentTypeImpl
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getCookieCommentType()
>+		 * @generated
>+		 */
>+		EClass COOKIE_COMMENT_TYPE = eINSTANCE.getCookieCommentType();
>+
>+		/**
>+		 * The meta object literal for the 'Value' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute COOKIE_COMMENT_TYPE__VALUE = eINSTANCE.getCookieCommentType_Value();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.CookieConfigTypeImpl Cookie Config Type}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.CookieConfigTypeImpl
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getCookieConfigType()
>+		 * @generated
>+		 */
>+		EClass COOKIE_CONFIG_TYPE = eINSTANCE.getCookieConfigType();
>+
>+		/**
>+		 * The meta object literal for the 'Name' containment reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference COOKIE_CONFIG_TYPE__NAME = eINSTANCE.getCookieConfigType_Name();
>+
>+		/**
>+		 * The meta object literal for the 'Domain' containment reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference COOKIE_CONFIG_TYPE__DOMAIN = eINSTANCE.getCookieConfigType_Domain();
>+
>+		/**
>+		 * The meta object literal for the 'Path' containment reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference COOKIE_CONFIG_TYPE__PATH = eINSTANCE.getCookieConfigType_Path();
>+
>+		/**
>+		 * The meta object literal for the 'Comment' containment reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference COOKIE_CONFIG_TYPE__COMMENT = eINSTANCE.getCookieConfigType_Comment();
>+
>+		/**
>+		 * The meta object literal for the 'Http Only' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute COOKIE_CONFIG_TYPE__HTTP_ONLY = eINSTANCE.getCookieConfigType_HttpOnly();
>+
>+		/**
>+		 * The meta object literal for the 'Secure' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute COOKIE_CONFIG_TYPE__SECURE = eINSTANCE.getCookieConfigType_Secure();
>+
>+		/**
>+		 * The meta object literal for the 'Max Age' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute COOKIE_CONFIG_TYPE__MAX_AGE = eINSTANCE.getCookieConfigType_MaxAge();
>+
>+		/**
>+		 * The meta object literal for the 'Id' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute COOKIE_CONFIG_TYPE__ID = eINSTANCE.getCookieConfigType_Id();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.CookieDomainTypeImpl Cookie Domain Type}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.CookieDomainTypeImpl
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getCookieDomainType()
>+		 * @generated
>+		 */
>+		EClass COOKIE_DOMAIN_TYPE = eINSTANCE.getCookieDomainType();
>+
>+		/**
>+		 * The meta object literal for the 'Value' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute COOKIE_DOMAIN_TYPE__VALUE = eINSTANCE.getCookieDomainType_Value();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.CookieNameTypeImpl Cookie Name Type}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.CookieNameTypeImpl
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getCookieNameType()
>+		 * @generated
>+		 */
>+		EClass COOKIE_NAME_TYPE = eINSTANCE.getCookieNameType();
>+
>+		/**
>+		 * The meta object literal for the 'Value' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute COOKIE_NAME_TYPE__VALUE = eINSTANCE.getCookieNameType_Value();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.CookiePathTypeImpl Cookie Path Type}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.CookiePathTypeImpl
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getCookiePathType()
>+		 * @generated
>+		 */
>+		EClass COOKIE_PATH_TYPE = eINSTANCE.getCookiePathType();
>+
>+		/**
>+		 * The meta object literal for the 'Value' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute COOKIE_PATH_TYPE__VALUE = eINSTANCE.getCookiePathType_Value();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.ErrorPageImpl Error Page}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.ErrorPageImpl
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getErrorPage()
>+		 * @generated
>+		 */
>+		EClass ERROR_PAGE = eINSTANCE.getErrorPage();
>+
>+		/**
>+		 * The meta object literal for the 'Error Code' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute ERROR_PAGE__ERROR_CODE = eINSTANCE.getErrorPage_ErrorCode();
>+
>+		/**
>+		 * The meta object literal for the 'Exception Type' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute ERROR_PAGE__EXCEPTION_TYPE = eINSTANCE.getErrorPage_ExceptionType();
>+
>+		/**
>+		 * The meta object literal for the 'Location' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute ERROR_PAGE__LOCATION = eINSTANCE.getErrorPage_Location();
>+
>+		/**
>+		 * The meta object literal for the 'Id' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute ERROR_PAGE__ID = eINSTANCE.getErrorPage_Id();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.FilterImpl Filter}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.FilterImpl
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getFilter()
>+		 * @generated
>+		 */
>+		EClass FILTER = eINSTANCE.getFilter();
>+
>+		/**
>+		 * The meta object literal for the 'Descriptions' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference FILTER__DESCRIPTIONS = eINSTANCE.getFilter_Descriptions();
>+
>+		/**
>+		 * The meta object literal for the 'Display Names' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference FILTER__DISPLAY_NAMES = eINSTANCE.getFilter_DisplayNames();
>+
>+		/**
>+		 * The meta object literal for the 'Icons' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference FILTER__ICONS = eINSTANCE.getFilter_Icons();
>+
>+		/**
>+		 * The meta object literal for the 'Filter Name' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute FILTER__FILTER_NAME = eINSTANCE.getFilter_FilterName();
>+
>+		/**
>+		 * The meta object literal for the 'Filter Class' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute FILTER__FILTER_CLASS = eINSTANCE.getFilter_FilterClass();
>+
>+		/**
>+		 * The meta object literal for the 'Async Supported' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute FILTER__ASYNC_SUPPORTED = eINSTANCE.getFilter_AsyncSupported();
>+
>+		/**
>+		 * The meta object literal for the 'Init Params' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference FILTER__INIT_PARAMS = eINSTANCE.getFilter_InitParams();
>+
>+		/**
>+		 * The meta object literal for the 'Id' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute FILTER__ID = eINSTANCE.getFilter_Id();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.FilterMappingImpl Filter Mapping}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.FilterMappingImpl
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getFilterMapping()
>+		 * @generated
>+		 */
>+		EClass FILTER_MAPPING = eINSTANCE.getFilterMapping();
>+
>+		/**
>+		 * The meta object literal for the 'Filter Name' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute FILTER_MAPPING__FILTER_NAME = eINSTANCE.getFilterMapping_FilterName();
>+
>+		/**
>+		 * The meta object literal for the 'Group' attribute list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute FILTER_MAPPING__GROUP = eINSTANCE.getFilterMapping_Group();
>+
>+		/**
>+		 * The meta object literal for the 'Url Patterns' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference FILTER_MAPPING__URL_PATTERNS = eINSTANCE.getFilterMapping_UrlPatterns();
>+
>+		/**
>+		 * The meta object literal for the 'Servlet Names' attribute list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute FILTER_MAPPING__SERVLET_NAMES = eINSTANCE.getFilterMapping_ServletNames();
>+
>+		/**
>+		 * The meta object literal for the 'Dispatchers' attribute list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute FILTER_MAPPING__DISPATCHERS = eINSTANCE.getFilterMapping_Dispatchers();
>+
>+		/**
>+		 * The meta object literal for the 'Id' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute FILTER_MAPPING__ID = eINSTANCE.getFilterMapping_Id();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.FormLoginConfigImpl Form Login Config}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.FormLoginConfigImpl
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getFormLoginConfig()
>+		 * @generated
>+		 */
>+		EClass FORM_LOGIN_CONFIG = eINSTANCE.getFormLoginConfig();
>+
>+		/**
>+		 * The meta object literal for the 'Form Login Page' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute FORM_LOGIN_CONFIG__FORM_LOGIN_PAGE = eINSTANCE.getFormLoginConfig_FormLoginPage();
>+
>+		/**
>+		 * The meta object literal for the 'Form Error Page' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute FORM_LOGIN_CONFIG__FORM_ERROR_PAGE = eINSTANCE.getFormLoginConfig_FormErrorPage();
>+
>+		/**
>+		 * The meta object literal for the 'Id' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute FORM_LOGIN_CONFIG__ID = eINSTANCE.getFormLoginConfig_Id();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.LocaleEncodingMappingImpl Locale Encoding Mapping}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.LocaleEncodingMappingImpl
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getLocaleEncodingMapping()
>+		 * @generated
>+		 */
>+		EClass LOCALE_ENCODING_MAPPING = eINSTANCE.getLocaleEncodingMapping();
>+
>+		/**
>+		 * The meta object literal for the 'Locale' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute LOCALE_ENCODING_MAPPING__LOCALE = eINSTANCE.getLocaleEncodingMapping_Locale();
>+
>+		/**
>+		 * The meta object literal for the 'Encoding' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute LOCALE_ENCODING_MAPPING__ENCODING = eINSTANCE.getLocaleEncodingMapping_Encoding();
>+
>+		/**
>+		 * The meta object literal for the 'Id' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute LOCALE_ENCODING_MAPPING__ID = eINSTANCE.getLocaleEncodingMapping_Id();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.LocaleEncodingMappingListImpl Locale Encoding Mapping List}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.LocaleEncodingMappingListImpl
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getLocaleEncodingMappingList()
>+		 * @generated
>+		 */
>+		EClass LOCALE_ENCODING_MAPPING_LIST = eINSTANCE.getLocaleEncodingMappingList();
>+
>+		/**
>+		 * The meta object literal for the 'Local Encoding Mappings' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference LOCALE_ENCODING_MAPPING_LIST__LOCAL_ENCODING_MAPPINGS = eINSTANCE.getLocaleEncodingMappingList_LocalEncodingMappings();
>+
>+		/**
>+		 * The meta object literal for the 'Id' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute LOCALE_ENCODING_MAPPING_LIST__ID = eINSTANCE.getLocaleEncodingMappingList_Id();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.LoginConfigImpl Login Config}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.LoginConfigImpl
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getLoginConfig()
>+		 * @generated
>+		 */
>+		EClass LOGIN_CONFIG = eINSTANCE.getLoginConfig();
>+
>+		/**
>+		 * The meta object literal for the 'Auth Method' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute LOGIN_CONFIG__AUTH_METHOD = eINSTANCE.getLoginConfig_AuthMethod();
>+
>+		/**
>+		 * The meta object literal for the 'Realm Name' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute LOGIN_CONFIG__REALM_NAME = eINSTANCE.getLoginConfig_RealmName();
>+
>+		/**
>+		 * The meta object literal for the 'Form Login Config' containment reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference LOGIN_CONFIG__FORM_LOGIN_CONFIG = eINSTANCE.getLoginConfig_FormLoginConfig();
>+
>+		/**
>+		 * The meta object literal for the 'Id' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute LOGIN_CONFIG__ID = eINSTANCE.getLoginConfig_Id();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.MimeMappingImpl Mime Mapping}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.MimeMappingImpl
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getMimeMapping()
>+		 * @generated
>+		 */
>+		EClass MIME_MAPPING = eINSTANCE.getMimeMapping();
>+
>+		/**
>+		 * The meta object literal for the 'Extension' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute MIME_MAPPING__EXTENSION = eINSTANCE.getMimeMapping_Extension();
>+
>+		/**
>+		 * The meta object literal for the 'Mime Type' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute MIME_MAPPING__MIME_TYPE = eINSTANCE.getMimeMapping_MimeType();
>+
>+		/**
>+		 * The meta object literal for the 'Id' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute MIME_MAPPING__ID = eINSTANCE.getMimeMapping_Id();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.MultipartConfigTypeImpl Multipart Config Type}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.MultipartConfigTypeImpl
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getMultipartConfigType()
>+		 * @generated
>+		 */
>+		EClass MULTIPART_CONFIG_TYPE = eINSTANCE.getMultipartConfigType();
>+
>+		/**
>+		 * The meta object literal for the 'Location' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute MULTIPART_CONFIG_TYPE__LOCATION = eINSTANCE.getMultipartConfigType_Location();
>+
>+		/**
>+		 * The meta object literal for the 'Max File Size' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute MULTIPART_CONFIG_TYPE__MAX_FILE_SIZE = eINSTANCE.getMultipartConfigType_MaxFileSize();
>+
>+		/**
>+		 * The meta object literal for the 'Max Request Size' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute MULTIPART_CONFIG_TYPE__MAX_REQUEST_SIZE = eINSTANCE.getMultipartConfigType_MaxRequestSize();
>+
>+		/**
>+		 * The meta object literal for the 'File Size Threshold' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute MULTIPART_CONFIG_TYPE__FILE_SIZE_THRESHOLD = eINSTANCE.getMultipartConfigType_FileSizeThreshold();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.OrderingOrderingTypeImpl Ordering Ordering Type}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.OrderingOrderingTypeImpl
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getOrderingOrderingType()
>+		 * @generated
>+		 */
>+		EClass ORDERING_ORDERING_TYPE = eINSTANCE.getOrderingOrderingType();
>+
>+		/**
>+		 * The meta object literal for the 'Name' attribute list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute ORDERING_ORDERING_TYPE__NAME = eINSTANCE.getOrderingOrderingType_Name();
>+
>+		/**
>+		 * The meta object literal for the 'Others' containment reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference ORDERING_ORDERING_TYPE__OTHERS = eINSTANCE.getOrderingOrderingType_Others();
> 
>-	/**
>-	 * Returns the meta object for data type '{@link org.eclipse.jst.javaee.web.WebAppVersionType App Version Type Object}'.
>-	 * 
>-	 * 
>-	 * @return the meta object for data type 'App Version Type Object'.
>-	 * @see org.eclipse.jst.javaee.web.WebAppVersionType
>-	 * @generated
>-	 */
>-	EDataType getWebAppVersionTypeObject();
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.OrderingOthersTypeImpl Ordering Others Type}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.OrderingOthersTypeImpl
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getOrderingOthersType()
>+		 * @generated
>+		 */
>+		EClass ORDERING_OTHERS_TYPE = eINSTANCE.getOrderingOthersType();
> 
>-	/**
>-	 * Returns the factory that creates the instances of the model.
>-	 * 
>-	 * 
>-	 * @return the factory that creates the instances of the model.
>-	 * @generated
>-	 */
>-	WebFactory getWebFactory();
>+		/**
>+		 * The meta object literal for the 'Id' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute ORDERING_OTHERS_TYPE__ID = eINSTANCE.getOrderingOthersType_Id();
> 
>-	/**
>-	 * 
>-	 * Defines literals for the meta objects that represent
>-	 * <ul>
>-	 * <li>each class,</li>
>-	 * <li>each feature of each class,</li>
>-	 * <li>each enum,</li>
>-	 * <li>and each data type</li>
>-	 * </ul>
>-	 * 
>-	 * @generated
>-	 */
>-	interface Literals {
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.AuthConstraintImpl Auth Constraint}' class.
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.OrderingTypeImpl Ordering Type}' class.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.jst.javaee.web.internal.impl.AuthConstraintImpl
>-		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getAuthConstraint()
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.OrderingTypeImpl
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getOrderingType()
> 		 * @generated
> 		 */
>-		EClass AUTH_CONSTRAINT = eINSTANCE.getAuthConstraint();
>+		EClass ORDERING_TYPE = eINSTANCE.getOrderingType();
> 
> 		/**
>-		 * The meta object literal for the 'Descriptions' containment reference list feature.
>+		 * The meta object literal for the 'After' containment reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference AUTH_CONSTRAINT__DESCRIPTIONS = eINSTANCE.getAuthConstraint_Descriptions();
>+		EReference ORDERING_TYPE__AFTER = eINSTANCE.getOrderingType_After();
> 
> 		/**
>-		 * The meta object literal for the 'Role Names' attribute list feature.
>+		 * The meta object literal for the 'Before' containment reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute AUTH_CONSTRAINT__ROLE_NAMES = eINSTANCE.getAuthConstraint_RoleNames();
>+		EReference ORDERING_TYPE__BEFORE = eINSTANCE.getOrderingType_Before();
> 
> 		/**
>-		 * The meta object literal for the 'Id' attribute feature.
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.SecurityConstraintImpl Security Constraint}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.SecurityConstraintImpl
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getSecurityConstraint()
> 		 * @generated
> 		 */
>-		EAttribute AUTH_CONSTRAINT__ID = eINSTANCE.getAuthConstraint_Id();
>+		EClass SECURITY_CONSTRAINT = eINSTANCE.getSecurityConstraint();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.ErrorPageImpl Error Page}' class.
>+		 * The meta object literal for the 'Display Names' containment reference list feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.jst.javaee.web.internal.impl.ErrorPageImpl
>-		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getErrorPage()
> 		 * @generated
> 		 */
>-		EClass ERROR_PAGE = eINSTANCE.getErrorPage();
>+		EReference SECURITY_CONSTRAINT__DISPLAY_NAMES = eINSTANCE.getSecurityConstraint_DisplayNames();
> 
> 		/**
>-		 * The meta object literal for the 'Error Code' attribute feature.
>+		 * The meta object literal for the 'Web Resource Collections' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute ERROR_PAGE__ERROR_CODE = eINSTANCE.getErrorPage_ErrorCode();
>+		EReference SECURITY_CONSTRAINT__WEB_RESOURCE_COLLECTIONS = eINSTANCE.getSecurityConstraint_WebResourceCollections();
> 
> 		/**
>-		 * The meta object literal for the 'Exception Type' attribute feature.
>+		 * The meta object literal for the 'Auth Constraint' containment reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute ERROR_PAGE__EXCEPTION_TYPE = eINSTANCE.getErrorPage_ExceptionType();
>+		EReference SECURITY_CONSTRAINT__AUTH_CONSTRAINT = eINSTANCE.getSecurityConstraint_AuthConstraint();
> 
> 		/**
>-		 * The meta object literal for the 'Location' attribute feature.
>+		 * The meta object literal for the 'User Data Constraint' containment reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute ERROR_PAGE__LOCATION = eINSTANCE.getErrorPage_Location();
>+		EReference SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT = eINSTANCE.getSecurityConstraint_UserDataConstraint();
> 
> 		/**
> 		 * The meta object literal for the 'Id' attribute feature.
>@@ -3489,17 +5930,17 @@
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute ERROR_PAGE__ID = eINSTANCE.getErrorPage_Id();
>+		EAttribute SECURITY_CONSTRAINT__ID = eINSTANCE.getSecurityConstraint_Id();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.FilterImpl Filter}' class.
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.ServletImpl Servlet}' class.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.jst.javaee.web.internal.impl.FilterImpl
>-		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getFilter()
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.ServletImpl
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getServlet()
> 		 * @generated
> 		 */
>-		EClass FILTER = eINSTANCE.getFilter();
>+		EClass SERVLET = eINSTANCE.getServlet();
> 
> 		/**
> 		 * The meta object literal for the 'Descriptions' containment reference list feature.
>@@ -3507,7 +5948,7 @@
> 		 * 
> 		 * @generated
> 		 */
>-		EReference FILTER__DESCRIPTIONS = eINSTANCE.getFilter_Descriptions();
>+		EReference SERVLET__DESCRIPTIONS = eINSTANCE.getServlet_Descriptions();
> 
> 		/**
> 		 * The meta object literal for the 'Display Names' containment reference list feature.
>@@ -3515,7 +5956,7 @@
> 		 * 
> 		 * @generated
> 		 */
>-		EReference FILTER__DISPLAY_NAMES = eINSTANCE.getFilter_DisplayNames();
>+		EReference SERVLET__DISPLAY_NAMES = eINSTANCE.getServlet_DisplayNames();
> 
> 		/**
> 		 * The meta object literal for the 'Icons' containment reference list feature.
>@@ -3523,89 +5964,87 @@
> 		 * 
> 		 * @generated
> 		 */
>-		EReference FILTER__ICONS = eINSTANCE.getFilter_Icons();
>+		EReference SERVLET__ICONS = eINSTANCE.getServlet_Icons();
> 
> 		/**
>-		 * The meta object literal for the 'Filter Name' attribute feature.
>+		 * The meta object literal for the 'Servlet Name' attribute feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute FILTER__FILTER_NAME = eINSTANCE.getFilter_FilterName();
>+		EAttribute SERVLET__SERVLET_NAME = eINSTANCE.getServlet_ServletName();
> 
> 		/**
>-		 * The meta object literal for the 'Filter Class' attribute feature.
>+		 * The meta object literal for the 'Servlet Class' attribute feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute FILTER__FILTER_CLASS = eINSTANCE.getFilter_FilterClass();
>+		EAttribute SERVLET__SERVLET_CLASS = eINSTANCE.getServlet_ServletClass();
> 
> 		/**
>-		 * The meta object literal for the 'Init Params' containment reference list feature.
>+		 * The meta object literal for the 'Jsp File' attribute feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference FILTER__INIT_PARAMS = eINSTANCE.getFilter_InitParams();
>+		EAttribute SERVLET__JSP_FILE = eINSTANCE.getServlet_JspFile();
> 
> 		/**
>-		 * The meta object literal for the 'Id' attribute feature.
>+		 * The meta object literal for the 'Init Params' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute FILTER__ID = eINSTANCE.getFilter_Id();
>+		EReference SERVLET__INIT_PARAMS = eINSTANCE.getServlet_InitParams();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.FilterMappingImpl Filter Mapping}' class.
>+		 * The meta object literal for the 'Load On Startup' attribute feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.jst.javaee.web.internal.impl.FilterMappingImpl
>-		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getFilterMapping()
> 		 * @generated
> 		 */
>-		EClass FILTER_MAPPING = eINSTANCE.getFilterMapping();
>+		EAttribute SERVLET__LOAD_ON_STARTUP = eINSTANCE.getServlet_LoadOnStartup();
> 
> 		/**
>-		 * The meta object literal for the 'Filter Name' attribute feature.
>+		 * The meta object literal for the 'Enabled' attribute feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute FILTER_MAPPING__FILTER_NAME = eINSTANCE.getFilterMapping_FilterName();
>+		EAttribute SERVLET__ENABLED = eINSTANCE.getServlet_Enabled();
> 
> 		/**
>-		 * The meta object literal for the 'Group' attribute list feature.
>+		 * The meta object literal for the 'Async Supported' attribute feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute FILTER_MAPPING__GROUP = eINSTANCE.getFilterMapping_Group();
>+		EAttribute SERVLET__ASYNC_SUPPORTED = eINSTANCE.getServlet_AsyncSupported();
> 
> 		/**
>-		 * The meta object literal for the 'Url Patterns' containment reference list feature.
>+		 * The meta object literal for the 'Run As' containment reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference FILTER_MAPPING__URL_PATTERNS = eINSTANCE.getFilterMapping_UrlPatterns();
>+		EReference SERVLET__RUN_AS = eINSTANCE.getServlet_RunAs();
> 
> 		/**
>-		 * The meta object literal for the 'Servlet Names' attribute list feature.
>+		 * The meta object literal for the 'Security Role Refs' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute FILTER_MAPPING__SERVLET_NAMES = eINSTANCE.getFilterMapping_ServletNames();
>+		EReference SERVLET__SECURITY_ROLE_REFS = eINSTANCE.getServlet_SecurityRoleRefs();
> 
> 		/**
>-		 * The meta object literal for the 'Dispatchers' attribute list feature.
>+		 * The meta object literal for the 'Multipart Config' containment reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute FILTER_MAPPING__DISPATCHERS = eINSTANCE.getFilterMapping_Dispatchers();
>+		EReference SERVLET__MULTIPART_CONFIG = eINSTANCE.getServlet_MultipartConfig();
> 
> 		/**
> 		 * The meta object literal for the 'Id' attribute feature.
>@@ -3613,33 +6052,33 @@
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute FILTER_MAPPING__ID = eINSTANCE.getFilterMapping_Id();
>+		EAttribute SERVLET__ID = eINSTANCE.getServlet_Id();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.FormLoginConfigImpl Form Login Config}' class.
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.ServletMappingImpl Servlet Mapping}' class.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.jst.javaee.web.internal.impl.FormLoginConfigImpl
>-		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getFormLoginConfig()
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.ServletMappingImpl
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getServletMapping()
> 		 * @generated
> 		 */
>-		EClass FORM_LOGIN_CONFIG = eINSTANCE.getFormLoginConfig();
>+		EClass SERVLET_MAPPING = eINSTANCE.getServletMapping();
> 
> 		/**
>-		 * The meta object literal for the 'Form Login Page' attribute feature.
>+		 * The meta object literal for the 'Servlet Name' attribute feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute FORM_LOGIN_CONFIG__FORM_LOGIN_PAGE = eINSTANCE.getFormLoginConfig_FormLoginPage();
>+		EAttribute SERVLET_MAPPING__SERVLET_NAME = eINSTANCE.getServletMapping_ServletName();
> 
> 		/**
>-		 * The meta object literal for the 'Form Error Page' attribute feature.
>+		 * The meta object literal for the 'Url Patterns' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute FORM_LOGIN_CONFIG__FORM_ERROR_PAGE = eINSTANCE.getFormLoginConfig_FormErrorPage();
>+		EReference SERVLET_MAPPING__URL_PATTERNS = eINSTANCE.getServletMapping_UrlPatterns();
> 
> 		/**
> 		 * The meta object literal for the 'Id' attribute feature.
>@@ -3647,33 +6086,41 @@
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute FORM_LOGIN_CONFIG__ID = eINSTANCE.getFormLoginConfig_Id();
>+		EAttribute SERVLET_MAPPING__ID = eINSTANCE.getServletMapping_Id();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.LocaleEncodingMappingImpl Locale Encoding Mapping}' class.
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.SessionConfigImpl Session Config}' class.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.jst.javaee.web.internal.impl.LocaleEncodingMappingImpl
>-		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getLocaleEncodingMapping()
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.SessionConfigImpl
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getSessionConfig()
> 		 * @generated
> 		 */
>-		EClass LOCALE_ENCODING_MAPPING = eINSTANCE.getLocaleEncodingMapping();
>+		EClass SESSION_CONFIG = eINSTANCE.getSessionConfig();
> 
> 		/**
>-		 * The meta object literal for the 'Locale' attribute feature.
>+		 * The meta object literal for the 'Session Timeout' attribute feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute LOCALE_ENCODING_MAPPING__LOCALE = eINSTANCE.getLocaleEncodingMapping_Locale();
>+		EAttribute SESSION_CONFIG__SESSION_TIMEOUT = eINSTANCE.getSessionConfig_SessionTimeout();
> 
> 		/**
>-		 * The meta object literal for the 'Encoding' attribute feature.
>+		 * The meta object literal for the 'Cookie Config' containment reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute LOCALE_ENCODING_MAPPING__ENCODING = eINSTANCE.getLocaleEncodingMapping_Encoding();
>+		EReference SESSION_CONFIG__COOKIE_CONFIG = eINSTANCE.getSessionConfig_CookieConfig();
>+
>+		/**
>+		 * The meta object literal for the 'Tracking Mode' attribute list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute SESSION_CONFIG__TRACKING_MODE = eINSTANCE.getSessionConfig_TrackingMode();
> 
> 		/**
> 		 * The meta object literal for the 'Id' attribute feature.
>@@ -3681,25 +6128,33 @@
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute LOCALE_ENCODING_MAPPING__ID = eINSTANCE.getLocaleEncodingMapping_Id();
>+		EAttribute SESSION_CONFIG__ID = eINSTANCE.getSessionConfig_Id();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.LocaleEncodingMappingListImpl Locale Encoding Mapping List}' class.
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.UserDataConstraintImpl User Data Constraint}' class.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.jst.javaee.web.internal.impl.LocaleEncodingMappingListImpl
>-		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getLocaleEncodingMappingList()
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.UserDataConstraintImpl
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getUserDataConstraint()
> 		 * @generated
> 		 */
>-		EClass LOCALE_ENCODING_MAPPING_LIST = eINSTANCE.getLocaleEncodingMappingList();
>+		EClass USER_DATA_CONSTRAINT = eINSTANCE.getUserDataConstraint();
> 
> 		/**
>-		 * The meta object literal for the 'Local Encoding Mappings' containment reference list feature.
>+		 * The meta object literal for the 'Descriptions' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference LOCALE_ENCODING_MAPPING_LIST__LOCAL_ENCODING_MAPPINGS = eINSTANCE.getLocaleEncodingMappingList_LocalEncodingMappings();
>+		EReference USER_DATA_CONSTRAINT__DESCRIPTIONS = eINSTANCE.getUserDataConstraint_Descriptions();
>+
>+		/**
>+		 * The meta object literal for the 'Transport Guarantee' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute USER_DATA_CONSTRAINT__TRANSPORT_GUARANTEE = eINSTANCE.getUserDataConstraint_TransportGuarantee();
> 
> 		/**
> 		 * The meta object literal for the 'Id' attribute feature.
>@@ -3707,257 +6162,305 @@
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute LOCALE_ENCODING_MAPPING_LIST__ID = eINSTANCE.getLocaleEncodingMappingList_Id();
>+		EAttribute USER_DATA_CONSTRAINT__ID = eINSTANCE.getUserDataConstraint_Id();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.LoginConfigImpl Login Config}' class.
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl App}' class.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.jst.javaee.web.internal.impl.LoginConfigImpl
>-		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getLoginConfig()
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.WebAppImpl
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getWebApp()
> 		 * @generated
> 		 */
>-		EClass LOGIN_CONFIG = eINSTANCE.getLoginConfig();
>+		EClass WEB_APP = eINSTANCE.getWebApp();
> 
> 		/**
>-		 * The meta object literal for the 'Auth Method' attribute feature.
>+		 * The meta object literal for the 'Group' attribute list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute WEB_APP__GROUP = eINSTANCE.getWebApp_Group();
>+
>+		/**
>+		 * The meta object literal for the 'Descriptions' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference WEB_APP__DESCRIPTIONS = eINSTANCE.getWebApp_Descriptions();
>+
>+		/**
>+		 * The meta object literal for the 'Display Names' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference WEB_APP__DISPLAY_NAMES = eINSTANCE.getWebApp_DisplayNames();
>+
>+		/**
>+		 * The meta object literal for the 'Icons' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference WEB_APP__ICONS = eINSTANCE.getWebApp_Icons();
>+
>+		/**
>+		 * The meta object literal for the 'Name' attribute list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute WEB_APP__NAME = eINSTANCE.getWebApp_Name();
>+
>+		/**
>+		 * The meta object literal for the 'Distributables' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference WEB_APP__DISTRIBUTABLES = eINSTANCE.getWebApp_Distributables();
>+
>+		/**
>+		 * The meta object literal for the 'Context Params' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference WEB_APP__CONTEXT_PARAMS = eINSTANCE.getWebApp_ContextParams();
>+
>+		/**
>+		 * The meta object literal for the 'Filters' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute LOGIN_CONFIG__AUTH_METHOD = eINSTANCE.getLoginConfig_AuthMethod();
>+		EReference WEB_APP__FILTERS = eINSTANCE.getWebApp_Filters();
> 
> 		/**
>-		 * The meta object literal for the 'Realm Name' attribute feature.
>+		 * The meta object literal for the 'Filter Mappings' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute LOGIN_CONFIG__REALM_NAME = eINSTANCE.getLoginConfig_RealmName();
>+		EReference WEB_APP__FILTER_MAPPINGS = eINSTANCE.getWebApp_FilterMappings();
> 
> 		/**
>-		 * The meta object literal for the 'Form Login Config' containment reference feature.
>+		 * The meta object literal for the 'Listeners' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference LOGIN_CONFIG__FORM_LOGIN_CONFIG = eINSTANCE.getLoginConfig_FormLoginConfig();
>+		EReference WEB_APP__LISTENERS = eINSTANCE.getWebApp_Listeners();
> 
> 		/**
>-		 * The meta object literal for the 'Id' attribute feature.
>+		 * The meta object literal for the 'Servlets' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute LOGIN_CONFIG__ID = eINSTANCE.getLoginConfig_Id();
>+		EReference WEB_APP__SERVLETS = eINSTANCE.getWebApp_Servlets();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.MimeMappingImpl Mime Mapping}' class.
>+		 * The meta object literal for the 'Servlet Mappings' containment reference list feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.jst.javaee.web.internal.impl.MimeMappingImpl
>-		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getMimeMapping()
> 		 * @generated
> 		 */
>-		EClass MIME_MAPPING = eINSTANCE.getMimeMapping();
>+		EReference WEB_APP__SERVLET_MAPPINGS = eINSTANCE.getWebApp_ServletMappings();
> 
> 		/**
>-		 * The meta object literal for the 'Extension' attribute feature.
>+		 * The meta object literal for the 'Session Configs' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute MIME_MAPPING__EXTENSION = eINSTANCE.getMimeMapping_Extension();
>+		EReference WEB_APP__SESSION_CONFIGS = eINSTANCE.getWebApp_SessionConfigs();
> 
> 		/**
>-		 * The meta object literal for the 'Mime Type' attribute feature.
>+		 * The meta object literal for the 'Mime Mappings' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute MIME_MAPPING__MIME_TYPE = eINSTANCE.getMimeMapping_MimeType();
>+		EReference WEB_APP__MIME_MAPPINGS = eINSTANCE.getWebApp_MimeMappings();
> 
> 		/**
>-		 * The meta object literal for the 'Id' attribute feature.
>+		 * The meta object literal for the 'Welcome File Lists' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute MIME_MAPPING__ID = eINSTANCE.getMimeMapping_Id();
>+		EReference WEB_APP__WELCOME_FILE_LISTS = eINSTANCE.getWebApp_WelcomeFileLists();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.SecurityConstraintImpl Security Constraint}' class.
>+		 * The meta object literal for the 'Error Pages' containment reference list feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.jst.javaee.web.internal.impl.SecurityConstraintImpl
>-		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getSecurityConstraint()
> 		 * @generated
> 		 */
>-		EClass SECURITY_CONSTRAINT = eINSTANCE.getSecurityConstraint();
>+		EReference WEB_APP__ERROR_PAGES = eINSTANCE.getWebApp_ErrorPages();
> 
> 		/**
>-		 * The meta object literal for the 'Display Names' containment reference list feature.
>+		 * The meta object literal for the 'Jsp Configs' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference SECURITY_CONSTRAINT__DISPLAY_NAMES = eINSTANCE.getSecurityConstraint_DisplayNames();
>+		EReference WEB_APP__JSP_CONFIGS = eINSTANCE.getWebApp_JspConfigs();
> 
> 		/**
>-		 * The meta object literal for the 'Web Resource Collections' containment reference list feature.
>+		 * The meta object literal for the 'Security Constraints' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference SECURITY_CONSTRAINT__WEB_RESOURCE_COLLECTIONS = eINSTANCE.getSecurityConstraint_WebResourceCollections();
>+		EReference WEB_APP__SECURITY_CONSTRAINTS = eINSTANCE.getWebApp_SecurityConstraints();
> 
> 		/**
>-		 * The meta object literal for the 'Auth Constraint' containment reference feature.
>+		 * The meta object literal for the 'Login Configs' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference SECURITY_CONSTRAINT__AUTH_CONSTRAINT = eINSTANCE.getSecurityConstraint_AuthConstraint();
>+		EReference WEB_APP__LOGIN_CONFIGS = eINSTANCE.getWebApp_LoginConfigs();
> 
> 		/**
>-		 * The meta object literal for the 'User Data Constraint' containment reference feature.
>+		 * The meta object literal for the 'Security Roles' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT = eINSTANCE.getSecurityConstraint_UserDataConstraint();
>+		EReference WEB_APP__SECURITY_ROLES = eINSTANCE.getWebApp_SecurityRoles();
> 
> 		/**
>-		 * The meta object literal for the 'Id' attribute feature.
>+		 * The meta object literal for the 'Env Entries' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute SECURITY_CONSTRAINT__ID = eINSTANCE.getSecurityConstraint_Id();
>+		EReference WEB_APP__ENV_ENTRIES = eINSTANCE.getWebApp_EnvEntries();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.ServletImpl Servlet}' class.
>+		 * The meta object literal for the 'Ejb Refs' containment reference list feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.jst.javaee.web.internal.impl.ServletImpl
>-		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getServlet()
> 		 * @generated
> 		 */
>-		EClass SERVLET = eINSTANCE.getServlet();
>+		EReference WEB_APP__EJB_REFS = eINSTANCE.getWebApp_EjbRefs();
> 
> 		/**
>-		 * The meta object literal for the 'Descriptions' containment reference list feature.
>+		 * The meta object literal for the 'Ejb Local Refs' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference SERVLET__DESCRIPTIONS = eINSTANCE.getServlet_Descriptions();
>+		EReference WEB_APP__EJB_LOCAL_REFS = eINSTANCE.getWebApp_EjbLocalRefs();
> 
> 		/**
>-		 * The meta object literal for the 'Display Names' containment reference list feature.
>+		 * The meta object literal for the 'Service Refs' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference SERVLET__DISPLAY_NAMES = eINSTANCE.getServlet_DisplayNames();
>+		EReference WEB_APP__SERVICE_REFS = eINSTANCE.getWebApp_ServiceRefs();
> 
> 		/**
>-		 * The meta object literal for the 'Icons' containment reference list feature.
>+		 * The meta object literal for the 'Resource Refs' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference SERVLET__ICONS = eINSTANCE.getServlet_Icons();
>+		EReference WEB_APP__RESOURCE_REFS = eINSTANCE.getWebApp_ResourceRefs();
> 
> 		/**
>-		 * The meta object literal for the 'Servlet Name' attribute feature.
>+		 * The meta object literal for the 'Resource Env Refs' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute SERVLET__SERVLET_NAME = eINSTANCE.getServlet_ServletName();
>+		EReference WEB_APP__RESOURCE_ENV_REFS = eINSTANCE.getWebApp_ResourceEnvRefs();
> 
> 		/**
>-		 * The meta object literal for the 'Servlet Class' attribute feature.
>+		 * The meta object literal for the 'Message Destination Refs' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute SERVLET__SERVLET_CLASS = eINSTANCE.getServlet_ServletClass();
>+		EReference WEB_APP__MESSAGE_DESTINATION_REFS = eINSTANCE.getWebApp_MessageDestinationRefs();
> 
> 		/**
>-		 * The meta object literal for the 'Jsp File' attribute feature.
>+		 * The meta object literal for the 'Persistence Context Refs' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute SERVLET__JSP_FILE = eINSTANCE.getServlet_JspFile();
>+		EReference WEB_APP__PERSISTENCE_CONTEXT_REFS = eINSTANCE.getWebApp_PersistenceContextRefs();
> 
> 		/**
>-		 * The meta object literal for the 'Init Params' containment reference list feature.
>+		 * The meta object literal for the 'Persistence Unit Refs' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference SERVLET__INIT_PARAMS = eINSTANCE.getServlet_InitParams();
>+		EReference WEB_APP__PERSISTENCE_UNIT_REFS = eINSTANCE.getWebApp_PersistenceUnitRefs();
> 
> 		/**
>-		 * The meta object literal for the 'Load On Startup' attribute feature.
>+		 * The meta object literal for the 'Post Constructs' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute SERVLET__LOAD_ON_STARTUP = eINSTANCE.getServlet_LoadOnStartup();
>+		EReference WEB_APP__POST_CONSTRUCTS = eINSTANCE.getWebApp_PostConstructs();
> 
> 		/**
>-		 * The meta object literal for the 'Run As' containment reference feature.
>+		 * The meta object literal for the 'Pre Destroys' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference SERVLET__RUN_AS = eINSTANCE.getServlet_RunAs();
>+		EReference WEB_APP__PRE_DESTROYS = eINSTANCE.getWebApp_PreDestroys();
> 
> 		/**
>-		 * The meta object literal for the 'Security Role Refs' containment reference list feature.
>+		 * The meta object literal for the 'Data Source' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference SERVLET__SECURITY_ROLE_REFS = eINSTANCE.getServlet_SecurityRoleRefs();
>+		EReference WEB_APP__DATA_SOURCE = eINSTANCE.getWebApp_DataSource();
> 
> 		/**
>-		 * The meta object literal for the 'Id' attribute feature.
>+		 * The meta object literal for the 'Message Destinations' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute SERVLET__ID = eINSTANCE.getServlet_Id();
>+		EReference WEB_APP__MESSAGE_DESTINATIONS = eINSTANCE.getWebApp_MessageDestinations();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.ServletMappingImpl Servlet Mapping}' class.
>+		 * The meta object literal for the 'Local Encoding Mappings Lists' containment reference list feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.jst.javaee.web.internal.impl.ServletMappingImpl
>-		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getServletMapping()
> 		 * @generated
> 		 */
>-		EClass SERVLET_MAPPING = eINSTANCE.getServletMapping();
>+		EReference WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS = eINSTANCE.getWebApp_LocalEncodingMappingsLists();
> 
> 		/**
>-		 * The meta object literal for the 'Servlet Name' attribute feature.
>+		 * The meta object literal for the 'Module Name' attribute list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute SERVLET_MAPPING__SERVLET_NAME = eINSTANCE.getServletMapping_ServletName();
>+		EAttribute WEB_APP__MODULE_NAME = eINSTANCE.getWebApp_ModuleName();
> 
> 		/**
>-		 * The meta object literal for the 'Url Patterns' containment reference list feature.
>+		 * The meta object literal for the 'Absolute Ordering' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference SERVLET_MAPPING__URL_PATTERNS = eINSTANCE.getServletMapping_UrlPatterns();
>+		EReference WEB_APP__ABSOLUTE_ORDERING = eINSTANCE.getWebApp_AbsoluteOrdering();
> 
> 		/**
> 		 * The meta object literal for the 'Id' attribute feature.
>@@ -3965,77 +6468,75 @@
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute SERVLET_MAPPING__ID = eINSTANCE.getServletMapping_Id();
>+		EAttribute WEB_APP__ID = eINSTANCE.getWebApp_Id();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.SessionConfigImpl Session Config}' class.
>+		 * The meta object literal for the 'Metadata Complete' attribute feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.jst.javaee.web.internal.impl.SessionConfigImpl
>-		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getSessionConfig()
> 		 * @generated
> 		 */
>-		EClass SESSION_CONFIG = eINSTANCE.getSessionConfig();
>+		EAttribute WEB_APP__METADATA_COMPLETE = eINSTANCE.getWebApp_MetadataComplete();
> 
> 		/**
>-		 * The meta object literal for the 'Session Timeout' attribute feature.
>+		 * The meta object literal for the 'Version' attribute feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute SESSION_CONFIG__SESSION_TIMEOUT = eINSTANCE.getSessionConfig_SessionTimeout();
>+		EAttribute WEB_APP__VERSION = eINSTANCE.getWebApp_Version();
> 
> 		/**
>-		 * The meta object literal for the 'Id' attribute feature.
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.WebAppDeploymentDescriptorImpl App Deployment Descriptor}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.WebAppDeploymentDescriptorImpl
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getWebAppDeploymentDescriptor()
> 		 * @generated
> 		 */
>-		EAttribute SESSION_CONFIG__ID = eINSTANCE.getSessionConfig_Id();
>+		EClass WEB_APP_DEPLOYMENT_DESCRIPTOR = eINSTANCE.getWebAppDeploymentDescriptor();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.UserDataConstraintImpl User Data Constraint}' class.
>+		 * The meta object literal for the 'Mixed' attribute list feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.jst.javaee.web.internal.impl.UserDataConstraintImpl
>-		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getUserDataConstraint()
> 		 * @generated
> 		 */
>-		EClass USER_DATA_CONSTRAINT = eINSTANCE.getUserDataConstraint();
>+		EAttribute WEB_APP_DEPLOYMENT_DESCRIPTOR__MIXED = eINSTANCE.getWebAppDeploymentDescriptor_Mixed();
> 
> 		/**
>-		 * The meta object literal for the 'Descriptions' containment reference list feature.
>+		 * The meta object literal for the 'XMLNS Prefix Map' map feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference USER_DATA_CONSTRAINT__DESCRIPTIONS = eINSTANCE.getUserDataConstraint_Descriptions();
>+		EReference WEB_APP_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP = eINSTANCE.getWebAppDeploymentDescriptor_XMLNSPrefixMap();
> 
> 		/**
>-		 * The meta object literal for the 'Transport Guarantee' attribute feature.
>+		 * The meta object literal for the 'XSI Schema Location' map feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute USER_DATA_CONSTRAINT__TRANSPORT_GUARANTEE = eINSTANCE.getUserDataConstraint_TransportGuarantee();
>+		EReference WEB_APP_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION = eINSTANCE.getWebAppDeploymentDescriptor_XSISchemaLocation();
> 
> 		/**
>-		 * The meta object literal for the 'Id' attribute feature.
>+		 * The meta object literal for the 'Web App' containment reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute USER_DATA_CONSTRAINT__ID = eINSTANCE.getUserDataConstraint_Id();
>+		EReference WEB_APP_DEPLOYMENT_DESCRIPTOR__WEB_APP = eINSTANCE.getWebAppDeploymentDescriptor_WebApp();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl App}' class.
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl Fragment}' class.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.jst.javaee.web.internal.impl.WebAppImpl
>-		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getWebApp()
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getWebFragment()
> 		 * @generated
> 		 */
>-		EClass WEB_APP = eINSTANCE.getWebApp();
>+		EClass WEB_FRAGMENT = eINSTANCE.getWebFragment();
> 
> 		/**
> 		 * The meta object literal for the 'Group' attribute list feature.
>@@ -4043,7 +6544,7 @@
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute WEB_APP__GROUP = eINSTANCE.getWebApp_Group();
>+		EAttribute WEB_FRAGMENT__GROUP = eINSTANCE.getWebFragment_Group();
> 
> 		/**
> 		 * The meta object literal for the 'Descriptions' containment reference list feature.
>@@ -4051,7 +6552,7 @@
> 		 * 
> 		 * @generated
> 		 */
>-		EReference WEB_APP__DESCRIPTIONS = eINSTANCE.getWebApp_Descriptions();
>+		EReference WEB_FRAGMENT__DESCRIPTIONS = eINSTANCE.getWebFragment_Descriptions();
> 
> 		/**
> 		 * The meta object literal for the 'Display Names' containment reference list feature.
>@@ -4059,7 +6560,7 @@
> 		 * 
> 		 * @generated
> 		 */
>-		EReference WEB_APP__DISPLAY_NAMES = eINSTANCE.getWebApp_DisplayNames();
>+		EReference WEB_FRAGMENT__DISPLAY_NAMES = eINSTANCE.getWebFragment_DisplayNames();
> 
> 		/**
> 		 * The meta object literal for the 'Icons' containment reference list feature.
>@@ -4067,7 +6568,15 @@
> 		 * 
> 		 * @generated
> 		 */
>-		EReference WEB_APP__ICONS = eINSTANCE.getWebApp_Icons();
>+		EReference WEB_FRAGMENT__ICONS = eINSTANCE.getWebFragment_Icons();
>+
>+		/**
>+		 * The meta object literal for the 'Name' attribute list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute WEB_FRAGMENT__NAME = eINSTANCE.getWebFragment_Name();
> 
> 		/**
> 		 * The meta object literal for the 'Distributables' containment reference list feature.
>@@ -4075,7 +6584,7 @@
> 		 * 
> 		 * @generated
> 		 */
>-		EReference WEB_APP__DISTRIBUTABLES = eINSTANCE.getWebApp_Distributables();
>+		EReference WEB_FRAGMENT__DISTRIBUTABLES = eINSTANCE.getWebFragment_Distributables();
> 
> 		/**
> 		 * The meta object literal for the 'Context Params' containment reference list feature.
>@@ -4083,7 +6592,7 @@
> 		 * 
> 		 * @generated
> 		 */
>-		EReference WEB_APP__CONTEXT_PARAMS = eINSTANCE.getWebApp_ContextParams();
>+		EReference WEB_FRAGMENT__CONTEXT_PARAMS = eINSTANCE.getWebFragment_ContextParams();
> 
> 		/**
> 		 * The meta object literal for the 'Filters' containment reference list feature.
>@@ -4091,7 +6600,7 @@
> 		 * 
> 		 * @generated
> 		 */
>-		EReference WEB_APP__FILTERS = eINSTANCE.getWebApp_Filters();
>+		EReference WEB_FRAGMENT__FILTERS = eINSTANCE.getWebFragment_Filters();
> 
> 		/**
> 		 * The meta object literal for the 'Filter Mappings' containment reference list feature.
>@@ -4099,7 +6608,7 @@
> 		 * 
> 		 * @generated
> 		 */
>-		EReference WEB_APP__FILTER_MAPPINGS = eINSTANCE.getWebApp_FilterMappings();
>+		EReference WEB_FRAGMENT__FILTER_MAPPINGS = eINSTANCE.getWebFragment_FilterMappings();
> 
> 		/**
> 		 * The meta object literal for the 'Listeners' containment reference list feature.
>@@ -4107,7 +6616,7 @@
> 		 * 
> 		 * @generated
> 		 */
>-		EReference WEB_APP__LISTENERS = eINSTANCE.getWebApp_Listeners();
>+		EReference WEB_FRAGMENT__LISTENERS = eINSTANCE.getWebFragment_Listeners();
> 
> 		/**
> 		 * The meta object literal for the 'Servlets' containment reference list feature.
>@@ -4115,7 +6624,7 @@
> 		 * 
> 		 * @generated
> 		 */
>-		EReference WEB_APP__SERVLETS = eINSTANCE.getWebApp_Servlets();
>+		EReference WEB_FRAGMENT__SERVLETS = eINSTANCE.getWebFragment_Servlets();
> 
> 		/**
> 		 * The meta object literal for the 'Servlet Mappings' containment reference list feature.
>@@ -4123,7 +6632,7 @@
> 		 * 
> 		 * @generated
> 		 */
>-		EReference WEB_APP__SERVLET_MAPPINGS = eINSTANCE.getWebApp_ServletMappings();
>+		EReference WEB_FRAGMENT__SERVLET_MAPPINGS = eINSTANCE.getWebFragment_ServletMappings();
> 
> 		/**
> 		 * The meta object literal for the 'Session Configs' containment reference list feature.
>@@ -4131,7 +6640,7 @@
> 		 * 
> 		 * @generated
> 		 */
>-		EReference WEB_APP__SESSION_CONFIGS = eINSTANCE.getWebApp_SessionConfigs();
>+		EReference WEB_FRAGMENT__SESSION_CONFIGS = eINSTANCE.getWebFragment_SessionConfigs();
> 
> 		/**
> 		 * The meta object literal for the 'Mime Mappings' containment reference list feature.
>@@ -4139,7 +6648,7 @@
> 		 * 
> 		 * @generated
> 		 */
>-		EReference WEB_APP__MIME_MAPPINGS = eINSTANCE.getWebApp_MimeMappings();
>+		EReference WEB_FRAGMENT__MIME_MAPPINGS = eINSTANCE.getWebFragment_MimeMappings();
> 
> 		/**
> 		 * The meta object literal for the 'Welcome File Lists' containment reference list feature.
>@@ -4147,7 +6656,7 @@
> 		 * 
> 		 * @generated
> 		 */
>-		EReference WEB_APP__WELCOME_FILE_LISTS = eINSTANCE.getWebApp_WelcomeFileLists();
>+		EReference WEB_FRAGMENT__WELCOME_FILE_LISTS = eINSTANCE.getWebFragment_WelcomeFileLists();
> 
> 		/**
> 		 * The meta object literal for the 'Error Pages' containment reference list feature.
>@@ -4155,7 +6664,7 @@
> 		 * 
> 		 * @generated
> 		 */
>-		EReference WEB_APP__ERROR_PAGES = eINSTANCE.getWebApp_ErrorPages();
>+		EReference WEB_FRAGMENT__ERROR_PAGES = eINSTANCE.getWebFragment_ErrorPages();
> 
> 		/**
> 		 * The meta object literal for the 'Jsp Configs' containment reference list feature.
>@@ -4163,7 +6672,7 @@
> 		 * 
> 		 * @generated
> 		 */
>-		EReference WEB_APP__JSP_CONFIGS = eINSTANCE.getWebApp_JspConfigs();
>+		EReference WEB_FRAGMENT__JSP_CONFIGS = eINSTANCE.getWebFragment_JspConfigs();
> 
> 		/**
> 		 * The meta object literal for the 'Security Constraints' containment reference list feature.
>@@ -4171,7 +6680,7 @@
> 		 * 
> 		 * @generated
> 		 */
>-		EReference WEB_APP__SECURITY_CONSTRAINTS = eINSTANCE.getWebApp_SecurityConstraints();
>+		EReference WEB_FRAGMENT__SECURITY_CONSTRAINTS = eINSTANCE.getWebFragment_SecurityConstraints();
> 
> 		/**
> 		 * The meta object literal for the 'Login Configs' containment reference list feature.
>@@ -4179,7 +6688,7 @@
> 		 * 
> 		 * @generated
> 		 */
>-		EReference WEB_APP__LOGIN_CONFIGS = eINSTANCE.getWebApp_LoginConfigs();
>+		EReference WEB_FRAGMENT__LOGIN_CONFIGS = eINSTANCE.getWebFragment_LoginConfigs();
> 
> 		/**
> 		 * The meta object literal for the 'Security Roles' containment reference list feature.
>@@ -4187,7 +6696,7 @@
> 		 * 
> 		 * @generated
> 		 */
>-		EReference WEB_APP__SECURITY_ROLES = eINSTANCE.getWebApp_SecurityRoles();
>+		EReference WEB_FRAGMENT__SECURITY_ROLES = eINSTANCE.getWebFragment_SecurityRoles();
> 
> 		/**
> 		 * The meta object literal for the 'Env Entries' containment reference list feature.
>@@ -4195,7 +6704,7 @@
> 		 * 
> 		 * @generated
> 		 */
>-		EReference WEB_APP__ENV_ENTRIES = eINSTANCE.getWebApp_EnvEntries();
>+		EReference WEB_FRAGMENT__ENV_ENTRIES = eINSTANCE.getWebFragment_EnvEntries();
> 
> 		/**
> 		 * The meta object literal for the 'Ejb Refs' containment reference list feature.
>@@ -4203,7 +6712,7 @@
> 		 * 
> 		 * @generated
> 		 */
>-		EReference WEB_APP__EJB_REFS = eINSTANCE.getWebApp_EjbRefs();
>+		EReference WEB_FRAGMENT__EJB_REFS = eINSTANCE.getWebFragment_EjbRefs();
> 
> 		/**
> 		 * The meta object literal for the 'Ejb Local Refs' containment reference list feature.
>@@ -4211,7 +6720,7 @@
> 		 * 
> 		 * @generated
> 		 */
>-		EReference WEB_APP__EJB_LOCAL_REFS = eINSTANCE.getWebApp_EjbLocalRefs();
>+		EReference WEB_FRAGMENT__EJB_LOCAL_REFS = eINSTANCE.getWebFragment_EjbLocalRefs();
> 
> 		/**
> 		 * The meta object literal for the 'Service Refs' containment reference list feature.
>@@ -4219,7 +6728,7 @@
> 		 * 
> 		 * @generated
> 		 */
>-		EReference WEB_APP__SERVICE_REFS = eINSTANCE.getWebApp_ServiceRefs();
>+		EReference WEB_FRAGMENT__SERVICE_REFS = eINSTANCE.getWebFragment_ServiceRefs();
> 
> 		/**
> 		 * The meta object literal for the 'Resource Refs' containment reference list feature.
>@@ -4227,7 +6736,7 @@
> 		 * 
> 		 * @generated
> 		 */
>-		EReference WEB_APP__RESOURCE_REFS = eINSTANCE.getWebApp_ResourceRefs();
>+		EReference WEB_FRAGMENT__RESOURCE_REFS = eINSTANCE.getWebFragment_ResourceRefs();
> 
> 		/**
> 		 * The meta object literal for the 'Resource Env Refs' containment reference list feature.
>@@ -4235,7 +6744,7 @@
> 		 * 
> 		 * @generated
> 		 */
>-		EReference WEB_APP__RESOURCE_ENV_REFS = eINSTANCE.getWebApp_ResourceEnvRefs();
>+		EReference WEB_FRAGMENT__RESOURCE_ENV_REFS = eINSTANCE.getWebFragment_ResourceEnvRefs();
> 
> 		/**
> 		 * The meta object literal for the 'Message Destination Refs' containment reference list feature.
>@@ -4243,7 +6752,7 @@
> 		 * 
> 		 * @generated
> 		 */
>-		EReference WEB_APP__MESSAGE_DESTINATION_REFS = eINSTANCE.getWebApp_MessageDestinationRefs();
>+		EReference WEB_FRAGMENT__MESSAGE_DESTINATION_REFS = eINSTANCE.getWebFragment_MessageDestinationRefs();
> 
> 		/**
> 		 * The meta object literal for the 'Persistence Context Refs' containment reference list feature.
>@@ -4251,7 +6760,7 @@
> 		 * 
> 		 * @generated
> 		 */
>-		EReference WEB_APP__PERSISTENCE_CONTEXT_REFS = eINSTANCE.getWebApp_PersistenceContextRefs();
>+		EReference WEB_FRAGMENT__PERSISTENCE_CONTEXT_REFS = eINSTANCE.getWebFragment_PersistenceContextRefs();
> 
> 		/**
> 		 * The meta object literal for the 'Persistence Unit Refs' containment reference list feature.
>@@ -4259,7 +6768,7 @@
> 		 * 
> 		 * @generated
> 		 */
>-		EReference WEB_APP__PERSISTENCE_UNIT_REFS = eINSTANCE.getWebApp_PersistenceUnitRefs();
>+		EReference WEB_FRAGMENT__PERSISTENCE_UNIT_REFS = eINSTANCE.getWebFragment_PersistenceUnitRefs();
> 
> 		/**
> 		 * The meta object literal for the 'Post Constructs' containment reference list feature.
>@@ -4267,7 +6776,7 @@
> 		 * 
> 		 * @generated
> 		 */
>-		EReference WEB_APP__POST_CONSTRUCTS = eINSTANCE.getWebApp_PostConstructs();
>+		EReference WEB_FRAGMENT__POST_CONSTRUCTS = eINSTANCE.getWebFragment_PostConstructs();
> 
> 		/**
> 		 * The meta object literal for the 'Pre Destroys' containment reference list feature.
>@@ -4275,89 +6784,63 @@
> 		 * 
> 		 * @generated
> 		 */
>-		EReference WEB_APP__PRE_DESTROYS = eINSTANCE.getWebApp_PreDestroys();
>-
>-		/**
>-		 * The meta object literal for the 'Message Destinations' containment reference list feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference WEB_APP__MESSAGE_DESTINATIONS = eINSTANCE.getWebApp_MessageDestinations();
>-
>-		/**
>-		 * The meta object literal for the 'Local Encoding Mappings Lists' containment reference list feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS = eINSTANCE.getWebApp_LocalEncodingMappingsLists();
>-
>-		/**
>-		 * The meta object literal for the 'Id' attribute feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EAttribute WEB_APP__ID = eINSTANCE.getWebApp_Id();
>+		EReference WEB_FRAGMENT__PRE_DESTROYS = eINSTANCE.getWebFragment_PreDestroys();
> 
> 		/**
>-		 * The meta object literal for the 'Metadata Complete' attribute feature.
>+		 * The meta object literal for the 'Data Source' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute WEB_APP__METADATA_COMPLETE = eINSTANCE.getWebApp_MetadataComplete();
>+		EReference WEB_FRAGMENT__DATA_SOURCE = eINSTANCE.getWebFragment_DataSource();
> 
> 		/**
>-		 * The meta object literal for the 'Version' attribute feature.
>+		 * The meta object literal for the 'Message Destinations' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute WEB_APP__VERSION = eINSTANCE.getWebApp_Version();
>+		EReference WEB_FRAGMENT__MESSAGE_DESTINATIONS = eINSTANCE.getWebFragment_MessageDestinations();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.WebAppDeploymentDescriptorImpl App Deployment Descriptor}' class.
>+		 * The meta object literal for the 'Local Encoding Mappings Lists' containment reference list feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.jst.javaee.web.internal.impl.WebAppDeploymentDescriptorImpl
>-		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getWebAppDeploymentDescriptor()
> 		 * @generated
> 		 */
>-		EClass WEB_APP_DEPLOYMENT_DESCRIPTOR = eINSTANCE.getWebAppDeploymentDescriptor();
>+		EReference WEB_FRAGMENT__LOCAL_ENCODING_MAPPINGS_LISTS = eINSTANCE.getWebFragment_LocalEncodingMappingsLists();
> 
> 		/**
>-		 * The meta object literal for the 'Mixed' attribute list feature.
>+		 * The meta object literal for the 'Ordering' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute WEB_APP_DEPLOYMENT_DESCRIPTOR__MIXED = eINSTANCE.getWebAppDeploymentDescriptor_Mixed();
>+		EReference WEB_FRAGMENT__ORDERING = eINSTANCE.getWebFragment_Ordering();
> 
> 		/**
>-		 * The meta object literal for the 'XMLNS Prefix Map' map feature.
>+		 * The meta object literal for the 'Id' attribute feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference WEB_APP_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP = eINSTANCE.getWebAppDeploymentDescriptor_XMLNSPrefixMap();
>+		EAttribute WEB_FRAGMENT__ID = eINSTANCE.getWebFragment_Id();
> 
> 		/**
>-		 * The meta object literal for the 'XSI Schema Location' map feature.
>+		 * The meta object literal for the 'Metadata Complete' attribute feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference WEB_APP_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION = eINSTANCE.getWebAppDeploymentDescriptor_XSISchemaLocation();
>+		EAttribute WEB_FRAGMENT__METADATA_COMPLETE = eINSTANCE.getWebFragment_MetadataComplete();
> 
> 		/**
>-		 * The meta object literal for the 'Web App' containment reference feature.
>+		 * The meta object literal for the 'Version' attribute feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference WEB_APP_DEPLOYMENT_DESCRIPTOR__WEB_APP = eINSTANCE.getWebAppDeploymentDescriptor_WebApp();
>+		EAttribute WEB_FRAGMENT__VERSION = eINSTANCE.getWebFragment_Version();
> 
> 		/**
> 		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.WebResourceCollectionImpl Resource Collection}' class.
>@@ -4402,6 +6885,14 @@
> 		EAttribute WEB_RESOURCE_COLLECTION__HTTP_METHODS = eINSTANCE.getWebResourceCollection_HttpMethods();
> 
> 		/**
>+		 * The meta object literal for the 'Http Method Omission' attribute list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute WEB_RESOURCE_COLLECTION__HTTP_METHOD_OMISSION = eINSTANCE.getWebResourceCollection_HttpMethodOmission();
>+
>+		/**
> 		 * The meta object literal for the 'Id' attribute feature.
> 		 * 
> 		 * 
>@@ -4456,6 +6947,16 @@
> 		EEnum NULL_CHAR_TYPE = eINSTANCE.getNullCharType();
> 
> 		/**
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.TrackingModeType Tracking Mode Type}' enum.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.jst.javaee.web.TrackingModeType
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getTrackingModeType()
>+		 * @generated
>+		 */
>+		EEnum TRACKING_MODE_TYPE = eINSTANCE.getTrackingModeType();
>+
>+		/**
> 		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.TransportGuaranteeType Transport Guarantee Type}' enum.
> 		 * 
> 		 * 
>@@ -4596,6 +7097,16 @@
> 		EDataType SERVLET_NAME_TYPE = eINSTANCE.getServletNameType();
> 
> 		/**
>+		 * The meta object literal for the 'Tracking Mode Type Object' data type.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.jst.javaee.web.TrackingModeType
>+		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getTrackingModeTypeObject()
>+		 * @generated
>+		 */
>+		EDataType TRACKING_MODE_TYPE_OBJECT = eINSTANCE.getTrackingModeTypeObject();
>+
>+		/**
> 		 * The meta object literal for the 'Transport Guarantee Type Object' data type.
> 		 * 
> 		 * 
>Index: jee-models/org/eclipse/jst/javaee/web/internal/impl/MultipartConfigTypeImpl.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/web/internal/impl/MultipartConfigTypeImpl.java
>diff -N jee-models/org/eclipse/jst/javaee/web/internal/impl/MultipartConfigTypeImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/web/internal/impl/MultipartConfigTypeImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,400 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.web.internal.impl;
>+
>+import java.math.BigInteger;
>+
>+import org.eclipse.emf.common.notify.Notification;
>+
>+import org.eclipse.emf.ecore.EClass;
>+
>+import org.eclipse.emf.ecore.impl.ENotificationImpl;
>+import org.eclipse.emf.ecore.impl.EObjectImpl;
>+
>+import org.eclipse.jst.javaee.web.MultipartConfigType;
>+
>+import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Multipart Config Type'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.MultipartConfigTypeImpl#getLocation Location}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.MultipartConfigTypeImpl#getMaxFileSize Max File Size}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.MultipartConfigTypeImpl#getMaxRequestSize Max Request Size}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.MultipartConfigTypeImpl#getFileSizeThreshold File Size Threshold}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class MultipartConfigTypeImpl extends EObjectImpl implements MultipartConfigType {
>+	/**
>+	 * The default value of the '{@link #getLocation() Location}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getLocation()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String LOCATION_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getLocation() Location}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getLocation()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String location = LOCATION_EDEFAULT;
>+
>+	/**
>+	 * The default value of the '{@link #getMaxFileSize() Max File Size}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getMaxFileSize()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final long MAX_FILE_SIZE_EDEFAULT = 0L;
>+
>+	/**
>+	 * The cached value of the '{@link #getMaxFileSize() Max File Size}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getMaxFileSize()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected long maxFileSize = MAX_FILE_SIZE_EDEFAULT;
>+
>+	/**
>+	 * This is true if the Max File Size attribute has been set.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean maxFileSizeESet;
>+
>+	/**
>+	 * The default value of the '{@link #getMaxRequestSize() Max Request Size}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getMaxRequestSize()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final long MAX_REQUEST_SIZE_EDEFAULT = 0L;
>+
>+	/**
>+	 * The cached value of the '{@link #getMaxRequestSize() Max Request Size}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getMaxRequestSize()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected long maxRequestSize = MAX_REQUEST_SIZE_EDEFAULT;
>+
>+	/**
>+	 * This is true if the Max Request Size attribute has been set.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean maxRequestSizeESet;
>+
>+	/**
>+	 * The default value of the '{@link #getFileSizeThreshold() File Size Threshold}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getFileSizeThreshold()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final BigInteger FILE_SIZE_THRESHOLD_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getFileSizeThreshold() File Size Threshold}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getFileSizeThreshold()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected BigInteger fileSizeThreshold = FILE_SIZE_THRESHOLD_EDEFAULT;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected MultipartConfigTypeImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return WebPackage.Literals.MULTIPART_CONFIG_TYPE;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getLocation() {
>+		return location;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setLocation(String newLocation) {
>+		String oldLocation = location;
>+		location = newLocation;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.MULTIPART_CONFIG_TYPE__LOCATION, oldLocation, location));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public long getMaxFileSize() {
>+		return maxFileSize;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setMaxFileSize(long newMaxFileSize) {
>+		long oldMaxFileSize = maxFileSize;
>+		maxFileSize = newMaxFileSize;
>+		boolean oldMaxFileSizeESet = maxFileSizeESet;
>+		maxFileSizeESet = true;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.MULTIPART_CONFIG_TYPE__MAX_FILE_SIZE, oldMaxFileSize, maxFileSize, !oldMaxFileSizeESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void unsetMaxFileSize() {
>+		long oldMaxFileSize = maxFileSize;
>+		boolean oldMaxFileSizeESet = maxFileSizeESet;
>+		maxFileSize = MAX_FILE_SIZE_EDEFAULT;
>+		maxFileSizeESet = false;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.UNSET, WebPackage.MULTIPART_CONFIG_TYPE__MAX_FILE_SIZE, oldMaxFileSize, MAX_FILE_SIZE_EDEFAULT, oldMaxFileSizeESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isSetMaxFileSize() {
>+		return maxFileSizeESet;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public long getMaxRequestSize() {
>+		return maxRequestSize;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setMaxRequestSize(long newMaxRequestSize) {
>+		long oldMaxRequestSize = maxRequestSize;
>+		maxRequestSize = newMaxRequestSize;
>+		boolean oldMaxRequestSizeESet = maxRequestSizeESet;
>+		maxRequestSizeESet = true;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.MULTIPART_CONFIG_TYPE__MAX_REQUEST_SIZE, oldMaxRequestSize, maxRequestSize, !oldMaxRequestSizeESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void unsetMaxRequestSize() {
>+		long oldMaxRequestSize = maxRequestSize;
>+		boolean oldMaxRequestSizeESet = maxRequestSizeESet;
>+		maxRequestSize = MAX_REQUEST_SIZE_EDEFAULT;
>+		maxRequestSizeESet = false;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.UNSET, WebPackage.MULTIPART_CONFIG_TYPE__MAX_REQUEST_SIZE, oldMaxRequestSize, MAX_REQUEST_SIZE_EDEFAULT, oldMaxRequestSizeESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isSetMaxRequestSize() {
>+		return maxRequestSizeESet;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public BigInteger getFileSizeThreshold() {
>+		return fileSizeThreshold;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setFileSizeThreshold(BigInteger newFileSizeThreshold) {
>+		BigInteger oldFileSizeThreshold = fileSizeThreshold;
>+		fileSizeThreshold = newFileSizeThreshold;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.MULTIPART_CONFIG_TYPE__FILE_SIZE_THRESHOLD, oldFileSizeThreshold, fileSizeThreshold));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case WebPackage.MULTIPART_CONFIG_TYPE__LOCATION:
>+				return getLocation();
>+			case WebPackage.MULTIPART_CONFIG_TYPE__MAX_FILE_SIZE:
>+				return getMaxFileSize();
>+			case WebPackage.MULTIPART_CONFIG_TYPE__MAX_REQUEST_SIZE:
>+				return getMaxRequestSize();
>+			case WebPackage.MULTIPART_CONFIG_TYPE__FILE_SIZE_THRESHOLD:
>+				return getFileSizeThreshold();
>+		}
>+		return super.eGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case WebPackage.MULTIPART_CONFIG_TYPE__LOCATION:
>+				setLocation((String)newValue);
>+				return;
>+			case WebPackage.MULTIPART_CONFIG_TYPE__MAX_FILE_SIZE:
>+				setMaxFileSize((Long)newValue);
>+				return;
>+			case WebPackage.MULTIPART_CONFIG_TYPE__MAX_REQUEST_SIZE:
>+				setMaxRequestSize((Long)newValue);
>+				return;
>+			case WebPackage.MULTIPART_CONFIG_TYPE__FILE_SIZE_THRESHOLD:
>+				setFileSizeThreshold((BigInteger)newValue);
>+				return;
>+		}
>+		super.eSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case WebPackage.MULTIPART_CONFIG_TYPE__LOCATION:
>+				setLocation(LOCATION_EDEFAULT);
>+				return;
>+			case WebPackage.MULTIPART_CONFIG_TYPE__MAX_FILE_SIZE:
>+				unsetMaxFileSize();
>+				return;
>+			case WebPackage.MULTIPART_CONFIG_TYPE__MAX_REQUEST_SIZE:
>+				unsetMaxRequestSize();
>+				return;
>+			case WebPackage.MULTIPART_CONFIG_TYPE__FILE_SIZE_THRESHOLD:
>+				setFileSizeThreshold(FILE_SIZE_THRESHOLD_EDEFAULT);
>+				return;
>+		}
>+		super.eUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case WebPackage.MULTIPART_CONFIG_TYPE__LOCATION:
>+				return LOCATION_EDEFAULT == null ? location != null : !LOCATION_EDEFAULT.equals(location);
>+			case WebPackage.MULTIPART_CONFIG_TYPE__MAX_FILE_SIZE:
>+				return isSetMaxFileSize();
>+			case WebPackage.MULTIPART_CONFIG_TYPE__MAX_REQUEST_SIZE:
>+				return isSetMaxRequestSize();
>+			case WebPackage.MULTIPART_CONFIG_TYPE__FILE_SIZE_THRESHOLD:
>+				return FILE_SIZE_THRESHOLD_EDEFAULT == null ? fileSizeThreshold != null : !FILE_SIZE_THRESHOLD_EDEFAULT.equals(fileSizeThreshold);
>+		}
>+		return super.eIsSet(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		if (eIsProxy()) return super.toString();
>+
>+		StringBuffer result = new StringBuffer(super.toString());
>+		result.append(" (location: "); //$NON-NLS-1$
>+		result.append(location);
>+		result.append(", maxFileSize: "); //$NON-NLS-1$
>+		if (maxFileSizeESet) result.append(maxFileSize); else result.append("<unset>"); //$NON-NLS-1$
>+		result.append(", maxRequestSize: "); //$NON-NLS-1$
>+		if (maxRequestSizeESet) result.append(maxRequestSize); else result.append("<unset>"); //$NON-NLS-1$
>+		result.append(", fileSizeThreshold: "); //$NON-NLS-1$
>+		result.append(fileSizeThreshold);
>+		result.append(')');
>+		return result.toString();
>+	}
>+
>+} //MultipartConfigTypeImpl
>Index: jee-models/org/eclipse/jst/javaee/webfragment/WebAppDeploymentDescriptor.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/webfragment/WebAppDeploymentDescriptor.java
>diff -N jee-models/org/eclipse/jst/javaee/webfragment/WebAppDeploymentDescriptor.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/webfragment/WebAppDeploymentDescriptor.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,125 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.webfragment;
>+
>+import java.util.Map;
>+
>+import org.eclipse.emf.ecore.util.FeatureMap;
>+
>+import org.eclipse.jst.javaee.core.JavaEEObject;
>+
>+import org.eclipse.jst.javaee.web.WebFragment;
>+
>+/**
>+ * 
>+ * A representation of the model object 'Web App Deployment Descriptor'.
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.webfragment.WebAppDeploymentDescriptor#getMixed Mixed}</li>
>+ * <li>{@link org.eclipse.jst.javaee.webfragment.WebAppDeploymentDescriptor#getXMLNSPrefixMap XMLNS Prefix Map}</li>
>+ * <li>{@link org.eclipse.jst.javaee.webfragment.WebAppDeploymentDescriptor#getXSISchemaLocation XSI Schema Location}</li>
>+ * <li>{@link org.eclipse.jst.javaee.webfragment.WebAppDeploymentDescriptor#getWebFragment Web Fragment}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.jst.javaee.webfragment.internal.metadata.WebfragmentPackage#getWebAppDeploymentDescriptor()
>+ * @extends JavaEEObject
>+ * @generated
>+ */
>+public interface WebAppDeploymentDescriptor extends JavaEEObject {
>+	/**
>+	 * Returns the value of the 'Mixed' attribute list.
>+	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Mixed' attribute list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Mixed' attribute list.
>+	 * @see org.eclipse.jst.javaee.webfragment.internal.metadata.WebfragmentPackage#getWebAppDeploymentDescriptor_Mixed()
>+	 * @generated
>+	 */
>+	FeatureMap getMixed();
>+
>+	/**
>+	 * Returns the value of the 'XMLNS Prefix Map' map.
>+	 * The key is of type {@link java.lang.String},
>+	 * and the value is of type {@link java.lang.String},
>+	 * 
>+	 * 
>+	 * If the meaning of the 'XMLNS Prefix Map' map isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'XMLNS Prefix Map' map.
>+	 * @see org.eclipse.jst.javaee.webfragment.internal.metadata.WebfragmentPackage#getWebAppDeploymentDescriptor_XMLNSPrefixMap()
>+	 * @generated
>+	 */
>+	Map<String, String> getXMLNSPrefixMap();
>+
>+	/**
>+	 * Returns the value of the 'XSI Schema Location' map.
>+	 * The key is of type {@link java.lang.String},
>+	 * and the value is of type {@link java.lang.String},
>+	 * 
>+	 * 
>+	 * If the meaning of the 'XSI Schema Location' map isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'XSI Schema Location' map.
>+	 * @see org.eclipse.jst.javaee.webfragment.internal.metadata.WebfragmentPackage#getWebAppDeploymentDescriptor_XSISchemaLocation()
>+	 * @generated
>+	 */
>+	Map<String, String> getXSISchemaLocation();
>+
>+	/**
>+	 * Returns the value of the 'Web Fragment' containment reference.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 	The web-fragment element is the root of the deployment
>+	 * 	descriptor for a web fragment. Note that the sub-elements
>+	 * 	of this element can be in the arbitrary order. Because of
>+	 * 	that, the multiplicity of the elements of distributable,
>+	 * 	session-config, welcome-file-list, jsp-config, login-config,
>+	 * 	and locale-encoding-mapping-list was changed from "?" to "*"
>+	 * 	in this schema. However, the deployment descriptor instance
>+	 * 	file must not contain multiple elements of session-config,
>+	 * 	jsp-config, and login-config. When there are multiple elements of
>+	 * 	welcome-file-list or locale-encoding-mapping-list, the container
>+	 * 	must concatenate the element contents. The multiple occurence
>+	 * 	of the element distributable is redundant and the container
>+	 * 	treats that case exactly in the same way when there is only
>+	 * 	one distributable.
>+	 * 
>+	 * 
>+	 * 
>+	 * @return the value of the 'Web Fragment' containment reference.
>+	 * @see #setWebFragment(WebFragment)
>+	 * @see org.eclipse.jst.javaee.webfragment.internal.metadata.WebfragmentPackage#getWebAppDeploymentDescriptor_WebFragment()
>+	 * @generated
>+	 */
>+	WebFragment getWebFragment();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.webfragment.WebAppDeploymentDescriptor#getWebFragment Web Fragment}' containment reference.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Web Fragment' containment reference.
>+	 * @see #getWebFragment()
>+	 * @generated
>+	 */
>+	void setWebFragment(WebFragment value);
>+
>+} // WebAppDeploymentDescriptor
>Index: jee-models/org/eclipse/jst/javaee/web/MultipartConfigType.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/web/MultipartConfigType.java
>diff -N jee-models/org/eclipse/jst/javaee/web/MultipartConfigType.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/web/MultipartConfigType.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,201 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.web;
>+
>+import java.math.BigInteger;
>+
>+import org.eclipse.jst.javaee.core.JavaEEObject;
>+
>+/**
>+ * 
>+ * A representation of the model object 'Multipart Config Type'.
>+ * 
>+ *
>+ * 
>+ * 
>+ * 
>+ * This element contains a sequence of "name" elements, each of which
>+ * refers to an application configuration resource by the "name"
>+ * declared on its web.xml fragment. This element can also contain
>+ * a single "others" element which specifies that this document comes
>+ * before or after other documents within the application.
>+ * See section 8.2.2 of the specification for details.
>+ * 
>+ * @since Java EE 6, Web 3.0
>+ * 
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.web.MultipartConfigType#getLocation Location}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.MultipartConfigType#getMaxFileSize Max File Size}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.MultipartConfigType#getMaxRequestSize Max Request Size}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.MultipartConfigType#getFileSizeThreshold File Size Threshold}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getMultipartConfigType()
>+ * @extends JavaEEObject
>+ * @generated
>+ */
>+public interface MultipartConfigType extends JavaEEObject {
>+	/**
>+	 * Returns the value of the 'Location' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Location' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Location' attribute.
>+	 * @see #setLocation(String)
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getMultipartConfigType_Location()
>+	 * @generated
>+	 */
>+	String getLocation();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.MultipartConfigType#getLocation Location}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Location' attribute.
>+	 * @see #getLocation()
>+	 * @generated
>+	 */
>+	void setLocation(String value);
>+
>+	/**
>+	 * Returns the value of the 'Max File Size' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Max File Size' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Max File Size' attribute.
>+	 * @see #isSetMaxFileSize()
>+	 * @see #unsetMaxFileSize()
>+	 * @see #setMaxFileSize(long)
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getMultipartConfigType_MaxFileSize()
>+	 * @generated
>+	 */
>+	long getMaxFileSize();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.MultipartConfigType#getMaxFileSize Max File Size}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Max File Size' attribute.
>+	 * @see #isSetMaxFileSize()
>+	 * @see #unsetMaxFileSize()
>+	 * @see #getMaxFileSize()
>+	 * @generated
>+	 */
>+	void setMaxFileSize(long value);
>+
>+	/**
>+	 * Unsets the value of the '{@link org.eclipse.jst.javaee.web.MultipartConfigType#getMaxFileSize Max File Size}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isSetMaxFileSize()
>+	 * @see #getMaxFileSize()
>+	 * @see #setMaxFileSize(long)
>+	 * @generated
>+	 */
>+	void unsetMaxFileSize();
>+
>+	/**
>+	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.web.MultipartConfigType#getMaxFileSize Max File Size}' attribute is set.
>+	 * 
>+	 * 
>+	 * @return whether the value of the 'Max File Size' attribute is set.
>+	 * @see #unsetMaxFileSize()
>+	 * @see #getMaxFileSize()
>+	 * @see #setMaxFileSize(long)
>+	 * @generated
>+	 */
>+	boolean isSetMaxFileSize();
>+
>+	/**
>+	 * Returns the value of the 'Max Request Size' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Max Request Size' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Max Request Size' attribute.
>+	 * @see #isSetMaxRequestSize()
>+	 * @see #unsetMaxRequestSize()
>+	 * @see #setMaxRequestSize(long)
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getMultipartConfigType_MaxRequestSize()
>+	 * @generated
>+	 */
>+	long getMaxRequestSize();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.MultipartConfigType#getMaxRequestSize Max Request Size}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Max Request Size' attribute.
>+	 * @see #isSetMaxRequestSize()
>+	 * @see #unsetMaxRequestSize()
>+	 * @see #getMaxRequestSize()
>+	 * @generated
>+	 */
>+	void setMaxRequestSize(long value);
>+
>+	/**
>+	 * Unsets the value of the '{@link org.eclipse.jst.javaee.web.MultipartConfigType#getMaxRequestSize Max Request Size}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isSetMaxRequestSize()
>+	 * @see #getMaxRequestSize()
>+	 * @see #setMaxRequestSize(long)
>+	 * @generated
>+	 */
>+	void unsetMaxRequestSize();
>+
>+	/**
>+	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.web.MultipartConfigType#getMaxRequestSize Max Request Size}' attribute is set.
>+	 * 
>+	 * 
>+	 * @return whether the value of the 'Max Request Size' attribute is set.
>+	 * @see #unsetMaxRequestSize()
>+	 * @see #getMaxRequestSize()
>+	 * @see #setMaxRequestSize(long)
>+	 * @generated
>+	 */
>+	boolean isSetMaxRequestSize();
>+
>+	/**
>+	 * Returns the value of the 'File Size Threshold' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'File Size Threshold' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'File Size Threshold' attribute.
>+	 * @see #setFileSizeThreshold(BigInteger)
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getMultipartConfigType_FileSizeThreshold()
>+	 * @generated
>+	 */
>+	BigInteger getFileSizeThreshold();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.MultipartConfigType#getFileSizeThreshold File Size Threshold}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'File Size Threshold' attribute.
>+	 * @see #getFileSizeThreshold()
>+	 * @generated
>+	 */
>+	void setFileSizeThreshold(BigInteger value);
>+
>+} // MultipartConfigType
>Index: jee-models/org/eclipse/jst/javaee/web/internal/impl/OrderingOthersTypeImpl.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/web/internal/impl/OrderingOthersTypeImpl.java
>diff -N jee-models/org/eclipse/jst/javaee/web/internal/impl/OrderingOthersTypeImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/web/internal/impl/OrderingOthersTypeImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,168 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.web.internal.impl;
>+
>+import org.eclipse.emf.common.notify.Notification;
>+
>+import org.eclipse.emf.ecore.EClass;
>+
>+import org.eclipse.emf.ecore.impl.ENotificationImpl;
>+import org.eclipse.emf.ecore.impl.EObjectImpl;
>+
>+import org.eclipse.jst.javaee.web.OrderingOthersType;
>+
>+import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Ordering Others Type'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.OrderingOthersTypeImpl#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class OrderingOthersTypeImpl extends EObjectImpl implements OrderingOthersType {
>+	/**
>+	 * The default value of the '{@link #getId() Id}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getId()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String ID_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getId() Id}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getId()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String id = ID_EDEFAULT;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected OrderingOthersTypeImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return WebPackage.Literals.ORDERING_OTHERS_TYPE;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getId() {
>+		return id;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setId(String newId) {
>+		String oldId = id;
>+		id = newId;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.ORDERING_OTHERS_TYPE__ID, oldId, id));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case WebPackage.ORDERING_OTHERS_TYPE__ID:
>+				return getId();
>+		}
>+		return super.eGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case WebPackage.ORDERING_OTHERS_TYPE__ID:
>+				setId((String)newValue);
>+				return;
>+		}
>+		super.eSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case WebPackage.ORDERING_OTHERS_TYPE__ID:
>+				setId(ID_EDEFAULT);
>+				return;
>+		}
>+		super.eUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case WebPackage.ORDERING_OTHERS_TYPE__ID:
>+				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
>+		}
>+		return super.eIsSet(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		if (eIsProxy()) return super.toString();
>+
>+		StringBuffer result = new StringBuffer(super.toString());
>+		result.append(" (id: "); //$NON-NLS-1$
>+		result.append(id);
>+		result.append(')');
>+		return result.toString();
>+	}
>+
>+} //OrderingOthersTypeImpl
>Index: jee-models/org/eclipse/jst/javaee/web/OrderingType.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/web/OrderingType.java
>diff -N jee-models/org/eclipse/jst/javaee/web/OrderingType.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/web/OrderingType.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,88 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.web;
>+
>+import org.eclipse.jst.javaee.core.JavaEEObject;
>+
>+/**
>+ * 
>+ * A representation of the model object 'Ordering Type'.
>+ * 
>+ *
>+ * 
>+ * 
>+ * 
>+ * Please see section 8.2.2 of the specification for details.
>+ * 
>+ * @since Java EE 6, Web 3.0
>+ * 
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.web.OrderingType#getAfter After}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.OrderingType#getBefore Before}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getOrderingType()
>+ * @extends JavaEEObject
>+ * @generated
>+ */
>+public interface OrderingType extends JavaEEObject {
>+	/**
>+	 * Returns the value of the 'After' containment reference.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'After' containment reference isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'After' containment reference.
>+	 * @see #setAfter(OrderingOrderingType)
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getOrderingType_After()
>+	 * @generated
>+	 */
>+	OrderingOrderingType getAfter();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.OrderingType#getAfter After}' containment reference.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'After' containment reference.
>+	 * @see #getAfter()
>+	 * @generated
>+	 */
>+	void setAfter(OrderingOrderingType value);
>+
>+	/**
>+	 * Returns the value of the 'Before' containment reference.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Before' containment reference isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Before' containment reference.
>+	 * @see #setBefore(OrderingOrderingType)
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getOrderingType_Before()
>+	 * @generated
>+	 */
>+	OrderingOrderingType getBefore();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.OrderingType#getBefore Before}' containment reference.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Before' containment reference.
>+	 * @see #getBefore()
>+	 * @generated
>+	 */
>+	void setBefore(OrderingOrderingType value);
>+
>+} // OrderingType
>Index: jee-models/org/eclipse/jst/javaee/webapp/WebAppDeploymentDescriptor.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/webapp/WebAppDeploymentDescriptor.java
>diff -N jee-models/org/eclipse/jst/javaee/webapp/WebAppDeploymentDescriptor.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/webapp/WebAppDeploymentDescriptor.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,125 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.webapp;
>+
>+import java.util.Map;
>+
>+import org.eclipse.emf.ecore.util.FeatureMap;
>+
>+import org.eclipse.jst.javaee.core.JavaEEObject;
>+
>+import org.eclipse.jst.javaee.web.WebApp;
>+
>+/**
>+ * 
>+ * A representation of the model object 'Web App Deployment Descriptor'.
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.webapp.WebAppDeploymentDescriptor#getMixed Mixed}</li>
>+ * <li>{@link org.eclipse.jst.javaee.webapp.WebAppDeploymentDescriptor#getXMLNSPrefixMap XMLNS Prefix Map}</li>
>+ * <li>{@link org.eclipse.jst.javaee.webapp.WebAppDeploymentDescriptor#getXSISchemaLocation XSI Schema Location}</li>
>+ * <li>{@link org.eclipse.jst.javaee.webapp.WebAppDeploymentDescriptor#getWebApp Web App}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.jst.javaee.webapp.internal.metadata.WebappPackage#getWebAppDeploymentDescriptor()
>+ * @extends JavaEEObject
>+ * @generated
>+ */
>+public interface WebAppDeploymentDescriptor extends JavaEEObject {
>+	/**
>+	 * Returns the value of the 'Mixed' attribute list.
>+	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Mixed' attribute list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Mixed' attribute list.
>+	 * @see org.eclipse.jst.javaee.webapp.internal.metadata.WebappPackage#getWebAppDeploymentDescriptor_Mixed()
>+	 * @generated
>+	 */
>+	FeatureMap getMixed();
>+
>+	/**
>+	 * Returns the value of the 'XMLNS Prefix Map' map.
>+	 * The key is of type {@link java.lang.String},
>+	 * and the value is of type {@link java.lang.String},
>+	 * 
>+	 * 
>+	 * If the meaning of the 'XMLNS Prefix Map' map isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'XMLNS Prefix Map' map.
>+	 * @see org.eclipse.jst.javaee.webapp.internal.metadata.WebappPackage#getWebAppDeploymentDescriptor_XMLNSPrefixMap()
>+	 * @generated
>+	 */
>+	Map<String, String> getXMLNSPrefixMap();
>+
>+	/**
>+	 * Returns the value of the 'XSI Schema Location' map.
>+	 * The key is of type {@link java.lang.String},
>+	 * and the value is of type {@link java.lang.String},
>+	 * 
>+	 * 
>+	 * If the meaning of the 'XSI Schema Location' map isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'XSI Schema Location' map.
>+	 * @see org.eclipse.jst.javaee.webapp.internal.metadata.WebappPackage#getWebAppDeploymentDescriptor_XSISchemaLocation()
>+	 * @generated
>+	 */
>+	Map<String, String> getXSISchemaLocation();
>+
>+	/**
>+	 * Returns the value of the 'Web App' containment reference.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * The web-app element is the root of the deployment
>+	 * descriptor for a web application. Note that the sub-elements
>+	 * of this element can be in the arbitrary order. Because of
>+	 * that, the multiplicity of the elements of distributable,
>+	 * session-config, welcome-file-list, jsp-config, login-config,
>+	 * and locale-encoding-mapping-list was changed from "?" to "*"
>+	 * in this schema. However, the deployment descriptor instance
>+	 * file must not contain multiple elements of session-config,
>+	 * jsp-config, and login-config. When there are multiple elements of
>+	 * welcome-file-list or locale-encoding-mapping-list, the container
>+	 * must concatenate the element contents. The multiple occurence
>+	 * of the element distributable is redundant and the container
>+	 * treats that case exactly in the same way when there is only
>+	 * one distributable. 
>+	 * 
>+	 * 
>+	 * 
>+	 * @return the value of the 'Web App' containment reference.
>+	 * @see #setWebApp(WebApp)
>+	 * @see org.eclipse.jst.javaee.webapp.internal.metadata.WebappPackage#getWebAppDeploymentDescriptor_WebApp()
>+	 * @generated
>+	 */
>+	WebApp getWebApp();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.webapp.WebAppDeploymentDescriptor#getWebApp Web App}' containment reference.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Web App' containment reference.
>+	 * @see #getWebApp()
>+	 * @generated
>+	 */
>+	void setWebApp(WebApp value);
>+
>+} // WebAppDeploymentDescriptor
>Index: jee-models/org/eclipse/jst/javaee/web/internal/impl/CookieNameTypeImpl.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/web/internal/impl/CookieNameTypeImpl.java
>diff -N jee-models/org/eclipse/jst/javaee/web/internal/impl/CookieNameTypeImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/web/internal/impl/CookieNameTypeImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,168 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.web.internal.impl;
>+
>+import org.eclipse.emf.common.notify.Notification;
>+
>+import org.eclipse.emf.ecore.EClass;
>+
>+import org.eclipse.emf.ecore.impl.ENotificationImpl;
>+import org.eclipse.emf.ecore.impl.EObjectImpl;
>+
>+import org.eclipse.jst.javaee.web.CookieNameType;
>+
>+import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Cookie Name Type'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.CookieNameTypeImpl#getValue Value}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class CookieNameTypeImpl extends EObjectImpl implements CookieNameType {
>+	/**
>+	 * The default value of the '{@link #getValue() Value}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getValue()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String VALUE_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getValue() Value}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getValue()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String value = VALUE_EDEFAULT;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected CookieNameTypeImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return WebPackage.Literals.COOKIE_NAME_TYPE;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getValue() {
>+		return value;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setValue(String newValue) {
>+		String oldValue = value;
>+		value = newValue;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.COOKIE_NAME_TYPE__VALUE, oldValue, value));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case WebPackage.COOKIE_NAME_TYPE__VALUE:
>+				return getValue();
>+		}
>+		return super.eGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case WebPackage.COOKIE_NAME_TYPE__VALUE:
>+				setValue((String)newValue);
>+				return;
>+		}
>+		super.eSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case WebPackage.COOKIE_NAME_TYPE__VALUE:
>+				setValue(VALUE_EDEFAULT);
>+				return;
>+		}
>+		super.eUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case WebPackage.COOKIE_NAME_TYPE__VALUE:
>+				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
>+		}
>+		return super.eIsSet(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		if (eIsProxy()) return super.toString();
>+
>+		StringBuffer result = new StringBuffer(super.toString());
>+		result.append(" (value: "); //$NON-NLS-1$
>+		result.append(value);
>+		result.append(')');
>+		return result.toString();
>+	}
>+
>+} //CookieNameTypeImpl
>Index: jee-models/org/eclipse/jst/javaee/web/AbsoluteOrderingType.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/web/AbsoluteOrderingType.java
>diff -N jee-models/org/eclipse/jst/javaee/web/AbsoluteOrderingType.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/web/AbsoluteOrderingType.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,88 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.web;
>+
>+import java.util.List;
>+
>+import org.eclipse.emf.ecore.util.FeatureMap;
>+
>+import org.eclipse.jst.javaee.core.JavaEEObject;
>+
>+/**
>+ * 
>+ * A representation of the model object 'Absolute Ordering Type'.
>+ * 
>+ *
>+ * 
>+ * 
>+ * 
>+ * Please see section 8.2.2 of the specification for details.
>+ * 
>+ * @since Java EE 6, Web 3.0
>+ * 
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.web.AbsoluteOrderingType#getGroup Group}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.AbsoluteOrderingType#getName Name}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.AbsoluteOrderingType#getOthers Others}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getAbsoluteOrderingType()
>+ * @extends JavaEEObject
>+ * @generated
>+ */
>+public interface AbsoluteOrderingType extends JavaEEObject {
>+	/**
>+	 * Returns the value of the 'Group' attribute list.
>+	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Group' attribute list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Group' attribute list.
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getAbsoluteOrderingType_Group()
>+	 * @generated
>+	 */
>+	FeatureMap getGroup();
>+
>+	/**
>+	 * Returns the value of the 'Name' attribute list.
>+	 * The list contents are of type {@link java.lang.String}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Name' attribute list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Name' attribute list.
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getAbsoluteOrderingType_Name()
>+	 * @generated
>+	 */
>+	List<String> getName();
>+
>+	/**
>+	 * Returns the value of the 'Others' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.web.OrderingOthersType}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Others' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Others' containment reference list.
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getAbsoluteOrderingType_Others()
>+	 * @generated
>+	 */
>+	List<OrderingOthersType> getOthers();
>+
>+} // AbsoluteOrderingType
>Index: jee-models/org/eclipse/jst/javaee/web/CookiePathType.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/web/CookiePathType.java
>diff -N jee-models/org/eclipse/jst/javaee/web/CookiePathType.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/web/CookiePathType.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,65 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.web;
>+
>+import org.eclipse.jst.javaee.core.JavaEEObject;
>+
>+/**
>+ * 
>+ * A representation of the model object 'Cookie Path Type'.
>+ * 
>+ *
>+ * 
>+ * 
>+ * 
>+ * The path that will be assigned to any session tracking
>+ * cookies created by this web application.
>+ * 
>+ * Used in: cookie-config
>+ * 
>+ * @since Java EE 6, Web 3.0
>+ * 
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.web.CookiePathType#getValue Value}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getCookiePathType()
>+ * @extends JavaEEObject
>+ * @generated
>+ */
>+public interface CookiePathType extends JavaEEObject {
>+	/**
>+	 * Returns the value of the 'Value' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Value' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Value' attribute.
>+	 * @see #setValue(String)
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getCookiePathType_Value()
>+	 * @generated
>+	 */
>+	String getValue();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.CookiePathType#getValue Value}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Value' attribute.
>+	 * @see #getValue()
>+	 * @generated
>+	 */
>+	void setValue(String value);
>+
>+} // CookiePathType
>Index: jee-models/org/eclipse/jst/javaee/webapp/internal/impl/WebappFactoryImpl.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/webapp/internal/impl/WebappFactoryImpl.java
>diff -N jee-models/org/eclipse/jst/javaee/webapp/internal/impl/WebappFactoryImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/webapp/internal/impl/WebappFactoryImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,102 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.webapp.internal.impl;
>+
>+import org.eclipse.emf.ecore.EClass;
>+import org.eclipse.emf.ecore.EObject;
>+import org.eclipse.emf.ecore.EPackage;
>+
>+import org.eclipse.emf.ecore.impl.EFactoryImpl;
>+
>+import org.eclipse.emf.ecore.plugin.EcorePlugin;
>+
>+import org.eclipse.jst.javaee.webapp.*;
>+
>+import org.eclipse.jst.javaee.webapp.internal.metadata.WebappFactory;
>+import org.eclipse.jst.javaee.webapp.internal.metadata.WebappPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model Factory.
>+ * 
>+ * @generated
>+ */
>+public class WebappFactoryImpl extends EFactoryImpl implements WebappFactory {
>+	/**
>+	 * Creates the default factory implementation.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static WebappFactory init() {
>+		try {
>+			WebappFactory theWebappFactory = (WebappFactory)EPackage.Registry.INSTANCE.getEFactory("http://java.sun.com/xml/ns/javaee/webapp"); //$NON-NLS-1$ 
>+			if (theWebappFactory != null) {
>+				return theWebappFactory;
>+			}
>+		}
>+		catch (Exception exception) {
>+			EcorePlugin.INSTANCE.log(exception);
>+		}
>+		return new WebappFactoryImpl();
>+	}
>+
>+	/**
>+	 * Creates an instance of the factory.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public WebappFactoryImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public EObject create(EClass eClass) {
>+		switch (eClass.getClassifierID()) {
>+			case WebappPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR: return (EObject)createWebAppDeploymentDescriptor();
>+			default:
>+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
>+		}
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public WebAppDeploymentDescriptor createWebAppDeploymentDescriptor() {
>+		WebAppDeploymentDescriptorImpl webAppDeploymentDescriptor = new WebAppDeploymentDescriptorImpl();
>+		return webAppDeploymentDescriptor;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public WebappPackage getWebappPackage() {
>+		return (WebappPackage)getEPackage();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @deprecated
>+	 * @generated
>+	 */
>+	@Deprecated
>+	public static WebappPackage getPackage() {
>+		return WebappPackage.eINSTANCE;
>+	}
>+
>+} //WebappFactoryImpl
>Index: jee-models/org/eclipse/jst/javaee/web/OrderingOrderingType.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/web/OrderingOrderingType.java
>diff -N jee-models/org/eclipse/jst/javaee/web/OrderingOrderingType.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/web/OrderingOrderingType.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,87 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.web;
>+
>+import java.util.List;
>+
>+import org.eclipse.jst.javaee.core.JavaEEObject;
>+
>+/**
>+ * 
>+ * A representation of the model object 'Ordering Ordering Type'.
>+ * 
>+ *
>+ * 
>+ * 
>+ * 
>+ * This element contains a sequence of "name" elements, each of
>+ * which
>+ * refers to an application configuration resource by the "name"
>+ * declared on its web.xml fragment. This element can also contain
>+ * a single "others" element which specifies that this document
>+ * comes
>+ * before or after other documents within the application.
>+ * See section 8.2.2 of the specification for details.
>+ * 
>+ * @since Java EE 6, Web 3.0
>+ * 
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.web.OrderingOrderingType#getName Name}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.OrderingOrderingType#getOthers Others}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getOrderingOrderingType()
>+ * @extends JavaEEObject
>+ * @generated
>+ */
>+public interface OrderingOrderingType extends JavaEEObject {
>+	/**
>+	 * Returns the value of the 'Name' attribute list.
>+	 * The list contents are of type {@link java.lang.String}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Name' attribute list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Name' attribute list.
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getOrderingOrderingType_Name()
>+	 * @generated
>+	 */
>+	List<String> getName();
>+
>+	/**
>+	 * Returns the value of the 'Others' containment reference.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Others' containment reference isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Others' containment reference.
>+	 * @see #setOthers(OrderingOthersType)
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getOrderingOrderingType_Others()
>+	 * @generated
>+	 */
>+	OrderingOthersType getOthers();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.OrderingOrderingType#getOthers Others}' containment reference.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Others' containment reference.
>+	 * @see #getOthers()
>+	 * @generated
>+	 */
>+	void setOthers(OrderingOthersType value);
>+
>+} // OrderingOrderingType
>Index: jee-models/org/eclipse/jst/javaee/web/CookieDomainType.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/web/CookieDomainType.java
>diff -N jee-models/org/eclipse/jst/javaee/web/CookieDomainType.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/web/CookieDomainType.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,65 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.web;
>+
>+import org.eclipse.jst.javaee.core.JavaEEObject;
>+
>+/**
>+ * 
>+ * A representation of the model object 'Cookie Domain Type'.
>+ * 
>+ *
>+ * 
>+ * 
>+ * 
>+ * The domain name that will be assigned to any session tracking
>+ * cookies created by this web application.
>+ * 
>+ * Used in: cookie-config
>+ * 
>+ * @since Java EE 6, Web 3.0
>+ * 
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.web.CookieDomainType#getValue Value}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getCookieDomainType()
>+ * @extends JavaEEObject
>+ * @generated
>+ */
>+public interface CookieDomainType extends JavaEEObject {
>+	/**
>+	 * Returns the value of the 'Value' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Value' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Value' attribute.
>+	 * @see #setValue(String)
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getCookieDomainType_Value()
>+	 * @generated
>+	 */
>+	String getValue();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.CookieDomainType#getValue Value}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Value' attribute.
>+	 * @see #getValue()
>+	 * @generated
>+	 */
>+	void setValue(String value);
>+
>+} // CookieDomainType
>Index: jee-models/org/eclipse/jst/javaee/webapp/internal/util/WebappSwitch.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/webapp/internal/util/WebappSwitch.java
>diff -N jee-models/org/eclipse/jst/javaee/webapp/internal/util/WebappSwitch.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/webapp/internal/util/WebappSwitch.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,132 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.webapp.internal.util;
>+
>+import java.util.List;
>+
>+import org.eclipse.emf.ecore.EClass;
>+import org.eclipse.emf.ecore.EObject;
>+
>+import org.eclipse.jst.javaee.webapp.*;
>+
>+import org.eclipse.jst.javaee.webapp.internal.metadata.WebappPackage;
>+
>+/**
>+ * 
>+ * The Switch for the model's inheritance hierarchy.
>+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
>+ * to invoke the <code>caseXXX</code> method for each class of the model,
>+ * starting with the actual class of the object
>+ * and proceeding up the inheritance hierarchy
>+ * until a non-null result is returned,
>+ * which is the result of the switch.
>+ * 
>+ * @see org.eclipse.jst.javaee.webapp.internal.metadata.WebappPackage
>+ * @generated
>+ */
>+public class WebappSwitch<T> {
>+	/**
>+	 * The cached model package
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected static WebappPackage modelPackage;
>+
>+	/**
>+	 * Creates an instance of the switch.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public WebappSwitch() {
>+		if (modelPackage == null) {
>+			modelPackage = WebappPackage.eINSTANCE;
>+		}
>+	}
>+
>+	/**
>+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
>+	 * 
>+	 * 
>+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
>+	 * @generated
>+	 */
>+	public T doSwitch(EObject theEObject) {
>+		return doSwitch(theEObject.eClass(), theEObject);
>+	}
>+
>+	/**
>+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
>+	 * 
>+	 * 
>+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
>+	 * @generated
>+	 */
>+	protected T doSwitch(EClass theEClass, EObject theEObject) {
>+		if (theEClass.eContainer() == modelPackage) {
>+			return doSwitch(theEClass.getClassifierID(), theEObject);
>+		}
>+		else {
>+			List<EClass> eSuperTypes = theEClass.getESuperTypes();
>+			return
>+				eSuperTypes.isEmpty() ?
>+					defaultCase(theEObject) :
>+					doSwitch(eSuperTypes.get(0), theEObject);
>+		}
>+	}
>+
>+	/**
>+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
>+	 * 
>+	 * 
>+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
>+	 * @generated
>+	 */
>+	protected T doSwitch(int classifierID, EObject theEObject) {
>+		switch (classifierID) {
>+			case WebappPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR: {
>+				WebAppDeploymentDescriptor webAppDeploymentDescriptor = (WebAppDeploymentDescriptor)theEObject;
>+				T result = caseWebAppDeploymentDescriptor(webAppDeploymentDescriptor);
>+				if (result == null) result = defaultCase(theEObject);
>+				return result;
>+			}
>+			default: return defaultCase(theEObject);
>+		}
>+	}
>+
>+	/**
>+	 * Returns the result of interpreting the object as an instance of 'Web App Deployment Descriptor'.
>+	 * 
>+	 * This implementation returns null;
>+	 * returning a non-null result will terminate the switch.
>+	 * 
>+	 * @param object the target of the switch.
>+	 * @return the result of interpreting the object as an instance of 'Web App Deployment Descriptor'.
>+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+	 * @generated
>+	 */
>+	public T caseWebAppDeploymentDescriptor(WebAppDeploymentDescriptor object) {
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the result of interpreting the object as an instance of 'EObject'.
>+	 * 
>+	 * This implementation returns null;
>+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
>+	 * 
>+	 * @param object the target of the switch.
>+	 * @return the result of interpreting the object as an instance of 'EObject'.
>+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
>+	 * @generated
>+	 */
>+	public T defaultCase(EObject object) {
>+		return null;
>+	}
>+
>+} //WebappSwitch
>Index: jee-models/org/eclipse/jst/javaee/web/CookieConfigType.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/web/CookieConfigType.java
>diff -N jee-models/org/eclipse/jst/javaee/web/CookieConfigType.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/web/CookieConfigType.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,342 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.web;
>+
>+import java.math.BigInteger;
>+
>+import org.eclipse.jst.javaee.core.JavaEEObject;
>+
>+/**
>+ * 
>+ * A representation of the model object 'Cookie Config Type'.
>+ * 
>+ *
>+ * 
>+ * 
>+ * 
>+ * The cookie-configType defines the configuration for the
>+ * session tracking cookies of this web application.
>+ * 
>+ * Used in: session-config
>+ * 
>+ * @since Java EE 6, Web 3.0
>+ * 
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.web.CookieConfigType#getName Name}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.CookieConfigType#getDomain Domain}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.CookieConfigType#getPath Path}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.CookieConfigType#getComment Comment}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.CookieConfigType#isHttpOnly Http Only}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.CookieConfigType#isSecure Secure}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.CookieConfigType#getMaxAge Max Age}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.CookieConfigType#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getCookieConfigType()
>+ * @extends JavaEEObject
>+ * @generated
>+ */
>+public interface CookieConfigType extends JavaEEObject {
>+	/**
>+	 * Returns the value of the 'Name' containment reference.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * The name that will be assigned to any session tracking
>+	 * cookies created by this web application.
>+	 * The default is JSESSIONID
>+	 * 
>+	 * @since Java EE 6, Web 3.0
>+	 * 
>+	 * 
>+	 * @return the value of the 'Name' containment reference.
>+	 * @see #setName(CookieNameType)
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getCookieConfigType_Name()
>+	 * @generated
>+	 */
>+	CookieNameType getName();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.CookieConfigType#getName Name}' containment reference.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Name' containment reference.
>+	 * @see #getName()
>+	 * @generated
>+	 */
>+	void setName(CookieNameType value);
>+
>+	/**
>+	 * Returns the value of the 'Domain' containment reference.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * The domain name that will be assigned to any session tracking
>+	 * cookies created by this web application.
>+	 * 
>+	 * @since Java EE 6, Web 3.0
>+	 * 
>+	 * 
>+	 * @return the value of the 'Domain' containment reference.
>+	 * @see #setDomain(CookieDomainType)
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getCookieConfigType_Domain()
>+	 * @generated
>+	 */
>+	CookieDomainType getDomain();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.CookieConfigType#getDomain Domain}' containment reference.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Domain' containment reference.
>+	 * @see #getDomain()
>+	 * @generated
>+	 */
>+	void setDomain(CookieDomainType value);
>+
>+	/**
>+	 * Returns the value of the 'Path' containment reference.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * The path that will be assigned to any session tracking
>+	 * cookies created by this web application.
>+	 * 
>+	 * @since Java EE 6, Web 3.0
>+	 * 
>+	 * 
>+	 * @return the value of the 'Path' containment reference.
>+	 * @see #setPath(CookiePathType)
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getCookieConfigType_Path()
>+	 * @generated
>+	 */
>+	CookiePathType getPath();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.CookieConfigType#getPath Path}' containment reference.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Path' containment reference.
>+	 * @see #getPath()
>+	 * @generated
>+	 */
>+	void setPath(CookiePathType value);
>+
>+	/**
>+	 * Returns the value of the 'Comment' containment reference.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * The comment that will be assigned to any session tracking
>+	 * cookies created by this web application.
>+	 * 
>+	 * @since Java EE 6, Web 3.0
>+	 * 
>+	 * 
>+	 * @return the value of the 'Comment' containment reference.
>+	 * @see #setComment(CookieCommentType)
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getCookieConfigType_Comment()
>+	 * @generated
>+	 */
>+	CookieCommentType getComment();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.CookieConfigType#getComment Comment}' containment reference.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Comment' containment reference.
>+	 * @see #getComment()
>+	 * @generated
>+	 */
>+	void setComment(CookieCommentType value);
>+
>+	/**
>+	 * Returns the value of the 'Http Only' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * Specifies whether any session tracking cookies created 
>+	 * by this web application will be marked as HttpOnly
>+	 * 
>+	 * @since Java EE 6, Web 3.0
>+	 * 
>+	 * 
>+	 * @return the value of the 'Http Only' attribute.
>+	 * @see #isSetHttpOnly()
>+	 * @see #unsetHttpOnly()
>+	 * @see #setHttpOnly(boolean)
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getCookieConfigType_HttpOnly()
>+	 * @generated
>+	 */
>+	boolean isHttpOnly();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.CookieConfigType#isHttpOnly Http Only}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Http Only' attribute.
>+	 * @see #isSetHttpOnly()
>+	 * @see #unsetHttpOnly()
>+	 * @see #isHttpOnly()
>+	 * @generated
>+	 */
>+	void setHttpOnly(boolean value);
>+
>+	/**
>+	 * Unsets the value of the '{@link org.eclipse.jst.javaee.web.CookieConfigType#isHttpOnly Http Only}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isSetHttpOnly()
>+	 * @see #isHttpOnly()
>+	 * @see #setHttpOnly(boolean)
>+	 * @generated
>+	 */
>+	void unsetHttpOnly();
>+
>+	/**
>+	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.web.CookieConfigType#isHttpOnly Http Only}' attribute is set.
>+	 * 
>+	 * 
>+	 * @return whether the value of the 'Http Only' attribute is set.
>+	 * @see #unsetHttpOnly()
>+	 * @see #isHttpOnly()
>+	 * @see #setHttpOnly(boolean)
>+	 * @generated
>+	 */
>+	boolean isSetHttpOnly();
>+
>+	/**
>+	 * Returns the value of the 'Secure' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * Specifies whether any session tracking cookies created 
>+	 * by this web application will be marked as secure
>+	 * even if the request that initiated the corresponding session
>+	 * is using plain HTTP instead of HTTPS
>+	 * 
>+	 * @since Java EE 6, Web 3.0
>+	 * 
>+	 * 
>+	 * @return the value of the 'Secure' attribute.
>+	 * @see #isSetSecure()
>+	 * @see #unsetSecure()
>+	 * @see #setSecure(boolean)
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getCookieConfigType_Secure()
>+	 * @generated
>+	 */
>+	boolean isSecure();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.CookieConfigType#isSecure Secure}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Secure' attribute.
>+	 * @see #isSetSecure()
>+	 * @see #unsetSecure()
>+	 * @see #isSecure()
>+	 * @generated
>+	 */
>+	void setSecure(boolean value);
>+
>+	/**
>+	 * Unsets the value of the '{@link org.eclipse.jst.javaee.web.CookieConfigType#isSecure Secure}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isSetSecure()
>+	 * @see #isSecure()
>+	 * @see #setSecure(boolean)
>+	 * @generated
>+	 */
>+	void unsetSecure();
>+
>+	/**
>+	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.web.CookieConfigType#isSecure Secure}' attribute is set.
>+	 * 
>+	 * 
>+	 * @return whether the value of the 'Secure' attribute is set.
>+	 * @see #unsetSecure()
>+	 * @see #isSecure()
>+	 * @see #setSecure(boolean)
>+	 * @generated
>+	 */
>+	boolean isSetSecure();
>+
>+	/**
>+	 * Returns the value of the 'Max Age' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * The lifetime (in seconds) that will be assigned to any
>+	 * session tracking cookies created by this web application.
>+	 * Default is -1
>+	 * 
>+	 * @since Java EE 6, Web 3.0
>+	 * 
>+	 * 
>+	 * @return the value of the 'Max Age' attribute.
>+	 * @see #setMaxAge(BigInteger)
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getCookieConfigType_MaxAge()
>+	 * @generated
>+	 */
>+	BigInteger getMaxAge();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.CookieConfigType#getMaxAge Max Age}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Max Age' attribute.
>+	 * @see #getMaxAge()
>+	 * @generated
>+	 */
>+	void setMaxAge(BigInteger value);
>+
>+	/**
>+	 * Returns the value of the 'Id' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Id' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Id' attribute.
>+	 * @see #setId(String)
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getCookieConfigType_Id()
>+	 * @generated
>+	 */
>+	String getId();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.CookieConfigType#getId Id}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Id' attribute.
>+	 * @see #getId()
>+	 * @generated
>+	 */
>+	void setId(String value);
>+
>+} // CookieConfigType
>Index: jee-models/org/eclipse/jst/javaee/web/internal/impl/CookieCommentTypeImpl.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/web/internal/impl/CookieCommentTypeImpl.java
>diff -N jee-models/org/eclipse/jst/javaee/web/internal/impl/CookieCommentTypeImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/web/internal/impl/CookieCommentTypeImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,168 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.web.internal.impl;
>+
>+import org.eclipse.emf.common.notify.Notification;
>+
>+import org.eclipse.emf.ecore.EClass;
>+
>+import org.eclipse.emf.ecore.impl.ENotificationImpl;
>+import org.eclipse.emf.ecore.impl.EObjectImpl;
>+
>+import org.eclipse.jst.javaee.web.CookieCommentType;
>+
>+import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Cookie Comment Type'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.CookieCommentTypeImpl#getValue Value}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class CookieCommentTypeImpl extends EObjectImpl implements CookieCommentType {
>+	/**
>+	 * The default value of the '{@link #getValue() Value}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getValue()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String VALUE_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getValue() Value}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getValue()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String value = VALUE_EDEFAULT;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected CookieCommentTypeImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return WebPackage.Literals.COOKIE_COMMENT_TYPE;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getValue() {
>+		return value;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setValue(String newValue) {
>+		String oldValue = value;
>+		value = newValue;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.COOKIE_COMMENT_TYPE__VALUE, oldValue, value));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case WebPackage.COOKIE_COMMENT_TYPE__VALUE:
>+				return getValue();
>+		}
>+		return super.eGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case WebPackage.COOKIE_COMMENT_TYPE__VALUE:
>+				setValue((String)newValue);
>+				return;
>+		}
>+		super.eSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case WebPackage.COOKIE_COMMENT_TYPE__VALUE:
>+				setValue(VALUE_EDEFAULT);
>+				return;
>+		}
>+		super.eUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case WebPackage.COOKIE_COMMENT_TYPE__VALUE:
>+				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
>+		}
>+		return super.eIsSet(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		if (eIsProxy()) return super.toString();
>+
>+		StringBuffer result = new StringBuffer(super.toString());
>+		result.append(" (value: "); //$NON-NLS-1$
>+		result.append(value);
>+		result.append(')');
>+		return result.toString();
>+	}
>+
>+} //CookieCommentTypeImpl
>Index: jee-models/org/eclipse/jst/javaee/webapp/internal/impl/WebappPackageImpl.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/webapp/internal/impl/WebappPackageImpl.java
>diff -N jee-models/org/eclipse/jst/javaee/webapp/internal/impl/WebappPackageImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/webapp/internal/impl/WebappPackageImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,332 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.webapp.internal.impl;
>+
>+import org.eclipse.emf.ecore.EAttribute;
>+import org.eclipse.emf.ecore.EClass;
>+import org.eclipse.emf.ecore.EPackage;
>+import org.eclipse.emf.ecore.EReference;
>+
>+import org.eclipse.emf.ecore.impl.EPackageImpl;
>+
>+import org.eclipse.emf.ecore.xml.namespace.XMLNamespacePackage;
>+
>+import org.eclipse.jst.javaee.application.internal.impl.ApplicationPackageImpl;
>+
>+import org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage;
>+
>+import org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationclientPackageImpl;
>+
>+import org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage;
>+
>+import org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl;
>+
>+import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
>+
>+import org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl;
>+
>+import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
>+
>+import org.eclipse.jst.javaee.jca.internal.impl.JcaPackageImpl;
>+
>+import org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage;
>+
>+import org.eclipse.jst.javaee.jsp.internal.impl.JspPackageImpl;
>+
>+import org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage;
>+
>+import org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl;
>+
>+import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
>+
>+import org.eclipse.jst.javaee.webapp.WebAppDeploymentDescriptor;
>+
>+import org.eclipse.jst.javaee.webapp.internal.metadata.WebappFactory;
>+import org.eclipse.jst.javaee.webapp.internal.metadata.WebappPackage;
>+
>+import org.eclipse.jst.javaee.webfragment.internal.impl.WebfragmentPackageImpl;
>+
>+import org.eclipse.jst.javaee.webfragment.internal.metadata.WebfragmentPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model Package.
>+ * 
>+ * @generated
>+ */
>+public class WebappPackageImpl extends EPackageImpl implements WebappPackage {
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private EClass webAppDeploymentDescriptorEClass = null;
>+
>+	/**
>+	 * Creates an instance of the model Package, registered with
>+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
>+	 * package URI value.
>+	 * Note: the correct way to create the package is via the static
>+	 * factory method {@link #init init()}, which also performs
>+	 * initialization of the package, or returns the registered package,
>+	 * if one already exists.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.emf.ecore.EPackage.Registry
>+	 * @see org.eclipse.jst.javaee.webapp.internal.metadata.WebappPackage#eNS_URI
>+	 * @see #init()
>+	 * @generated
>+	 */
>+	private WebappPackageImpl() {
>+		super(eNS_URI, WebappFactory.eINSTANCE);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private static boolean isInited = false;
>+
>+	/**
>+	 * Creates, registers, and initializes the Package for this model, and for any others upon which it depends.
>+	 * 
>+	 * This method is used to initialize {@link WebappPackage#eINSTANCE} when that field is accessed.
>+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
>+	 * 
>+	 * 
>+	 * @see #eNS_URI
>+	 * @see #createPackageContents()
>+	 * @see #initializePackageContents()
>+	 * @generated
>+	 */
>+	public static WebappPackage init() {
>+		if (isInited) return (WebappPackage)EPackage.Registry.INSTANCE.getEPackage(WebappPackage.eNS_URI);
>+
>+		// Obtain or create and register package
>+		WebappPackageImpl theWebappPackage = (WebappPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof WebappPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new WebappPackageImpl());
>+
>+		isInited = true;
>+
>+		// Initialize simple dependencies
>+		XMLNamespacePackage.eINSTANCE.eClass();
>+
>+		// Obtain or create and register interdependencies
>+		ApplicationPackageImpl theApplicationPackage = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) instanceof ApplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) : ApplicationPackage.eINSTANCE);
>+		JavaeePackageImpl theJavaeePackage = (JavaeePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JavaeePackage.eNS_URI) instanceof JavaeePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JavaeePackage.eNS_URI) : JavaeePackage.eINSTANCE);
>+		ApplicationclientPackageImpl theApplicationclientPackage = (ApplicationclientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationclientPackage.eNS_URI) instanceof ApplicationclientPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationclientPackage.eNS_URI) : ApplicationclientPackage.eINSTANCE);
>+		JcaPackageImpl theJcaPackage = (JcaPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) instanceof JcaPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) : JcaPackage.eINSTANCE);
>+		EjbPackageImpl theEjbPackage = (EjbPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) instanceof EjbPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) : EjbPackage.eINSTANCE);
>+		JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) instanceof JspPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) : JspPackage.eINSTANCE);
>+		WebPackageImpl theWebPackage = (WebPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebPackage.eNS_URI) instanceof WebPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebPackage.eNS_URI) : WebPackage.eINSTANCE);
>+		WebfragmentPackageImpl theWebfragmentPackage = (WebfragmentPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebfragmentPackage.eNS_URI) instanceof WebfragmentPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebfragmentPackage.eNS_URI) : WebfragmentPackage.eINSTANCE);
>+
>+		// Create package meta-data objects
>+		theWebappPackage.createPackageContents();
>+		theApplicationPackage.createPackageContents();
>+		theJavaeePackage.createPackageContents();
>+		theApplicationclientPackage.createPackageContents();
>+		theJcaPackage.createPackageContents();
>+		theEjbPackage.createPackageContents();
>+		theJspPackage.createPackageContents();
>+		theWebPackage.createPackageContents();
>+		theWebfragmentPackage.createPackageContents();
>+
>+		// Initialize created meta-data
>+		theWebappPackage.initializePackageContents();
>+		theApplicationPackage.initializePackageContents();
>+		theJavaeePackage.initializePackageContents();
>+		theApplicationclientPackage.initializePackageContents();
>+		theJcaPackage.initializePackageContents();
>+		theEjbPackage.initializePackageContents();
>+		theJspPackage.initializePackageContents();
>+		theWebPackage.initializePackageContents();
>+		theWebfragmentPackage.initializePackageContents();
>+
>+		// Mark meta-data to indicate it can't be changed
>+		theWebappPackage.freeze();
>+
>+ 
>+		// Update the registry and return the package
>+		EPackage.Registry.INSTANCE.put(WebappPackage.eNS_URI, theWebappPackage);
>+		return theWebappPackage;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EClass getWebAppDeploymentDescriptor() {
>+		return webAppDeploymentDescriptorEClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getWebAppDeploymentDescriptor_Mixed() {
>+		return (EAttribute)webAppDeploymentDescriptorEClass.getEStructuralFeatures().get(0);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getWebAppDeploymentDescriptor_XMLNSPrefixMap() {
>+		return (EReference)webAppDeploymentDescriptorEClass.getEStructuralFeatures().get(1);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getWebAppDeploymentDescriptor_XSISchemaLocation() {
>+		return (EReference)webAppDeploymentDescriptorEClass.getEStructuralFeatures().get(2);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getWebAppDeploymentDescriptor_WebApp() {
>+		return (EReference)webAppDeploymentDescriptorEClass.getEStructuralFeatures().get(3);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public WebappFactory getWebappFactory() {
>+		return (WebappFactory)getEFactoryInstance();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private boolean isCreated = false;
>+
>+	/**
>+	 * Creates the meta-model objects for the package. This method is
>+	 * guarded to have no affect on any invocation but its first.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void createPackageContents() {
>+		if (isCreated) return;
>+		isCreated = true;
>+
>+		// Create classes and their features
>+		webAppDeploymentDescriptorEClass = createEClass(WEB_APP_DEPLOYMENT_DESCRIPTOR);
>+		createEAttribute(webAppDeploymentDescriptorEClass, WEB_APP_DEPLOYMENT_DESCRIPTOR__MIXED);
>+		createEReference(webAppDeploymentDescriptorEClass, WEB_APP_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP);
>+		createEReference(webAppDeploymentDescriptorEClass, WEB_APP_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION);
>+		createEReference(webAppDeploymentDescriptorEClass, WEB_APP_DEPLOYMENT_DESCRIPTOR__WEB_APP);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private boolean isInitialized = false;
>+
>+	/**
>+	 * Complete the initialization of the package and its meta-model. This
>+	 * method is guarded to have no affect on any invocation but its first.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void initializePackageContents() {
>+		if (isInitialized) return;
>+		isInitialized = true;
>+
>+		// Initialize package
>+		setName(eNAME);
>+		setNsPrefix(eNS_PREFIX);
>+		setNsURI(eNS_URI);
>+
>+		// Obtain other dependent packages
>+		WebPackage theWebPackage = (WebPackage)EPackage.Registry.INSTANCE.getEPackage(WebPackage.eNS_URI);
>+
>+		// Create type parameters
>+
>+		// Set bounds for type parameters
>+
>+		// Add supertypes to classes
>+
>+		// Initialize classes and features; add operations and parameters
>+		initEClass(webAppDeploymentDescriptorEClass, WebAppDeploymentDescriptor.class, "WebAppDeploymentDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEAttribute(getWebAppDeploymentDescriptor_Mixed(), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebAppDeploymentDescriptor_XMLNSPrefixMap(), ecorePackage.getEStringToStringMapEntry(), null, "xMLNSPrefixMap", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebAppDeploymentDescriptor_XSISchemaLocation(), ecorePackage.getEStringToStringMapEntry(), null, "xSISchemaLocation", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getWebAppDeploymentDescriptor_WebApp(), theWebPackage.getWebApp(), null, "webApp", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		// Create resource
>+		createResource(eNS_URI);
>+
>+		// Create annotations
>+		// http:///org/eclipse/emf/ecore/util/ExtendedMetaData
>+		createExtendedMetaDataAnnotations();
>+	}
>+
>+	/**
>+	 * Initializes the annotations for http:///org/eclipse/emf/ecore/util/ExtendedMetaData.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected void createExtendedMetaDataAnnotations() {
>+		String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$			
>+		addAnnotation
>+		 (webAppDeploymentDescriptorEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "mixed" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getWebAppDeploymentDescriptor_Mixed(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "elementWildcard", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", ":mixed" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getWebAppDeploymentDescriptor_XMLNSPrefixMap(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "xmlns:prefix" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getWebAppDeploymentDescriptor_XSISchemaLocation(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "xsi:schemaLocation" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getWebAppDeploymentDescriptor_WebApp(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "web-app", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });
>+	}
>+
>+} //WebappPackageImpl
>Index: jee-models/org/eclipse/jst/javaee/web/CookieCommentType.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/web/CookieCommentType.java
>diff -N jee-models/org/eclipse/jst/javaee/web/CookieCommentType.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/web/CookieCommentType.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,65 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.web;
>+
>+import org.eclipse.jst.javaee.core.JavaEEObject;
>+
>+/**
>+ * 
>+ * A representation of the model object 'Cookie Comment Type'.
>+ * 
>+ *
>+ * 
>+ * 
>+ * 
>+ * The comment that will be assigned to any session tracking
>+ * cookies created by this web application.
>+ * 
>+ * Used in: cookie-config
>+ * 
>+ * @since Java EE 6, Web 3.0
>+ * 
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.web.CookieCommentType#getValue Value}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getCookieCommentType()
>+ * @extends JavaEEObject
>+ * @generated
>+ */
>+public interface CookieCommentType extends JavaEEObject {
>+	/**
>+	 * Returns the value of the 'Value' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Value' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Value' attribute.
>+	 * @see #setValue(String)
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getCookieCommentType_Value()
>+	 * @generated
>+	 */
>+	String getValue();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.CookieCommentType#getValue Value}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Value' attribute.
>+	 * @see #getValue()
>+	 * @generated
>+	 */
>+	void setValue(String value);
>+
>+} // CookieCommentType
>Index: jee-models/org/eclipse/jst/javaee/webapp/internal/util/WebappResourceFactoryImpl.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/webapp/internal/util/WebappResourceFactoryImpl.java
>diff -N jee-models/org/eclipse/jst/javaee/webapp/internal/util/WebappResourceFactoryImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/webapp/internal/util/WebappResourceFactoryImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,56 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.webapp.internal.util;
>+
>+import org.eclipse.emf.common.util.URI;
>+
>+import org.eclipse.emf.ecore.resource.Resource;
>+
>+import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
>+
>+import org.eclipse.emf.ecore.xmi.XMLResource;
>+
>+/**
>+ * 
>+ * The Resource Factory associated with the package.
>+ * 
>+ * @see org.eclipse.jst.javaee.webapp.internal.util.WebappResourceImpl
>+ * @generated
>+ */
>+public class WebappResourceFactoryImpl extends ResourceFactoryImpl {
>+	/**
>+	 * Creates an instance of the resource factory.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public WebappResourceFactoryImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * Creates an instance of the resource.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Resource createResource(URI uri) {
>+		XMLResource result = new WebappResourceImpl(uri);
>+		result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
>+		result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
>+
>+		result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);
>+
>+		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
>+		result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
>+
>+		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);
>+		return result;
>+	}
>+
>+} //WebappResourceFactoryImpl
>Index: jee-models/org/eclipse/jst/javaee/web/TrackingModeType.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/web/TrackingModeType.java
>diff -N jee-models/org/eclipse/jst/javaee/web/TrackingModeType.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/web/TrackingModeType.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,246 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.web;
>+
>+import java.util.Arrays;
>+import java.util.Collections;
>+import java.util.List;
>+
>+import org.eclipse.emf.common.util.Enumerator;
>+
>+/**
>+ * 
>+ * A representation of the literals of the enumeration 'Tracking Mode Type',
>+ * and utility methods for working with them.
>+ * 
>+ * 
>+ * 
>+ * 
>+ * The tracking modes for sessions created by this web
>+ * application
>+ * 
>+ * Used in: session-config
>+ * 
>+ * @since Java EE 6, Web 3.0
>+ * 
>+ * 
>+ * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getTrackingModeType()
>+ * @generated
>+ */
>+public enum TrackingModeType implements Enumerator {
>+	/**
>+	 * The 'COOKIE' literal object.
>+	 * 
>+	 * 
>+	 * @see #COOKIE_VALUE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	COOKIE(0, "COOKIE", "COOKIE"), //$NON-NLS-1$ //$NON-NLS-2$
>+
>+	/**
>+	 * The 'URL' literal object.
>+	 * 
>+	 * 
>+	 * @see #URL_VALUE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	URL(1, "URL", "URL"), //$NON-NLS-1$ //$NON-NLS-2$
>+
>+	/**
>+	 * The 'SSL' literal object.
>+	 * 
>+	 * 
>+	 * @see #SSL_VALUE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	SSL(2, "SSL", "SSL"); //$NON-NLS-1$ //$NON-NLS-2$
>+
>+	/**
>+	 * The 'COOKIE' literal value.
>+	 * 
>+	 * 
>+	 * If the meaning of 'COOKIE' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @see #COOKIE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	public static final int COOKIE_VALUE = 0;
>+
>+	/**
>+	 * The 'URL' literal value.
>+	 * 
>+	 * 
>+	 * If the meaning of 'URL' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @see #URL
>+	 * @generated
>+	 * @ordered
>+	 */
>+	public static final int URL_VALUE = 1;
>+
>+	/**
>+	 * The 'SSL' literal value.
>+	 * 
>+	 * 
>+	 * If the meaning of 'SSL' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @see #SSL
>+	 * @generated
>+	 * @ordered
>+	 */
>+	public static final int SSL_VALUE = 2;
>+
>+	/**
>+	 * An array of all the 'Tracking Mode Type' enumerators.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private static final TrackingModeType[] VALUES_ARRAY =
>+		new TrackingModeType[] {
>+			COOKIE,
>+			URL,
>+			SSL,
>+		};
>+
>+	/**
>+	 * A public read-only list of all the 'Tracking Mode Type' enumerators.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static final List<TrackingModeType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
>+
>+	/**
>+	 * Returns the 'Tracking Mode Type' literal with the specified literal value.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static TrackingModeType get(String literal) {
>+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
>+			TrackingModeType result = VALUES_ARRAY[i];
>+			if (result.toString().equals(literal)) {
>+				return result;
>+			}
>+		}
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the 'Tracking Mode Type' literal with the specified name.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static TrackingModeType getByName(String name) {
>+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
>+			TrackingModeType result = VALUES_ARRAY[i];
>+			if (result.getName().equals(name)) {
>+				return result;
>+			}
>+		}
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the 'Tracking Mode Type' literal with the specified integer value.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static TrackingModeType get(int value) {
>+		switch (value) {
>+			case COOKIE_VALUE: return COOKIE;
>+			case URL_VALUE: return URL;
>+			case SSL_VALUE: return SSL;
>+		}
>+		return null;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final int value;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final String name;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final String literal;
>+
>+	/**
>+	 * Only this class can construct instances.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private TrackingModeType(int value, String name, String literal) {
>+		this.value = value;
>+		this.name = name;
>+		this.literal = literal;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public int getValue() {
>+	 return value;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getName() {
>+	 return name;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getLiteral() {
>+	 return literal;
>+	}
>+
>+	/**
>+	 * Returns the literal value of the enumerator, which is its string representation.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		return literal;
>+	}
>+	
>+} //TrackingModeType
>Index: jee-models/org/eclipse/jst/javaee/webapp/internal/metadata/WebappFactory.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/webapp/internal/metadata/WebappFactory.java
>diff -N jee-models/org/eclipse/jst/javaee/webapp/internal/metadata/WebappFactory.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/webapp/internal/metadata/WebappFactory.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,48 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.webapp.internal.metadata;
>+
>+import org.eclipse.emf.ecore.EFactory;
>+
>+import org.eclipse.jst.javaee.webapp.WebAppDeploymentDescriptor;
>+
>+/**
>+ * 
>+ * The Factory for the model.
>+ * It provides a create method for each non-abstract class of the model.
>+ * 
>+ * @see org.eclipse.jst.javaee.webapp.internal.metadata.WebappPackage
>+ * @generated
>+ */
>+public interface WebappFactory extends EFactory {
>+	/**
>+	 * The singleton instance of the factory.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	WebappFactory eINSTANCE = org.eclipse.jst.javaee.webapp.internal.impl.WebappFactoryImpl.init();
>+
>+	/**
>+	 * Returns a new object of class 'Web App Deployment Descriptor'.
>+	 * 
>+	 * 
>+	 * @return a new object of class 'Web App Deployment Descriptor'.
>+	 * @generated
>+	 */
>+	WebAppDeploymentDescriptor createWebAppDeploymentDescriptor();
>+
>+	/**
>+	 * Returns the package supported by this factory.
>+	 * 
>+	 * 
>+	 * @return the package supported by this factory.
>+	 * @generated
>+	 */
>+	WebappPackage getWebappPackage();
>+
>+} //WebappFactory
>Index: jee-models/org/eclipse/jst/javaee/web/OrderingOthersType.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/web/OrderingOthersType.java
>diff -N jee-models/org/eclipse/jst/javaee/web/OrderingOthersType.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/web/OrderingOthersType.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,66 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.web;
>+
>+import org.eclipse.jst.javaee.core.JavaEEObject;
>+
>+/**
>+ * 
>+ * A representation of the model object 'Ordering Others Type'.
>+ * 
>+ *
>+ * 
>+ * 
>+ * 
>+ * This element indicates that the ordering sub-element in which
>+ * it was placed should take special action regarding the ordering
>+ * of this application resource relative to other application
>+ * configuration resources.
>+ * See section 8.2.2 of the specification for details.
>+ * 
>+ * @since Java EE 6, Web 3.0
>+ * 
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.web.OrderingOthersType#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getOrderingOthersType()
>+ * @extends JavaEEObject
>+ * @generated
>+ */
>+public interface OrderingOthersType extends JavaEEObject {
>+	/**
>+	 * Returns the value of the 'Id' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Id' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Id' attribute.
>+	 * @see #setId(String)
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getOrderingOthersType_Id()
>+	 * @generated
>+	 */
>+	String getId();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.OrderingOthersType#getId Id}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Id' attribute.
>+	 * @see #getId()
>+	 * @generated
>+	 */
>+	void setId(String value);
>+
>+} // OrderingOthersType
>Index: jee-models/org/eclipse/jst/javaee/web/internal/impl/WebFragmentImpl.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/web/internal/impl/WebFragmentImpl.java
>diff -N jee-models/org/eclipse/jst/javaee/web/internal/impl/WebFragmentImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/web/internal/impl/WebFragmentImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,1219 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.web.internal.impl;
>+
>+import java.util.Collection;
>+import java.util.List;
>+
>+import org.eclipse.emf.common.notify.Notification;
>+import org.eclipse.emf.common.notify.NotificationChain;
>+
>+import org.eclipse.emf.ecore.EClass;
>+import org.eclipse.emf.ecore.InternalEObject;
>+
>+import org.eclipse.emf.ecore.impl.ENotificationImpl;
>+import org.eclipse.emf.ecore.impl.EObjectImpl;
>+
>+import org.eclipse.emf.ecore.util.BasicFeatureMap;
>+import org.eclipse.emf.ecore.util.FeatureMap;
>+import org.eclipse.emf.ecore.util.InternalEList;
>+
>+import org.eclipse.jst.javaee.core.DataSourceType;
>+import org.eclipse.jst.javaee.core.Description;
>+import org.eclipse.jst.javaee.core.DisplayName;
>+import org.eclipse.jst.javaee.core.EjbLocalRef;
>+import org.eclipse.jst.javaee.core.EjbRef;
>+import org.eclipse.jst.javaee.core.EmptyType;
>+import org.eclipse.jst.javaee.core.EnvEntry;
>+import org.eclipse.jst.javaee.core.Icon;
>+import org.eclipse.jst.javaee.core.LifecycleCallback;
>+import org.eclipse.jst.javaee.core.Listener;
>+import org.eclipse.jst.javaee.core.MessageDestination;
>+import org.eclipse.jst.javaee.core.MessageDestinationRef;
>+import org.eclipse.jst.javaee.core.ParamValue;
>+import org.eclipse.jst.javaee.core.PersistenceContextRef;
>+import org.eclipse.jst.javaee.core.PersistenceUnitRef;
>+import org.eclipse.jst.javaee.core.ResourceEnvRef;
>+import org.eclipse.jst.javaee.core.ResourceRef;
>+import org.eclipse.jst.javaee.core.SecurityRole;
>+import org.eclipse.jst.javaee.core.ServiceRef;
>+
>+import org.eclipse.jst.javaee.jsp.JspConfig;
>+
>+import org.eclipse.jst.javaee.web.ErrorPage;
>+import org.eclipse.jst.javaee.web.Filter;
>+import org.eclipse.jst.javaee.web.FilterMapping;
>+import org.eclipse.jst.javaee.web.LocaleEncodingMappingList;
>+import org.eclipse.jst.javaee.web.LoginConfig;
>+import org.eclipse.jst.javaee.web.MimeMapping;
>+import org.eclipse.jst.javaee.web.OrderingType;
>+import org.eclipse.jst.javaee.web.SecurityConstraint;
>+import org.eclipse.jst.javaee.web.Servlet;
>+import org.eclipse.jst.javaee.web.ServletMapping;
>+import org.eclipse.jst.javaee.web.SessionConfig;
>+import org.eclipse.jst.javaee.web.WebAppVersionType;
>+import org.eclipse.jst.javaee.web.WebFragment;
>+import org.eclipse.jst.javaee.web.WelcomeFileList;
>+
>+import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Fragment'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getGroup Group}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getDescriptions Descriptions}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getDisplayNames Display Names}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getIcons Icons}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getName Name}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getDistributables Distributables}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getContextParams Context Params}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getFilters Filters}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getFilterMappings Filter Mappings}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getListeners Listeners}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getServlets Servlets}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getServletMappings Servlet Mappings}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getSessionConfigs Session Configs}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getMimeMappings Mime Mappings}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getWelcomeFileLists Welcome File Lists}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getErrorPages Error Pages}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getJspConfigs Jsp Configs}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getSecurityConstraints Security Constraints}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getLoginConfigs Login Configs}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getSecurityRoles Security Roles}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getEnvEntries Env Entries}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getEjbRefs Ejb Refs}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getEjbLocalRefs Ejb Local Refs}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getServiceRefs Service Refs}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getResourceRefs Resource Refs}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getResourceEnvRefs Resource Env Refs}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getMessageDestinationRefs Message Destination Refs}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getPersistenceContextRefs Persistence Context Refs}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getPersistenceUnitRefs Persistence Unit Refs}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getPostConstructs Post Constructs}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getPreDestroys Pre Destroys}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getDataSource Data Source}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getMessageDestinations Message Destinations}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getLocalEncodingMappingsLists Local Encoding Mappings Lists}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getOrdering Ordering}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getId Id}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#isMetadataComplete Metadata Complete}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getVersion Version}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class WebFragmentImpl extends EObjectImpl implements WebFragment {
>+	/**
>+	 * The cached value of the '{@link #getGroup() Group}' attribute list.
>+	 * 
>+	 * 
>+	 * @see #getGroup()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected FeatureMap group;
>+
>+	/**
>+	 * The default value of the '{@link #getId() Id}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getId()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String ID_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getId() Id}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getId()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String id = ID_EDEFAULT;
>+
>+	/**
>+	 * The default value of the '{@link #isMetadataComplete() Metadata Complete}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isMetadataComplete()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final boolean METADATA_COMPLETE_EDEFAULT = false;
>+
>+	/**
>+	 * The cached value of the '{@link #isMetadataComplete() Metadata Complete}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isMetadataComplete()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean metadataComplete = METADATA_COMPLETE_EDEFAULT;
>+
>+	/**
>+	 * This is true if the Metadata Complete attribute has been set.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean metadataCompleteESet;
>+
>+	/**
>+	 * The default value of the '{@link #getVersion() Version}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getVersion()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final WebAppVersionType VERSION_EDEFAULT = WebAppVersionType._25_LITERAL;
>+
>+	/**
>+	 * The cached value of the '{@link #getVersion() Version}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getVersion()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected WebAppVersionType version = VERSION_EDEFAULT;
>+
>+	/**
>+	 * This is true if the Version attribute has been set.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean versionESet;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected WebFragmentImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return WebPackage.Literals.WEB_FRAGMENT;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public FeatureMap getGroup() {
>+		if (group == null) {
>+			group = new BasicFeatureMap(this, WebPackage.WEB_FRAGMENT__GROUP);
>+		}
>+		return group;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<Description> getDescriptions() {
>+		return getGroup().list(WebPackage.Literals.WEB_FRAGMENT__DESCRIPTIONS);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<DisplayName> getDisplayNames() {
>+		return getGroup().list(WebPackage.Literals.WEB_FRAGMENT__DISPLAY_NAMES);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<Icon> getIcons() {
>+		return getGroup().list(WebPackage.Literals.WEB_FRAGMENT__ICONS);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<String> getName() {
>+		return getGroup().list(WebPackage.Literals.WEB_FRAGMENT__NAME);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<EmptyType> getDistributables() {
>+		return getGroup().list(WebPackage.Literals.WEB_FRAGMENT__DISTRIBUTABLES);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<ParamValue> getContextParams() {
>+		return getGroup().list(WebPackage.Literals.WEB_FRAGMENT__CONTEXT_PARAMS);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<Filter> getFilters() {
>+		return getGroup().list(WebPackage.Literals.WEB_FRAGMENT__FILTERS);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<FilterMapping> getFilterMappings() {
>+		return getGroup().list(WebPackage.Literals.WEB_FRAGMENT__FILTER_MAPPINGS);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<Listener> getListeners() {
>+		return getGroup().list(WebPackage.Literals.WEB_FRAGMENT__LISTENERS);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<Servlet> getServlets() {
>+		return getGroup().list(WebPackage.Literals.WEB_FRAGMENT__SERVLETS);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<ServletMapping> getServletMappings() {
>+		return getGroup().list(WebPackage.Literals.WEB_FRAGMENT__SERVLET_MAPPINGS);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<SessionConfig> getSessionConfigs() {
>+		return getGroup().list(WebPackage.Literals.WEB_FRAGMENT__SESSION_CONFIGS);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<MimeMapping> getMimeMappings() {
>+		return getGroup().list(WebPackage.Literals.WEB_FRAGMENT__MIME_MAPPINGS);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<WelcomeFileList> getWelcomeFileLists() {
>+		return getGroup().list(WebPackage.Literals.WEB_FRAGMENT__WELCOME_FILE_LISTS);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<ErrorPage> getErrorPages() {
>+		return getGroup().list(WebPackage.Literals.WEB_FRAGMENT__ERROR_PAGES);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<JspConfig> getJspConfigs() {
>+		return getGroup().list(WebPackage.Literals.WEB_FRAGMENT__JSP_CONFIGS);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<SecurityConstraint> getSecurityConstraints() {
>+		return getGroup().list(WebPackage.Literals.WEB_FRAGMENT__SECURITY_CONSTRAINTS);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<LoginConfig> getLoginConfigs() {
>+		return getGroup().list(WebPackage.Literals.WEB_FRAGMENT__LOGIN_CONFIGS);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<SecurityRole> getSecurityRoles() {
>+		return getGroup().list(WebPackage.Literals.WEB_FRAGMENT__SECURITY_ROLES);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<EnvEntry> getEnvEntries() {
>+		return getGroup().list(WebPackage.Literals.WEB_FRAGMENT__ENV_ENTRIES);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<EjbRef> getEjbRefs() {
>+		return getGroup().list(WebPackage.Literals.WEB_FRAGMENT__EJB_REFS);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<EjbLocalRef> getEjbLocalRefs() {
>+		return getGroup().list(WebPackage.Literals.WEB_FRAGMENT__EJB_LOCAL_REFS);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<ServiceRef> getServiceRefs() {
>+		return getGroup().list(WebPackage.Literals.WEB_FRAGMENT__SERVICE_REFS);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<ResourceRef> getResourceRefs() {
>+		return getGroup().list(WebPackage.Literals.WEB_FRAGMENT__RESOURCE_REFS);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<ResourceEnvRef> getResourceEnvRefs() {
>+		return getGroup().list(WebPackage.Literals.WEB_FRAGMENT__RESOURCE_ENV_REFS);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<MessageDestinationRef> getMessageDestinationRefs() {
>+		return getGroup().list(WebPackage.Literals.WEB_FRAGMENT__MESSAGE_DESTINATION_REFS);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<PersistenceContextRef> getPersistenceContextRefs() {
>+		return getGroup().list(WebPackage.Literals.WEB_FRAGMENT__PERSISTENCE_CONTEXT_REFS);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<PersistenceUnitRef> getPersistenceUnitRefs() {
>+		return getGroup().list(WebPackage.Literals.WEB_FRAGMENT__PERSISTENCE_UNIT_REFS);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<LifecycleCallback> getPostConstructs() {
>+		return getGroup().list(WebPackage.Literals.WEB_FRAGMENT__POST_CONSTRUCTS);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<LifecycleCallback> getPreDestroys() {
>+		return getGroup().list(WebPackage.Literals.WEB_FRAGMENT__PRE_DESTROYS);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<DataSourceType> getDataSource() {
>+		return getGroup().list(WebPackage.Literals.WEB_FRAGMENT__DATA_SOURCE);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<MessageDestination> getMessageDestinations() {
>+		return getGroup().list(WebPackage.Literals.WEB_FRAGMENT__MESSAGE_DESTINATIONS);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<LocaleEncodingMappingList> getLocalEncodingMappingsLists() {
>+		return getGroup().list(WebPackage.Literals.WEB_FRAGMENT__LOCAL_ENCODING_MAPPINGS_LISTS);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<OrderingType> getOrdering() {
>+		return getGroup().list(WebPackage.Literals.WEB_FRAGMENT__ORDERING);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getId() {
>+		return id;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setId(String newId) {
>+		String oldId = id;
>+		id = newId;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.WEB_FRAGMENT__ID, oldId, id));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isMetadataComplete() {
>+		return metadataComplete;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setMetadataComplete(boolean newMetadataComplete) {
>+		boolean oldMetadataComplete = metadataComplete;
>+		metadataComplete = newMetadataComplete;
>+		boolean oldMetadataCompleteESet = metadataCompleteESet;
>+		metadataCompleteESet = true;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.WEB_FRAGMENT__METADATA_COMPLETE, oldMetadataComplete, metadataComplete, !oldMetadataCompleteESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void unsetMetadataComplete() {
>+		boolean oldMetadataComplete = metadataComplete;
>+		boolean oldMetadataCompleteESet = metadataCompleteESet;
>+		metadataComplete = METADATA_COMPLETE_EDEFAULT;
>+		metadataCompleteESet = false;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.UNSET, WebPackage.WEB_FRAGMENT__METADATA_COMPLETE, oldMetadataComplete, METADATA_COMPLETE_EDEFAULT, oldMetadataCompleteESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isSetMetadataComplete() {
>+		return metadataCompleteESet;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public WebAppVersionType getVersion() {
>+		return version;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setVersion(WebAppVersionType newVersion) {
>+		WebAppVersionType oldVersion = version;
>+		version = newVersion == null ? VERSION_EDEFAULT : newVersion;
>+		boolean oldVersionESet = versionESet;
>+		versionESet = true;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.WEB_FRAGMENT__VERSION, oldVersion, version, !oldVersionESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void unsetVersion() {
>+		WebAppVersionType oldVersion = version;
>+		boolean oldVersionESet = versionESet;
>+		version = VERSION_EDEFAULT;
>+		versionESet = false;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.UNSET, WebPackage.WEB_FRAGMENT__VERSION, oldVersion, VERSION_EDEFAULT, oldVersionESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isSetVersion() {
>+		return versionESet;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
>+		switch (featureID) {
>+			case WebPackage.WEB_FRAGMENT__GROUP:
>+				return ((InternalEList<?>)getGroup()).basicRemove(otherEnd, msgs);
>+			case WebPackage.WEB_FRAGMENT__DESCRIPTIONS:
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
>+			case WebPackage.WEB_FRAGMENT__DISPLAY_NAMES:
>+				return ((InternalEList<?>)getDisplayNames()).basicRemove(otherEnd, msgs);
>+			case WebPackage.WEB_FRAGMENT__ICONS:
>+				return ((InternalEList<?>)getIcons()).basicRemove(otherEnd, msgs);
>+			case WebPackage.WEB_FRAGMENT__DISTRIBUTABLES:
>+				return ((InternalEList<?>)getDistributables()).basicRemove(otherEnd, msgs);
>+			case WebPackage.WEB_FRAGMENT__CONTEXT_PARAMS:
>+				return ((InternalEList<?>)getContextParams()).basicRemove(otherEnd, msgs);
>+			case WebPackage.WEB_FRAGMENT__FILTERS:
>+				return ((InternalEList<?>)getFilters()).basicRemove(otherEnd, msgs);
>+			case WebPackage.WEB_FRAGMENT__FILTER_MAPPINGS:
>+				return ((InternalEList<?>)getFilterMappings()).basicRemove(otherEnd, msgs);
>+			case WebPackage.WEB_FRAGMENT__LISTENERS:
>+				return ((InternalEList<?>)getListeners()).basicRemove(otherEnd, msgs);
>+			case WebPackage.WEB_FRAGMENT__SERVLETS:
>+				return ((InternalEList<?>)getServlets()).basicRemove(otherEnd, msgs);
>+			case WebPackage.WEB_FRAGMENT__SERVLET_MAPPINGS:
>+				return ((InternalEList<?>)getServletMappings()).basicRemove(otherEnd, msgs);
>+			case WebPackage.WEB_FRAGMENT__SESSION_CONFIGS:
>+				return ((InternalEList<?>)getSessionConfigs()).basicRemove(otherEnd, msgs);
>+			case WebPackage.WEB_FRAGMENT__MIME_MAPPINGS:
>+				return ((InternalEList<?>)getMimeMappings()).basicRemove(otherEnd, msgs);
>+			case WebPackage.WEB_FRAGMENT__WELCOME_FILE_LISTS:
>+				return ((InternalEList<?>)getWelcomeFileLists()).basicRemove(otherEnd, msgs);
>+			case WebPackage.WEB_FRAGMENT__ERROR_PAGES:
>+				return ((InternalEList<?>)getErrorPages()).basicRemove(otherEnd, msgs);
>+			case WebPackage.WEB_FRAGMENT__JSP_CONFIGS:
>+				return ((InternalEList<?>)getJspConfigs()).basicRemove(otherEnd, msgs);
>+			case WebPackage.WEB_FRAGMENT__SECURITY_CONSTRAINTS:
>+				return ((InternalEList<?>)getSecurityConstraints()).basicRemove(otherEnd, msgs);
>+			case WebPackage.WEB_FRAGMENT__LOGIN_CONFIGS:
>+				return ((InternalEList<?>)getLoginConfigs()).basicRemove(otherEnd, msgs);
>+			case WebPackage.WEB_FRAGMENT__SECURITY_ROLES:
>+				return ((InternalEList<?>)getSecurityRoles()).basicRemove(otherEnd, msgs);
>+			case WebPackage.WEB_FRAGMENT__ENV_ENTRIES:
>+				return ((InternalEList<?>)getEnvEntries()).basicRemove(otherEnd, msgs);
>+			case WebPackage.WEB_FRAGMENT__EJB_REFS:
>+				return ((InternalEList<?>)getEjbRefs()).basicRemove(otherEnd, msgs);
>+			case WebPackage.WEB_FRAGMENT__EJB_LOCAL_REFS:
>+				return ((InternalEList<?>)getEjbLocalRefs()).basicRemove(otherEnd, msgs);
>+			case WebPackage.WEB_FRAGMENT__SERVICE_REFS:
>+				return ((InternalEList<?>)getServiceRefs()).basicRemove(otherEnd, msgs);
>+			case WebPackage.WEB_FRAGMENT__RESOURCE_REFS:
>+				return ((InternalEList<?>)getResourceRefs()).basicRemove(otherEnd, msgs);
>+			case WebPackage.WEB_FRAGMENT__RESOURCE_ENV_REFS:
>+				return ((InternalEList<?>)getResourceEnvRefs()).basicRemove(otherEnd, msgs);
>+			case WebPackage.WEB_FRAGMENT__MESSAGE_DESTINATION_REFS:
>+				return ((InternalEList<?>)getMessageDestinationRefs()).basicRemove(otherEnd, msgs);
>+			case WebPackage.WEB_FRAGMENT__PERSISTENCE_CONTEXT_REFS:
>+				return ((InternalEList<?>)getPersistenceContextRefs()).basicRemove(otherEnd, msgs);
>+			case WebPackage.WEB_FRAGMENT__PERSISTENCE_UNIT_REFS:
>+				return ((InternalEList<?>)getPersistenceUnitRefs()).basicRemove(otherEnd, msgs);
>+			case WebPackage.WEB_FRAGMENT__POST_CONSTRUCTS:
>+				return ((InternalEList<?>)getPostConstructs()).basicRemove(otherEnd, msgs);
>+			case WebPackage.WEB_FRAGMENT__PRE_DESTROYS:
>+				return ((InternalEList<?>)getPreDestroys()).basicRemove(otherEnd, msgs);
>+			case WebPackage.WEB_FRAGMENT__DATA_SOURCE:
>+				return ((InternalEList<?>)getDataSource()).basicRemove(otherEnd, msgs);
>+			case WebPackage.WEB_FRAGMENT__MESSAGE_DESTINATIONS:
>+				return ((InternalEList<?>)getMessageDestinations()).basicRemove(otherEnd, msgs);
>+			case WebPackage.WEB_FRAGMENT__LOCAL_ENCODING_MAPPINGS_LISTS:
>+				return ((InternalEList<?>)getLocalEncodingMappingsLists()).basicRemove(otherEnd, msgs);
>+			case WebPackage.WEB_FRAGMENT__ORDERING:
>+				return ((InternalEList<?>)getOrdering()).basicRemove(otherEnd, msgs);
>+		}
>+		return super.eInverseRemove(otherEnd, featureID, msgs);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case WebPackage.WEB_FRAGMENT__GROUP:
>+				if (coreType) return getGroup();
>+				return ((FeatureMap.Internal)getGroup()).getWrapper();
>+			case WebPackage.WEB_FRAGMENT__DESCRIPTIONS:
>+				return getDescriptions();
>+			case WebPackage.WEB_FRAGMENT__DISPLAY_NAMES:
>+				return getDisplayNames();
>+			case WebPackage.WEB_FRAGMENT__ICONS:
>+				return getIcons();
>+			case WebPackage.WEB_FRAGMENT__NAME:
>+				return getName();
>+			case WebPackage.WEB_FRAGMENT__DISTRIBUTABLES:
>+				return getDistributables();
>+			case WebPackage.WEB_FRAGMENT__CONTEXT_PARAMS:
>+				return getContextParams();
>+			case WebPackage.WEB_FRAGMENT__FILTERS:
>+				return getFilters();
>+			case WebPackage.WEB_FRAGMENT__FILTER_MAPPINGS:
>+				return getFilterMappings();
>+			case WebPackage.WEB_FRAGMENT__LISTENERS:
>+				return getListeners();
>+			case WebPackage.WEB_FRAGMENT__SERVLETS:
>+				return getServlets();
>+			case WebPackage.WEB_FRAGMENT__SERVLET_MAPPINGS:
>+				return getServletMappings();
>+			case WebPackage.WEB_FRAGMENT__SESSION_CONFIGS:
>+				return getSessionConfigs();
>+			case WebPackage.WEB_FRAGMENT__MIME_MAPPINGS:
>+				return getMimeMappings();
>+			case WebPackage.WEB_FRAGMENT__WELCOME_FILE_LISTS:
>+				return getWelcomeFileLists();
>+			case WebPackage.WEB_FRAGMENT__ERROR_PAGES:
>+				return getErrorPages();
>+			case WebPackage.WEB_FRAGMENT__JSP_CONFIGS:
>+				return getJspConfigs();
>+			case WebPackage.WEB_FRAGMENT__SECURITY_CONSTRAINTS:
>+				return getSecurityConstraints();
>+			case WebPackage.WEB_FRAGMENT__LOGIN_CONFIGS:
>+				return getLoginConfigs();
>+			case WebPackage.WEB_FRAGMENT__SECURITY_ROLES:
>+				return getSecurityRoles();
>+			case WebPackage.WEB_FRAGMENT__ENV_ENTRIES:
>+				return getEnvEntries();
>+			case WebPackage.WEB_FRAGMENT__EJB_REFS:
>+				return getEjbRefs();
>+			case WebPackage.WEB_FRAGMENT__EJB_LOCAL_REFS:
>+				return getEjbLocalRefs();
>+			case WebPackage.WEB_FRAGMENT__SERVICE_REFS:
>+				return getServiceRefs();
>+			case WebPackage.WEB_FRAGMENT__RESOURCE_REFS:
>+				return getResourceRefs();
>+			case WebPackage.WEB_FRAGMENT__RESOURCE_ENV_REFS:
>+				return getResourceEnvRefs();
>+			case WebPackage.WEB_FRAGMENT__MESSAGE_DESTINATION_REFS:
>+				return getMessageDestinationRefs();
>+			case WebPackage.WEB_FRAGMENT__PERSISTENCE_CONTEXT_REFS:
>+				return getPersistenceContextRefs();
>+			case WebPackage.WEB_FRAGMENT__PERSISTENCE_UNIT_REFS:
>+				return getPersistenceUnitRefs();
>+			case WebPackage.WEB_FRAGMENT__POST_CONSTRUCTS:
>+				return getPostConstructs();
>+			case WebPackage.WEB_FRAGMENT__PRE_DESTROYS:
>+				return getPreDestroys();
>+			case WebPackage.WEB_FRAGMENT__DATA_SOURCE:
>+				return getDataSource();
>+			case WebPackage.WEB_FRAGMENT__MESSAGE_DESTINATIONS:
>+				return getMessageDestinations();
>+			case WebPackage.WEB_FRAGMENT__LOCAL_ENCODING_MAPPINGS_LISTS:
>+				return getLocalEncodingMappingsLists();
>+			case WebPackage.WEB_FRAGMENT__ORDERING:
>+				return getOrdering();
>+			case WebPackage.WEB_FRAGMENT__ID:
>+				return getId();
>+			case WebPackage.WEB_FRAGMENT__METADATA_COMPLETE:
>+				return isMetadataComplete();
>+			case WebPackage.WEB_FRAGMENT__VERSION:
>+				return getVersion();
>+		}
>+		return super.eGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@SuppressWarnings("unchecked")
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case WebPackage.WEB_FRAGMENT__GROUP:
>+				((FeatureMap.Internal)getGroup()).set(newValue);
>+				return;
>+			case WebPackage.WEB_FRAGMENT__DESCRIPTIONS:
>+				getDescriptions().clear();
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
>+				return;
>+			case WebPackage.WEB_FRAGMENT__DISPLAY_NAMES:
>+				getDisplayNames().clear();
>+				getDisplayNames().addAll((Collection<? extends DisplayName>)newValue);
>+				return;
>+			case WebPackage.WEB_FRAGMENT__ICONS:
>+				getIcons().clear();
>+				getIcons().addAll((Collection<? extends Icon>)newValue);
>+				return;
>+			case WebPackage.WEB_FRAGMENT__NAME:
>+				getName().clear();
>+				getName().addAll((Collection<? extends String>)newValue);
>+				return;
>+			case WebPackage.WEB_FRAGMENT__DISTRIBUTABLES:
>+				getDistributables().clear();
>+				getDistributables().addAll((Collection<? extends EmptyType>)newValue);
>+				return;
>+			case WebPackage.WEB_FRAGMENT__CONTEXT_PARAMS:
>+				getContextParams().clear();
>+				getContextParams().addAll((Collection<? extends ParamValue>)newValue);
>+				return;
>+			case WebPackage.WEB_FRAGMENT__FILTERS:
>+				getFilters().clear();
>+				getFilters().addAll((Collection<? extends Filter>)newValue);
>+				return;
>+			case WebPackage.WEB_FRAGMENT__FILTER_MAPPINGS:
>+				getFilterMappings().clear();
>+				getFilterMappings().addAll((Collection<? extends FilterMapping>)newValue);
>+				return;
>+			case WebPackage.WEB_FRAGMENT__LISTENERS:
>+				getListeners().clear();
>+				getListeners().addAll((Collection<? extends Listener>)newValue);
>+				return;
>+			case WebPackage.WEB_FRAGMENT__SERVLETS:
>+				getServlets().clear();
>+				getServlets().addAll((Collection<? extends Servlet>)newValue);
>+				return;
>+			case WebPackage.WEB_FRAGMENT__SERVLET_MAPPINGS:
>+				getServletMappings().clear();
>+				getServletMappings().addAll((Collection<? extends ServletMapping>)newValue);
>+				return;
>+			case WebPackage.WEB_FRAGMENT__SESSION_CONFIGS:
>+				getSessionConfigs().clear();
>+				getSessionConfigs().addAll((Collection<? extends SessionConfig>)newValue);
>+				return;
>+			case WebPackage.WEB_FRAGMENT__MIME_MAPPINGS:
>+				getMimeMappings().clear();
>+				getMimeMappings().addAll((Collection<? extends MimeMapping>)newValue);
>+				return;
>+			case WebPackage.WEB_FRAGMENT__WELCOME_FILE_LISTS:
>+				getWelcomeFileLists().clear();
>+				getWelcomeFileLists().addAll((Collection<? extends WelcomeFileList>)newValue);
>+				return;
>+			case WebPackage.WEB_FRAGMENT__ERROR_PAGES:
>+				getErrorPages().clear();
>+				getErrorPages().addAll((Collection<? extends ErrorPage>)newValue);
>+				return;
>+			case WebPackage.WEB_FRAGMENT__JSP_CONFIGS:
>+				getJspConfigs().clear();
>+				getJspConfigs().addAll((Collection<? extends JspConfig>)newValue);
>+				return;
>+			case WebPackage.WEB_FRAGMENT__SECURITY_CONSTRAINTS:
>+				getSecurityConstraints().clear();
>+				getSecurityConstraints().addAll((Collection<? extends SecurityConstraint>)newValue);
>+				return;
>+			case WebPackage.WEB_FRAGMENT__LOGIN_CONFIGS:
>+				getLoginConfigs().clear();
>+				getLoginConfigs().addAll((Collection<? extends LoginConfig>)newValue);
>+				return;
>+			case WebPackage.WEB_FRAGMENT__SECURITY_ROLES:
>+				getSecurityRoles().clear();
>+				getSecurityRoles().addAll((Collection<? extends SecurityRole>)newValue);
>+				return;
>+			case WebPackage.WEB_FRAGMENT__ENV_ENTRIES:
>+				getEnvEntries().clear();
>+				getEnvEntries().addAll((Collection<? extends EnvEntry>)newValue);
>+				return;
>+			case WebPackage.WEB_FRAGMENT__EJB_REFS:
>+				getEjbRefs().clear();
>+				getEjbRefs().addAll((Collection<? extends EjbRef>)newValue);
>+				return;
>+			case WebPackage.WEB_FRAGMENT__EJB_LOCAL_REFS:
>+				getEjbLocalRefs().clear();
>+				getEjbLocalRefs().addAll((Collection<? extends EjbLocalRef>)newValue);
>+				return;
>+			case WebPackage.WEB_FRAGMENT__SERVICE_REFS:
>+				getServiceRefs().clear();
>+				getServiceRefs().addAll((Collection<? extends ServiceRef>)newValue);
>+				return;
>+			case WebPackage.WEB_FRAGMENT__RESOURCE_REFS:
>+				getResourceRefs().clear();
>+				getResourceRefs().addAll((Collection<? extends ResourceRef>)newValue);
>+				return;
>+			case WebPackage.WEB_FRAGMENT__RESOURCE_ENV_REFS:
>+				getResourceEnvRefs().clear();
>+				getResourceEnvRefs().addAll((Collection<? extends ResourceEnvRef>)newValue);
>+				return;
>+			case WebPackage.WEB_FRAGMENT__MESSAGE_DESTINATION_REFS:
>+				getMessageDestinationRefs().clear();
>+				getMessageDestinationRefs().addAll((Collection<? extends MessageDestinationRef>)newValue);
>+				return;
>+			case WebPackage.WEB_FRAGMENT__PERSISTENCE_CONTEXT_REFS:
>+				getPersistenceContextRefs().clear();
>+				getPersistenceContextRefs().addAll((Collection<? extends PersistenceContextRef>)newValue);
>+				return;
>+			case WebPackage.WEB_FRAGMENT__PERSISTENCE_UNIT_REFS:
>+				getPersistenceUnitRefs().clear();
>+				getPersistenceUnitRefs().addAll((Collection<? extends PersistenceUnitRef>)newValue);
>+				return;
>+			case WebPackage.WEB_FRAGMENT__POST_CONSTRUCTS:
>+				getPostConstructs().clear();
>+				getPostConstructs().addAll((Collection<? extends LifecycleCallback>)newValue);
>+				return;
>+			case WebPackage.WEB_FRAGMENT__PRE_DESTROYS:
>+				getPreDestroys().clear();
>+				getPreDestroys().addAll((Collection<? extends LifecycleCallback>)newValue);
>+				return;
>+			case WebPackage.WEB_FRAGMENT__DATA_SOURCE:
>+				getDataSource().clear();
>+				getDataSource().addAll((Collection<? extends DataSourceType>)newValue);
>+				return;
>+			case WebPackage.WEB_FRAGMENT__MESSAGE_DESTINATIONS:
>+				getMessageDestinations().clear();
>+				getMessageDestinations().addAll((Collection<? extends MessageDestination>)newValue);
>+				return;
>+			case WebPackage.WEB_FRAGMENT__LOCAL_ENCODING_MAPPINGS_LISTS:
>+				getLocalEncodingMappingsLists().clear();
>+				getLocalEncodingMappingsLists().addAll((Collection<? extends LocaleEncodingMappingList>)newValue);
>+				return;
>+			case WebPackage.WEB_FRAGMENT__ORDERING:
>+				getOrdering().clear();
>+				getOrdering().addAll((Collection<? extends OrderingType>)newValue);
>+				return;
>+			case WebPackage.WEB_FRAGMENT__ID:
>+				setId((String)newValue);
>+				return;
>+			case WebPackage.WEB_FRAGMENT__METADATA_COMPLETE:
>+				setMetadataComplete((Boolean)newValue);
>+				return;
>+			case WebPackage.WEB_FRAGMENT__VERSION:
>+				setVersion((WebAppVersionType)newValue);
>+				return;
>+		}
>+		super.eSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case WebPackage.WEB_FRAGMENT__GROUP:
>+				getGroup().clear();
>+				return;
>+			case WebPackage.WEB_FRAGMENT__DESCRIPTIONS:
>+				getDescriptions().clear();
>+				return;
>+			case WebPackage.WEB_FRAGMENT__DISPLAY_NAMES:
>+				getDisplayNames().clear();
>+				return;
>+			case WebPackage.WEB_FRAGMENT__ICONS:
>+				getIcons().clear();
>+				return;
>+			case WebPackage.WEB_FRAGMENT__NAME:
>+				getName().clear();
>+				return;
>+			case WebPackage.WEB_FRAGMENT__DISTRIBUTABLES:
>+				getDistributables().clear();
>+				return;
>+			case WebPackage.WEB_FRAGMENT__CONTEXT_PARAMS:
>+				getContextParams().clear();
>+				return;
>+			case WebPackage.WEB_FRAGMENT__FILTERS:
>+				getFilters().clear();
>+				return;
>+			case WebPackage.WEB_FRAGMENT__FILTER_MAPPINGS:
>+				getFilterMappings().clear();
>+				return;
>+			case WebPackage.WEB_FRAGMENT__LISTENERS:
>+				getListeners().clear();
>+				return;
>+			case WebPackage.WEB_FRAGMENT__SERVLETS:
>+				getServlets().clear();
>+				return;
>+			case WebPackage.WEB_FRAGMENT__SERVLET_MAPPINGS:
>+				getServletMappings().clear();
>+				return;
>+			case WebPackage.WEB_FRAGMENT__SESSION_CONFIGS:
>+				getSessionConfigs().clear();
>+				return;
>+			case WebPackage.WEB_FRAGMENT__MIME_MAPPINGS:
>+				getMimeMappings().clear();
>+				return;
>+			case WebPackage.WEB_FRAGMENT__WELCOME_FILE_LISTS:
>+				getWelcomeFileLists().clear();
>+				return;
>+			case WebPackage.WEB_FRAGMENT__ERROR_PAGES:
>+				getErrorPages().clear();
>+				return;
>+			case WebPackage.WEB_FRAGMENT__JSP_CONFIGS:
>+				getJspConfigs().clear();
>+				return;
>+			case WebPackage.WEB_FRAGMENT__SECURITY_CONSTRAINTS:
>+				getSecurityConstraints().clear();
>+				return;
>+			case WebPackage.WEB_FRAGMENT__LOGIN_CONFIGS:
>+				getLoginConfigs().clear();
>+				return;
>+			case WebPackage.WEB_FRAGMENT__SECURITY_ROLES:
>+				getSecurityRoles().clear();
>+				return;
>+			case WebPackage.WEB_FRAGMENT__ENV_ENTRIES:
>+				getEnvEntries().clear();
>+				return;
>+			case WebPackage.WEB_FRAGMENT__EJB_REFS:
>+				getEjbRefs().clear();
>+				return;
>+			case WebPackage.WEB_FRAGMENT__EJB_LOCAL_REFS:
>+				getEjbLocalRefs().clear();
>+				return;
>+			case WebPackage.WEB_FRAGMENT__SERVICE_REFS:
>+				getServiceRefs().clear();
>+				return;
>+			case WebPackage.WEB_FRAGMENT__RESOURCE_REFS:
>+				getResourceRefs().clear();
>+				return;
>+			case WebPackage.WEB_FRAGMENT__RESOURCE_ENV_REFS:
>+				getResourceEnvRefs().clear();
>+				return;
>+			case WebPackage.WEB_FRAGMENT__MESSAGE_DESTINATION_REFS:
>+				getMessageDestinationRefs().clear();
>+				return;
>+			case WebPackage.WEB_FRAGMENT__PERSISTENCE_CONTEXT_REFS:
>+				getPersistenceContextRefs().clear();
>+				return;
>+			case WebPackage.WEB_FRAGMENT__PERSISTENCE_UNIT_REFS:
>+				getPersistenceUnitRefs().clear();
>+				return;
>+			case WebPackage.WEB_FRAGMENT__POST_CONSTRUCTS:
>+				getPostConstructs().clear();
>+				return;
>+			case WebPackage.WEB_FRAGMENT__PRE_DESTROYS:
>+				getPreDestroys().clear();
>+				return;
>+			case WebPackage.WEB_FRAGMENT__DATA_SOURCE:
>+				getDataSource().clear();
>+				return;
>+			case WebPackage.WEB_FRAGMENT__MESSAGE_DESTINATIONS:
>+				getMessageDestinations().clear();
>+				return;
>+			case WebPackage.WEB_FRAGMENT__LOCAL_ENCODING_MAPPINGS_LISTS:
>+				getLocalEncodingMappingsLists().clear();
>+				return;
>+			case WebPackage.WEB_FRAGMENT__ORDERING:
>+				getOrdering().clear();
>+				return;
>+			case WebPackage.WEB_FRAGMENT__ID:
>+				setId(ID_EDEFAULT);
>+				return;
>+			case WebPackage.WEB_FRAGMENT__METADATA_COMPLETE:
>+				unsetMetadataComplete();
>+				return;
>+			case WebPackage.WEB_FRAGMENT__VERSION:
>+				unsetVersion();
>+				return;
>+		}
>+		super.eUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case WebPackage.WEB_FRAGMENT__GROUP:
>+				return group != null && !group.isEmpty();
>+			case WebPackage.WEB_FRAGMENT__DESCRIPTIONS:
>+				return !getDescriptions().isEmpty();
>+			case WebPackage.WEB_FRAGMENT__DISPLAY_NAMES:
>+				return !getDisplayNames().isEmpty();
>+			case WebPackage.WEB_FRAGMENT__ICONS:
>+				return !getIcons().isEmpty();
>+			case WebPackage.WEB_FRAGMENT__NAME:
>+				return !getName().isEmpty();
>+			case WebPackage.WEB_FRAGMENT__DISTRIBUTABLES:
>+				return !getDistributables().isEmpty();
>+			case WebPackage.WEB_FRAGMENT__CONTEXT_PARAMS:
>+				return !getContextParams().isEmpty();
>+			case WebPackage.WEB_FRAGMENT__FILTERS:
>+				return !getFilters().isEmpty();
>+			case WebPackage.WEB_FRAGMENT__FILTER_MAPPINGS:
>+				return !getFilterMappings().isEmpty();
>+			case WebPackage.WEB_FRAGMENT__LISTENERS:
>+				return !getListeners().isEmpty();
>+			case WebPackage.WEB_FRAGMENT__SERVLETS:
>+				return !getServlets().isEmpty();
>+			case WebPackage.WEB_FRAGMENT__SERVLET_MAPPINGS:
>+				return !getServletMappings().isEmpty();
>+			case WebPackage.WEB_FRAGMENT__SESSION_CONFIGS:
>+				return !getSessionConfigs().isEmpty();
>+			case WebPackage.WEB_FRAGMENT__MIME_MAPPINGS:
>+				return !getMimeMappings().isEmpty();
>+			case WebPackage.WEB_FRAGMENT__WELCOME_FILE_LISTS:
>+				return !getWelcomeFileLists().isEmpty();
>+			case WebPackage.WEB_FRAGMENT__ERROR_PAGES:
>+				return !getErrorPages().isEmpty();
>+			case WebPackage.WEB_FRAGMENT__JSP_CONFIGS:
>+				return !getJspConfigs().isEmpty();
>+			case WebPackage.WEB_FRAGMENT__SECURITY_CONSTRAINTS:
>+				return !getSecurityConstraints().isEmpty();
>+			case WebPackage.WEB_FRAGMENT__LOGIN_CONFIGS:
>+				return !getLoginConfigs().isEmpty();
>+			case WebPackage.WEB_FRAGMENT__SECURITY_ROLES:
>+				return !getSecurityRoles().isEmpty();
>+			case WebPackage.WEB_FRAGMENT__ENV_ENTRIES:
>+				return !getEnvEntries().isEmpty();
>+			case WebPackage.WEB_FRAGMENT__EJB_REFS:
>+				return !getEjbRefs().isEmpty();
>+			case WebPackage.WEB_FRAGMENT__EJB_LOCAL_REFS:
>+				return !getEjbLocalRefs().isEmpty();
>+			case WebPackage.WEB_FRAGMENT__SERVICE_REFS:
>+				return !getServiceRefs().isEmpty();
>+			case WebPackage.WEB_FRAGMENT__RESOURCE_REFS:
>+				return !getResourceRefs().isEmpty();
>+			case WebPackage.WEB_FRAGMENT__RESOURCE_ENV_REFS:
>+				return !getResourceEnvRefs().isEmpty();
>+			case WebPackage.WEB_FRAGMENT__MESSAGE_DESTINATION_REFS:
>+				return !getMessageDestinationRefs().isEmpty();
>+			case WebPackage.WEB_FRAGMENT__PERSISTENCE_CONTEXT_REFS:
>+				return !getPersistenceContextRefs().isEmpty();
>+			case WebPackage.WEB_FRAGMENT__PERSISTENCE_UNIT_REFS:
>+				return !getPersistenceUnitRefs().isEmpty();
>+			case WebPackage.WEB_FRAGMENT__POST_CONSTRUCTS:
>+				return !getPostConstructs().isEmpty();
>+			case WebPackage.WEB_FRAGMENT__PRE_DESTROYS:
>+				return !getPreDestroys().isEmpty();
>+			case WebPackage.WEB_FRAGMENT__DATA_SOURCE:
>+				return !getDataSource().isEmpty();
>+			case WebPackage.WEB_FRAGMENT__MESSAGE_DESTINATIONS:
>+				return !getMessageDestinations().isEmpty();
>+			case WebPackage.WEB_FRAGMENT__LOCAL_ENCODING_MAPPINGS_LISTS:
>+				return !getLocalEncodingMappingsLists().isEmpty();
>+			case WebPackage.WEB_FRAGMENT__ORDERING:
>+				return !getOrdering().isEmpty();
>+			case WebPackage.WEB_FRAGMENT__ID:
>+				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
>+			case WebPackage.WEB_FRAGMENT__METADATA_COMPLETE:
>+				return isSetMetadataComplete();
>+			case WebPackage.WEB_FRAGMENT__VERSION:
>+				return isSetVersion();
>+		}
>+		return super.eIsSet(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		if (eIsProxy()) return super.toString();
>+
>+		StringBuffer result = new StringBuffer(super.toString());
>+		result.append(" (group: "); //$NON-NLS-1$
>+		result.append(group);
>+		result.append(", id: "); //$NON-NLS-1$
>+		result.append(id);
>+		result.append(", metadataComplete: "); //$NON-NLS-1$
>+		if (metadataCompleteESet) result.append(metadataComplete); else result.append("<unset>"); //$NON-NLS-1$
>+		result.append(", version: "); //$NON-NLS-1$
>+		if (versionESet) result.append(version); else result.append("<unset>"); //$NON-NLS-1$
>+		result.append(')');
>+		return result.toString();
>+	}
>+
>+} //WebFragmentImpl
>Index: jee-models/org/eclipse/jst/javaee/webapp/internal/metadata/WebappPackage.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/webapp/internal/metadata/WebappPackage.java
>diff -N jee-models/org/eclipse/jst/javaee/webapp/internal/metadata/WebappPackage.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/webapp/internal/metadata/WebappPackage.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,589 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.webapp.internal.metadata;
>+
>+import org.eclipse.emf.ecore.EAttribute;
>+import org.eclipse.emf.ecore.EClass;
>+import org.eclipse.emf.ecore.EPackage;
>+import org.eclipse.emf.ecore.EReference;
>+
>+/**
>+ * 
>+ * The Package for the model.
>+ * It contains accessors for the meta objects to represent
>+ * <ul>
>+ * <li>each class,</li>
>+ * <li>each feature of each class,</li>
>+ * <li>each enum,</li>
>+ * <li>and each data type</li>
>+ * </ul>
>+ * 
>+ * 
>+ * 
>+ * 
>+ * $Id: web-app_3_0.xsd,v 1.2 2009/09/29 20:31:42 ccc Exp $
>+ * 
>+ * 
>+ * 
>+ * <![CDATA[[
>+ * This is the XML Schema for the Servlet 3.0 deployment descriptor.
>+ * The deployment descriptor must be named "WEB-INF/web.xml" in the
>+ * web application's war file. All Servlet deployment descriptors
>+ * must indicate the web application schema by using the Java EE
>+ * namespace:
>+ * 
>+ * http://java.sun.com/xml/ns/javaee 
>+ * 
>+ * and by indicating the version of the schema by 
>+ * using the version element as shown below: 
>+ * 
>+ * <web-app xmlns="http://java.sun.com/xml/ns/javaee"
>+ * xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>+ * xsi:schemaLocation="..."
>+ * version="3.0"> 
>+ * ...
>+ * </web-app>
>+ * 
>+ * The instance documents may indicate the published version of
>+ * the schema using the xsi:schemaLocation attribute for Java EE
>+ * namespace with the following location:
>+ * 
>+ * http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd
>+ * 
>+ * ]]>
>+ * 
>+ * 
>+ * 
>+ * The following conventions apply to all Java EE
>+ * deployment descriptor elements unless indicated otherwise.
>+ * 
>+ * - In elements that specify a pathname to a file within the
>+ * same JAR file, relative filenames (i.e., those not
>+ * starting with "/") are considered relative to the root of
>+ * the JAR file's namespace. Absolute filenames (i.e., those
>+ * starting with "/") also specify names in the root of the
>+ * JAR file's namespace. In general, relative names are
>+ * preferred. The exception is .war files where absolute
>+ * names are preferred for consistency with the Servlet API.
>+ * 
>+ * 
>+ * 
>+ * 
>+ * $Id: web-common_3_0.xsd,v 1.4 2009/10/02 06:33:20 ccc Exp $
>+ * 
>+ * 
>+ * 
>+ * <![CDATA[[
>+ * This is the common XML Schema for the Servlet 3.0 deployment descriptor.
>+ * This file is in turn used by web.xml and web-fragment.xml
>+ * web application's war file. All Servlet deployment descriptors
>+ * must indicate the web common schema by using the Java EE
>+ * namespace:
>+ * 
>+ * http://java.sun.com/xml/ns/javaee 
>+ * 
>+ * and by indicating the version of the schema by 
>+ * using the version element as shown below: 
>+ * 
>+ * <web-app xmlns="http://java.sun.com/xml/ns/javaee"
>+ * xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>+ * xsi:schemaLocation="..."
>+ * version="3.0"> 
>+ * ...
>+ * </web-app>
>+ * 
>+ * The instance documents may indicate the published version of
>+ * the schema using the xsi:schemaLocation attribute for Java EE
>+ * namespace with the following location:
>+ * 
>+ * http://java.sun.com/xml/ns/javaee/web-common_3_0.xsd
>+ * 
>+ * ]]>
>+ * 
>+ * 
>+ * 
>+ * The following conventions apply to all Java EE
>+ * deployment descriptor elements unless indicated otherwise.
>+ * 
>+ * - In elements that specify a pathname to a file within the
>+ * same JAR file, relative filenames (i.e., those not
>+ * starting with "/") are considered relative to the root of
>+ * the JAR file's namespace. Absolute filenames (i.e., those
>+ * starting with "/") also specify names in the root of the
>+ * JAR file's namespace. In general, relative names are
>+ * preferred. The exception is .war files where absolute
>+ * names are preferred for consistency with the Servlet API.
>+ * 
>+ * 
>+ * 
>+ * 
>+ * $Id: javaee_6.xsd,v 1.3 2009/10/02 06:33:20 ccc Exp $
>+ * 
>+ * 
>+ * 
>+ * 
>+ * The following definitions that appear in the common
>+ * shareable schema(s) of Java EE deployment descriptors should be
>+ * interpreted with respect to the context they are included:
>+ * 
>+ * Deployment Component may indicate one of the following:
>+ * java ee application;
>+ * application client;
>+ * web application;
>+ * enterprise bean;
>+ * resource adapter; 
>+ * 
>+ * Deployment File may indicate one of the following:
>+ * ear file;
>+ * war file;
>+ * jar file;
>+ * rar file;
>+ * 
>+ * 
>+ * 
>+ * 
>+ * $Id: javaee_web_services_client_1_3.xsd,v 1.2 2009/09/29 20:31:42 ccc Exp $
>+ * 
>+ * 
>+ * 
>+ * 
>+ * (C) Copyright International Business Machines Corporation 2002
>+ * 
>+ * 
>+ * 
>+ * <div xmlns="http://www.w3.org/1999/xhtml">
>+ * <h1>About the XML namespace</h1>
>+ * 
>+ * <div class="bodytext">
>+ * 
>+ * This schema document describes the XML namespace, in a form
>+ * suitable for import by other schema documents.
>+ * 
>+ * 
>+ * See <a href="http://www.w3.org/XML/1998/namespace.html">
>+ * http://www.w3.org/XML/1998/namespace.html</a> and
>+ * <a href="http://www.w3.org/TR/REC-xml">
>+ * http://www.w3.org/TR/REC-xml</a> for information 
>+ * about this namespace.
>+ * 
>+ * 
>+ * Note that local names in this namespace are intended to be
>+ * defined only by the World Wide Web Consortium or its subgroups.
>+ * The names currently defined in this namespace are listed below.
>+ * They should not be used with conflicting semantics by any Working
>+ * Group, specification, or document instance.
>+ * 
>+ * 
>+ * See further below in this document for more information about <a href="#usage">how to refer to this schema document from your own
>+ * XSD schema documents</a> and about <a href="#nsversioning">the
>+ * namespace-versioning policy governing this schema document</a>.
>+ * 
>+ * </div>
>+ * </div>
>+ * 
>+ * 
>+ * <div xmlns="http://www.w3.org/1999/xhtml">
>+ * 
>+ * <h3>Father (in any context at all)</h3> 
>+ * 
>+ * <div class="bodytext">
>+ * 
>+ * denotes Jon Bosak, the chair of 
>+ * the original XML Working Group. This name is reserved by 
>+ * the following decision of the W3C XML Plenary and 
>+ * XML Coordination groups:
>+ * 
>+ * <blockquote>
>+ * 
>+ * 	In appreciation for his vision, leadership and
>+ * 	dedication the W3C XML Plenary on this 10th day of
>+ * 	February, 2000, reserves for Jon Bosak in perpetuity
>+ * 	the XML name "xml:Father".
>+ * 
>+ * </blockquote>
>+ * </div>
>+ * </div>
>+ * 
>+ * 
>+ * <div id="usage" xml:id="usage" xmlns="http://www.w3.org/1999/xhtml">
>+ * <h2>
>+ * <a name="usage">About this schema document</a>
>+ * </h2>
>+ * 
>+ * <div class="bodytext">
>+ * 
>+ * This schema defines attributes and an attribute group suitable
>+ * for use by schemas wishing to allow <code>xml:base</code>,
>+ * <code>xml:lang</code>, <code>xml:space</code> or
>+ * <code>xml:id</code> attributes on elements they define.
>+ * 
>+ * 
>+ * To enable this, such a schema must import this schema for
>+ * the XML namespace, e.g. as follows:
>+ * 
>+ * <pre>
>+ * &lt;schema . . .&gt;
>+ * . . .
>+ * &lt;import namespace="http://www.w3.org/XML/1998/namespace"
>+ * schemaLocation="http://www.w3.org/2001/xml.xsd"/&gt;
>+ * </pre>
>+ * 
>+ * or
>+ * 
>+ * <pre>
>+ * &lt;import namespace="http://www.w3.org/XML/1998/namespace"
>+ * schemaLocation="http://www.w3.org/2009/01/xml.xsd"/&gt;
>+ * </pre>
>+ * 
>+ * Subsequently, qualified reference to any of the attributes or the
>+ * group defined below will have the desired effect, e.g.
>+ * 
>+ * <pre>
>+ * &lt;type . . .&gt;
>+ * . . .
>+ * &lt;attributeGroup ref="xml:specialAttrs"/&gt;
>+ * </pre>
>+ * 
>+ * will define a type which will schema-validate an instance element
>+ * with any of those attributes.
>+ * 
>+ * </div>
>+ * </div>
>+ * 
>+ * 
>+ * <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>
>+ * <div class="bodytext">
>+ * 
>+ * In keeping with the XML Schema WG's standard versioning
>+ * policy, this schema document will persist at
>+ * <a href="http://www.w3.org/2009/01/xml.xsd">
>+ * http://www.w3.org/2009/01/xml.xsd</a>.
>+ * 
>+ * 
>+ * At the date of issue it can also be found at
>+ * <a href="http://www.w3.org/2001/xml.xsd">
>+ * http://www.w3.org/2001/xml.xsd</a>.
>+ * 
>+ * 
>+ * The schema document at that URI may however change in the future,
>+ * in order to remain compatible with the latest version of XML
>+ * Schema itself, or with the XML namespace itself. In other words,
>+ * if the XML Schema or XML namespaces change, the version of this
>+ * document at <a href="http://www.w3.org/2001/xml.xsd">
>+ * http://www.w3.org/2001/xml.xsd 
>+ * </a> 
>+ * will change accordingly; the version at 
>+ * <a href="http://www.w3.org/2009/01/xml.xsd">
>+ * http://www.w3.org/2009/01/xml.xsd 
>+ * </a> 
>+ * will not change.
>+ * 
>+ * 
>+ * Previous dated (and unchanging) versions of this schema 
>+ * document are at:
>+ * 
>+ * <ul>
>+ * <li>
>+ * <a href="http://www.w3.org/2009/01/xml.xsd">
>+ * 	http://www.w3.org/2009/01/xml.xsd</a>
>+ * </li>
>+ * <li>
>+ * <a href="http://www.w3.org/2007/08/xml.xsd">
>+ * 	http://www.w3.org/2007/08/xml.xsd</a>
>+ * </li>
>+ * <li>
>+ * <a href="http://www.w3.org/2004/10/xml.xsd">
>+ * 	http://www.w3.org/2004/10/xml.xsd</a>
>+ * </li>
>+ * <li>
>+ * <a href="http://www.w3.org/2001/03/xml.xsd">
>+ * 	http://www.w3.org/2001/03/xml.xsd</a>
>+ * </li>
>+ * </ul>
>+ * </div>
>+ * </div>
>+ * 
>+ * 
>+ * @(#)jsp_2_2.xsds	02/26/09
>+ * 
>+ * 
>+ * 
>+ * Copyright 2003-2009 Sun Microsystems, Inc.
>+ * 4150 Network Circle
>+ * Santa Clara, California 95054
>+ * U.S.A
>+ * All rights reserved.
>+ * 
>+ * Sun Microsystems, Inc. has intellectual property rights
>+ * relating to technology described in this document. In
>+ * particular, and without limitation, these intellectual
>+ * property rights may include one or more of the U.S. patents
>+ * listed at http://www.sun.com/patents and one or more
>+ * additional patents or pending patent applications in the
>+ * U.S. and other countries.
>+ * 
>+ * This document and the technology which it describes are
>+ * distributed under licenses restricting their use, copying,
>+ * distribution, and decompilation. No part of this document
>+ * may be reproduced in any form by any means without prior
>+ * written authorization of Sun and its licensors, if any.
>+ * 
>+ * Third-party software, including font technology, is
>+ * copyrighted and licensed from Sun suppliers.
>+ * 
>+ * Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
>+ * JavaServer Pages, Enterprise JavaBeans and the Java Coffee
>+ * Cup logo are trademarks or registered trademarks of Sun
>+ * Microsystems, Inc. in the U.S. and other countries.
>+ * 
>+ * Federal Acquisitions: Commercial Software - Government Users
>+ * Subject to Standard License Terms and Conditions.
>+ * 
>+ * 
>+ * 
>+ * 
>+ * This is the XML Schema for the JSP 2.2 deployment descriptor
>+ * types. The JSP 2.2 schema contains all the special
>+ * structures and datatypes that are necessary to use JSP files
>+ * from a web application.
>+ * 
>+ * The contents of this schema is used by the web-app_3_0.xsd
>+ * file to define JSP specific content.
>+ * 
>+ * 
>+ * 
>+ * 
>+ * The following conventions apply to all Java EE
>+ * deployment descriptor elements unless indicated otherwise.
>+ * 
>+ * - In elements that specify a pathname to a file within the
>+ * 	same JAR file, relative filenames (i.e., those not
>+ * 	starting with "/") are considered relative to the root of
>+ * 	the JAR file's namespace. Absolute filenames (i.e., those
>+ * 	starting with "/") also specify names in the root of the
>+ * 	JAR file's namespace. In general, relative names are
>+ * 	preferred. The exception is .war files where absolute
>+ * 	names are preferred for consistency with the Servlet API.
>+ * 
>+ * 
>+ * 
>+ * @see org.eclipse.jst.javaee.webapp.internal.metadata.WebappFactory
>+ * @generated
>+ */
>+public interface WebappPackage extends EPackage {
>+	/**
>+	 * The package name.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	String eNAME = "webapp"; //$NON-NLS-1$
>+
>+	/**
>+	 * The package namespace URI.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	String eNS_URI = "http://java.sun.com/xml/ns/javaee/webapp"; //$NON-NLS-1$
>+
>+	/**
>+	 * The package namespace name.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	String eNS_PREFIX = "webapp"; //$NON-NLS-1$
>+
>+	/**
>+	 * The singleton instance of the package.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	WebappPackage eINSTANCE = org.eclipse.jst.javaee.webapp.internal.impl.WebappPackageImpl.init();
>+
>+	/**
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.webapp.internal.impl.WebAppDeploymentDescriptorImpl Web App Deployment Descriptor}' class.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.jst.javaee.webapp.internal.impl.WebAppDeploymentDescriptorImpl
>+	 * @see org.eclipse.jst.javaee.webapp.internal.impl.WebappPackageImpl#getWebAppDeploymentDescriptor()
>+	 * @generated
>+	 */
>+	int WEB_APP_DEPLOYMENT_DESCRIPTOR = 0;
>+
>+	/**
>+	 * The feature id for the 'Mixed' attribute list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int WEB_APP_DEPLOYMENT_DESCRIPTOR__MIXED = 0;
>+
>+	/**
>+	 * The feature id for the 'XMLNS Prefix Map' map.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int WEB_APP_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP = 1;
>+
>+	/**
>+	 * The feature id for the 'XSI Schema Location' map.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int WEB_APP_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION = 2;
>+
>+	/**
>+	 * The feature id for the 'Web App' containment reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int WEB_APP_DEPLOYMENT_DESCRIPTOR__WEB_APP = 3;
>+
>+	/**
>+	 * The number of structural features of the 'Web App Deployment Descriptor' class.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int WEB_APP_DEPLOYMENT_DESCRIPTOR_FEATURE_COUNT = 4;
>+
>+
>+	/**
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.webapp.WebAppDeploymentDescriptor Web App Deployment Descriptor}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for class 'Web App Deployment Descriptor'.
>+	 * @see org.eclipse.jst.javaee.webapp.WebAppDeploymentDescriptor
>+	 * @generated
>+	 */
>+	EClass getWebAppDeploymentDescriptor();
>+
>+	/**
>+	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.webapp.WebAppDeploymentDescriptor#getMixed Mixed}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute list 'Mixed'.
>+	 * @see org.eclipse.jst.javaee.webapp.WebAppDeploymentDescriptor#getMixed()
>+	 * @see #getWebAppDeploymentDescriptor()
>+	 * @generated
>+	 */
>+	EAttribute getWebAppDeploymentDescriptor_Mixed();
>+
>+	/**
>+	 * Returns the meta object for the map '{@link org.eclipse.jst.javaee.webapp.WebAppDeploymentDescriptor#getXMLNSPrefixMap XMLNS Prefix Map}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the map 'XMLNS Prefix Map'.
>+	 * @see org.eclipse.jst.javaee.webapp.WebAppDeploymentDescriptor#getXMLNSPrefixMap()
>+	 * @see #getWebAppDeploymentDescriptor()
>+	 * @generated
>+	 */
>+	EReference getWebAppDeploymentDescriptor_XMLNSPrefixMap();
>+
>+	/**
>+	 * Returns the meta object for the map '{@link org.eclipse.jst.javaee.webapp.WebAppDeploymentDescriptor#getXSISchemaLocation XSI Schema Location}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the map 'XSI Schema Location'.
>+	 * @see org.eclipse.jst.javaee.webapp.WebAppDeploymentDescriptor#getXSISchemaLocation()
>+	 * @see #getWebAppDeploymentDescriptor()
>+	 * @generated
>+	 */
>+	EReference getWebAppDeploymentDescriptor_XSISchemaLocation();
>+
>+	/**
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.webapp.WebAppDeploymentDescriptor#getWebApp Web App}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference 'Web App'.
>+	 * @see org.eclipse.jst.javaee.webapp.WebAppDeploymentDescriptor#getWebApp()
>+	 * @see #getWebAppDeploymentDescriptor()
>+	 * @generated
>+	 */
>+	EReference getWebAppDeploymentDescriptor_WebApp();
>+
>+	/**
>+	 * Returns the factory that creates the instances of the model.
>+	 * 
>+	 * 
>+	 * @return the factory that creates the instances of the model.
>+	 * @generated
>+	 */
>+	WebappFactory getWebappFactory();
>+
>+	/**
>+	 * 
>+	 * Defines literals for the meta objects that represent
>+	 * <ul>
>+	 * <li>each class,</li>
>+	 * <li>each feature of each class,</li>
>+	 * <li>each enum,</li>
>+	 * <li>and each data type</li>
>+	 * </ul>
>+	 * 
>+	 * @generated
>+	 */
>+	interface Literals {
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.webapp.internal.impl.WebAppDeploymentDescriptorImpl Web App Deployment Descriptor}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.jst.javaee.webapp.internal.impl.WebAppDeploymentDescriptorImpl
>+		 * @see org.eclipse.jst.javaee.webapp.internal.impl.WebappPackageImpl#getWebAppDeploymentDescriptor()
>+		 * @generated
>+		 */
>+		EClass WEB_APP_DEPLOYMENT_DESCRIPTOR = eINSTANCE.getWebAppDeploymentDescriptor();
>+
>+		/**
>+		 * The meta object literal for the 'Mixed' attribute list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute WEB_APP_DEPLOYMENT_DESCRIPTOR__MIXED = eINSTANCE.getWebAppDeploymentDescriptor_Mixed();
>+
>+		/**
>+		 * The meta object literal for the 'XMLNS Prefix Map' map feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference WEB_APP_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP = eINSTANCE.getWebAppDeploymentDescriptor_XMLNSPrefixMap();
>+
>+		/**
>+		 * The meta object literal for the 'XSI Schema Location' map feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference WEB_APP_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION = eINSTANCE.getWebAppDeploymentDescriptor_XSISchemaLocation();
>+
>+		/**
>+		 * The meta object literal for the 'Web App' containment reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference WEB_APP_DEPLOYMENT_DESCRIPTOR__WEB_APP = eINSTANCE.getWebAppDeploymentDescriptor_WebApp();
>+
>+	}
>+
>+} //WebappPackage
>Index: jee-models/org/eclipse/jst/javaee/web/WebFragment.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/web/WebFragment.java
>diff -N jee-models/org/eclipse/jst/javaee/web/WebFragment.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/web/WebFragment.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,781 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.web;
>+
>+import java.util.List;
>+
>+import org.eclipse.emf.ecore.util.FeatureMap;
>+
>+import org.eclipse.jst.javaee.core.DataSourceType;
>+import org.eclipse.jst.javaee.core.Description;
>+import org.eclipse.jst.javaee.core.DisplayName;
>+import org.eclipse.jst.javaee.core.EjbLocalRef;
>+import org.eclipse.jst.javaee.core.EjbRef;
>+import org.eclipse.jst.javaee.core.EmptyType;
>+import org.eclipse.jst.javaee.core.EnvEntry;
>+import org.eclipse.jst.javaee.core.Icon;
>+import org.eclipse.jst.javaee.core.JavaEEObject;
>+import org.eclipse.jst.javaee.core.LifecycleCallback;
>+import org.eclipse.jst.javaee.core.Listener;
>+import org.eclipse.jst.javaee.core.MessageDestination;
>+import org.eclipse.jst.javaee.core.MessageDestinationRef;
>+import org.eclipse.jst.javaee.core.ParamValue;
>+import org.eclipse.jst.javaee.core.PersistenceContextRef;
>+import org.eclipse.jst.javaee.core.PersistenceUnitRef;
>+import org.eclipse.jst.javaee.core.ResourceEnvRef;
>+import org.eclipse.jst.javaee.core.ResourceRef;
>+import org.eclipse.jst.javaee.core.SecurityRole;
>+import org.eclipse.jst.javaee.core.ServiceRef;
>+
>+import org.eclipse.jst.javaee.jsp.JspConfig;
>+
>+/**
>+ * 
>+ * A representation of the model object 'Fragment'.
>+ * 
>+ *
>+ * 
>+ * 
>+ * @since Java EE 6, Web 3.0
>+ * 
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.web.WebFragment#getGroup Group}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.WebFragment#getDescriptions Descriptions}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.WebFragment#getDisplayNames Display Names}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.WebFragment#getIcons Icons}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.WebFragment#getName Name}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.WebFragment#getDistributables Distributables}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.WebFragment#getContextParams Context Params}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.WebFragment#getFilters Filters}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.WebFragment#getFilterMappings Filter Mappings}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.WebFragment#getListeners Listeners}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.WebFragment#getServlets Servlets}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.WebFragment#getServletMappings Servlet Mappings}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.WebFragment#getSessionConfigs Session Configs}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.WebFragment#getMimeMappings Mime Mappings}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.WebFragment#getWelcomeFileLists Welcome File Lists}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.WebFragment#getErrorPages Error Pages}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.WebFragment#getJspConfigs Jsp Configs}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.WebFragment#getSecurityConstraints Security Constraints}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.WebFragment#getLoginConfigs Login Configs}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.WebFragment#getSecurityRoles Security Roles}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.WebFragment#getEnvEntries Env Entries}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.WebFragment#getEjbRefs Ejb Refs}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.WebFragment#getEjbLocalRefs Ejb Local Refs}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.WebFragment#getServiceRefs Service Refs}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.WebFragment#getResourceRefs Resource Refs}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.WebFragment#getResourceEnvRefs Resource Env Refs}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.WebFragment#getMessageDestinationRefs Message Destination Refs}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.WebFragment#getPersistenceContextRefs Persistence Context Refs}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.WebFragment#getPersistenceUnitRefs Persistence Unit Refs}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.WebFragment#getPostConstructs Post Constructs}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.WebFragment#getPreDestroys Pre Destroys}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.WebFragment#getDataSource Data Source}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.WebFragment#getMessageDestinations Message Destinations}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.WebFragment#getLocalEncodingMappingsLists Local Encoding Mappings Lists}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.WebFragment#getOrdering Ordering}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.WebFragment#getId Id}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.WebFragment#isMetadataComplete Metadata Complete}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.WebFragment#getVersion Version}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebFragment()
>+ * @extends JavaEEObject
>+ * @generated
>+ */
>+public interface WebFragment extends JavaEEObject {
>+	/**
>+	 * Returns the value of the 'Group' attribute list.
>+	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Group' attribute list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Group' attribute list.
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebFragment_Group()
>+	 * @generated
>+	 */
>+	FeatureMap getGroup();
>+
>+	/**
>+	 * Returns the value of the 'Descriptions' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Descriptions' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Descriptions' containment reference list.
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebFragment_Descriptions()
>+	 * @generated
>+	 */
>+	List<Description> getDescriptions();
>+
>+	/**
>+	 * Returns the value of the 'Display Names' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.DisplayName}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Display Names' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Display Names' containment reference list.
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebFragment_DisplayNames()
>+	 * @generated
>+	 */
>+	List<DisplayName> getDisplayNames();
>+
>+	/**
>+	 * Returns the value of the 'Icons' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Icon}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Icons' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Icons' containment reference list.
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebFragment_Icons()
>+	 * @generated
>+	 */
>+	List<Icon> getIcons();
>+
>+	/**
>+	 * Returns the value of the 'Name' attribute list.
>+	 * The list contents are of type {@link java.lang.String}.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * @since Java EE 6, Web 3.0
>+	 * 
>+	 * 
>+	 * @return the value of the 'Name' attribute list.
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebFragment_Name()
>+	 * @generated
>+	 */
>+	List<String> getName();
>+
>+	/**
>+	 * Returns the value of the 'Distributables' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.EmptyType}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Distributables' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Distributables' containment reference list.
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebFragment_Distributables()
>+	 * @generated
>+	 */
>+	List<EmptyType> getDistributables();
>+
>+	/**
>+	 * Returns the value of the 'Context Params' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.ParamValue}.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * The context-param element contains the declaration
>+	 * of a web application's servlet context
>+	 * initialization parameters.
>+	 * 
>+	 * @since Java EE 5, Web 2.5
>+	 * 
>+	 * 
>+	 * @return the value of the 'Context Params' containment reference list.
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebFragment_ContextParams()
>+	 * @generated
>+	 */
>+	List<ParamValue> getContextParams();
>+
>+	/**
>+	 * Returns the value of the 'Filters' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.web.Filter}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Filters' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Filters' containment reference list.
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebFragment_Filters()
>+	 * @generated
>+	 */
>+	List<Filter> getFilters();
>+
>+	/**
>+	 * Returns the value of the 'Filter Mappings' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.web.FilterMapping}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Filter Mappings' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Filter Mappings' containment reference list.
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebFragment_FilterMappings()
>+	 * @generated
>+	 */
>+	List<FilterMapping> getFilterMappings();
>+
>+	/**
>+	 * Returns the value of the 'Listeners' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Listener}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Listeners' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Listeners' containment reference list.
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebFragment_Listeners()
>+	 * @generated
>+	 */
>+	List<Listener> getListeners();
>+
>+	/**
>+	 * Returns the value of the 'Servlets' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.web.Servlet}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Servlets' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Servlets' containment reference list.
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebFragment_Servlets()
>+	 * @generated
>+	 */
>+	List<Servlet> getServlets();
>+
>+	/**
>+	 * Returns the value of the 'Servlet Mappings' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.web.ServletMapping}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Servlet Mappings' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Servlet Mappings' containment reference list.
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebFragment_ServletMappings()
>+	 * @generated
>+	 */
>+	List<ServletMapping> getServletMappings();
>+
>+	/**
>+	 * Returns the value of the 'Session Configs' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.web.SessionConfig}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Session Configs' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Session Configs' containment reference list.
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebFragment_SessionConfigs()
>+	 * @generated
>+	 */
>+	List<SessionConfig> getSessionConfigs();
>+
>+	/**
>+	 * Returns the value of the 'Mime Mappings' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.web.MimeMapping}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Mime Mappings' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Mime Mappings' containment reference list.
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebFragment_MimeMappings()
>+	 * @generated
>+	 */
>+	List<MimeMapping> getMimeMappings();
>+
>+	/**
>+	 * Returns the value of the 'Welcome File Lists' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.web.WelcomeFileList}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Welcome File Lists' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Welcome File Lists' containment reference list.
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebFragment_WelcomeFileLists()
>+	 * @generated
>+	 */
>+	List<WelcomeFileList> getWelcomeFileLists();
>+
>+	/**
>+	 * Returns the value of the 'Error Pages' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.web.ErrorPage}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Error Pages' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Error Pages' containment reference list.
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebFragment_ErrorPages()
>+	 * @generated
>+	 */
>+	List<ErrorPage> getErrorPages();
>+
>+	/**
>+	 * Returns the value of the 'Jsp Configs' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.jsp.JspConfig}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Jsp Configs' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Jsp Configs' containment reference list.
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebFragment_JspConfigs()
>+	 * @generated
>+	 */
>+	List<JspConfig> getJspConfigs();
>+
>+	/**
>+	 * Returns the value of the 'Security Constraints' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.web.SecurityConstraint}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Security Constraints' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Security Constraints' containment reference list.
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebFragment_SecurityConstraints()
>+	 * @generated
>+	 */
>+	List<SecurityConstraint> getSecurityConstraints();
>+
>+	/**
>+	 * Returns the value of the 'Login Configs' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.web.LoginConfig}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Login Configs' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Login Configs' containment reference list.
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebFragment_LoginConfigs()
>+	 * @generated
>+	 */
>+	List<LoginConfig> getLoginConfigs();
>+
>+	/**
>+	 * Returns the value of the 'Security Roles' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.SecurityRole}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Security Roles' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Security Roles' containment reference list.
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebFragment_SecurityRoles()
>+	 * @generated
>+	 */
>+	List<SecurityRole> getSecurityRoles();
>+
>+	/**
>+	 * Returns the value of the 'Env Entries' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.EnvEntry}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Env Entries' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Env Entries' containment reference list.
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebFragment_EnvEntries()
>+	 * @generated
>+	 */
>+	List<EnvEntry> getEnvEntries();
>+
>+	/**
>+	 * Returns the value of the 'Ejb Refs' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.EjbRef}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Ejb Refs' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Ejb Refs' containment reference list.
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebFragment_EjbRefs()
>+	 * @generated
>+	 */
>+	List<EjbRef> getEjbRefs();
>+
>+	/**
>+	 * Returns the value of the 'Ejb Local Refs' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.EjbLocalRef}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Ejb Local Refs' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Ejb Local Refs' containment reference list.
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebFragment_EjbLocalRefs()
>+	 * @generated
>+	 */
>+	List<EjbLocalRef> getEjbLocalRefs();
>+
>+	/**
>+	 * Returns the value of the 'Service Refs' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.ServiceRef}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Service Refs' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Service Refs' containment reference list.
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebFragment_ServiceRefs()
>+	 * @generated
>+	 */
>+	List<ServiceRef> getServiceRefs();
>+
>+	/**
>+	 * Returns the value of the 'Resource Refs' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.ResourceRef}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Resource Refs' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Resource Refs' containment reference list.
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebFragment_ResourceRefs()
>+	 * @generated
>+	 */
>+	List<ResourceRef> getResourceRefs();
>+
>+	/**
>+	 * Returns the value of the 'Resource Env Refs' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.ResourceEnvRef}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Resource Env Refs' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Resource Env Refs' containment reference list.
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebFragment_ResourceEnvRefs()
>+	 * @generated
>+	 */
>+	List<ResourceEnvRef> getResourceEnvRefs();
>+
>+	/**
>+	 * Returns the value of the 'Message Destination Refs' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.MessageDestinationRef}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Message Destination Refs' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Message Destination Refs' containment reference list.
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebFragment_MessageDestinationRefs()
>+	 * @generated
>+	 */
>+	List<MessageDestinationRef> getMessageDestinationRefs();
>+
>+	/**
>+	 * Returns the value of the 'Persistence Context Refs' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.PersistenceContextRef}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Persistence Context Refs' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Persistence Context Refs' containment reference list.
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebFragment_PersistenceContextRefs()
>+	 * @generated
>+	 */
>+	List<PersistenceContextRef> getPersistenceContextRefs();
>+
>+	/**
>+	 * Returns the value of the 'Persistence Unit Refs' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.PersistenceUnitRef}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Persistence Unit Refs' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Persistence Unit Refs' containment reference list.
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebFragment_PersistenceUnitRefs()
>+	 * @generated
>+	 */
>+	List<PersistenceUnitRef> getPersistenceUnitRefs();
>+
>+	/**
>+	 * Returns the value of the 'Post Constructs' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.LifecycleCallback}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Post Constructs' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Post Constructs' containment reference list.
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebFragment_PostConstructs()
>+	 * @generated
>+	 */
>+	List<LifecycleCallback> getPostConstructs();
>+
>+	/**
>+	 * Returns the value of the 'Pre Destroys' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.LifecycleCallback}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Pre Destroys' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Pre Destroys' containment reference list.
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebFragment_PreDestroys()
>+	 * @generated
>+	 */
>+	List<LifecycleCallback> getPreDestroys();
>+
>+	/**
>+	 * Returns the value of the 'Data Source' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.DataSourceType}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Data Source' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Data Source' containment reference list.
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebFragment_DataSource()
>+	 * @generated
>+	 */
>+	List<DataSourceType> getDataSource();
>+
>+	/**
>+	 * Returns the value of the 'Message Destinations' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.MessageDestination}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Message Destinations' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Message Destinations' containment reference list.
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebFragment_MessageDestinations()
>+	 * @generated
>+	 */
>+	List<MessageDestination> getMessageDestinations();
>+
>+	/**
>+	 * Returns the value of the 'Local Encoding Mappings Lists' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.web.LocaleEncodingMappingList}.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * @since Java EE 6, Web 3.0
>+	 * 
>+	 * 
>+	 * @return the value of the 'Local Encoding Mappings Lists' containment reference list.
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebFragment_LocalEncodingMappingsLists()
>+	 * @generated
>+	 */
>+	List<LocaleEncodingMappingList> getLocalEncodingMappingsLists();
>+
>+	/**
>+	 * Returns the value of the 'Ordering' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.web.OrderingType}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Ordering' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Ordering' containment reference list.
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebFragment_Ordering()
>+	 * @generated
>+	 */
>+	List<OrderingType> getOrdering();
>+
>+	/**
>+	 * Returns the value of the 'Id' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Id' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Id' attribute.
>+	 * @see #setId(String)
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebFragment_Id()
>+	 * @generated
>+	 */
>+	String getId();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.WebFragment#getId Id}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Id' attribute.
>+	 * @see #getId()
>+	 * @generated
>+	 */
>+	void setId(String value);
>+
>+	/**
>+	 * Returns the value of the 'Metadata Complete' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * The metadata-complete attribute defines whether this
>+	 * deployment descriptor and other related deployment
>+	 * descriptors for this module (e.g., web service
>+	 * descriptors) are complete, or whether the class
>+	 * files available to this module and packaged with
>+	 * this application should be examined for annotations
>+	 * that specify deployment information.
>+	 * 
>+	 * If metadata-complete is set to "true", the deployment
>+	 * tool must ignore any annotations that specify deployment
>+	 * information, which might be present in the class files
>+	 * of the application.
>+	 * 
>+	 * If metadata-complete is not specified or is set to
>+	 * "false", the deployment tool must examine the class
>+	 * files of the application for annotations, as
>+	 * specified by the specifications.
>+	 * 
>+	 * @since Java EE 5, Web 2.5
>+	 * 
>+	 * 
>+	 * @return the value of the 'Metadata Complete' attribute.
>+	 * @see #isSetMetadataComplete()
>+	 * @see #unsetMetadataComplete()
>+	 * @see #setMetadataComplete(boolean)
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebFragment_MetadataComplete()
>+	 * @generated
>+	 */
>+	boolean isMetadataComplete();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.WebFragment#isMetadataComplete Metadata Complete}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Metadata Complete' attribute.
>+	 * @see #isSetMetadataComplete()
>+	 * @see #unsetMetadataComplete()
>+	 * @see #isMetadataComplete()
>+	 * @generated
>+	 */
>+	void setMetadataComplete(boolean value);
>+
>+	/**
>+	 * Unsets the value of the '{@link org.eclipse.jst.javaee.web.WebFragment#isMetadataComplete Metadata Complete}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isSetMetadataComplete()
>+	 * @see #isMetadataComplete()
>+	 * @see #setMetadataComplete(boolean)
>+	 * @generated
>+	 */
>+	void unsetMetadataComplete();
>+
>+	/**
>+	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.web.WebFragment#isMetadataComplete Metadata Complete}' attribute is set.
>+	 * 
>+	 * 
>+	 * @return whether the value of the 'Metadata Complete' attribute is set.
>+	 * @see #unsetMetadataComplete()
>+	 * @see #isMetadataComplete()
>+	 * @see #setMetadataComplete(boolean)
>+	 * @generated
>+	 */
>+	boolean isSetMetadataComplete();
>+
>+	/**
>+	 * Returns the value of the 'Version' attribute.
>+	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.web.WebAppVersionType}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Version' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Version' attribute.
>+	 * @see org.eclipse.jst.javaee.web.WebAppVersionType
>+	 * @see #isSetVersion()
>+	 * @see #unsetVersion()
>+	 * @see #setVersion(WebAppVersionType)
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebFragment_Version()
>+	 * @generated
>+	 */
>+	WebAppVersionType getVersion();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.WebFragment#getVersion Version}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Version' attribute.
>+	 * @see org.eclipse.jst.javaee.web.WebAppVersionType
>+	 * @see #isSetVersion()
>+	 * @see #unsetVersion()
>+	 * @see #getVersion()
>+	 * @generated
>+	 */
>+	void setVersion(WebAppVersionType value);
>+
>+	/**
>+	 * Unsets the value of the '{@link org.eclipse.jst.javaee.web.WebFragment#getVersion Version}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isSetVersion()
>+	 * @see #getVersion()
>+	 * @see #setVersion(WebAppVersionType)
>+	 * @generated
>+	 */
>+	void unsetVersion();
>+
>+	/**
>+	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.web.WebFragment#getVersion Version}' attribute is set.
>+	 * 
>+	 * 
>+	 * @return whether the value of the 'Version' attribute is set.
>+	 * @see #unsetVersion()
>+	 * @see #getVersion()
>+	 * @see #setVersion(WebAppVersionType)
>+	 * @generated
>+	 */
>+	boolean isSetVersion();
>+
>+} // WebFragment
>Index: jee-models/org/eclipse/jst/javaee/web/internal/impl/OrderingTypeImpl.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/web/internal/impl/OrderingTypeImpl.java
>diff -N jee-models/org/eclipse/jst/javaee/web/internal/impl/OrderingTypeImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/web/internal/impl/OrderingTypeImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,247 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.web.internal.impl;
>+
>+import org.eclipse.emf.common.notify.Notification;
>+import org.eclipse.emf.common.notify.NotificationChain;
>+
>+import org.eclipse.emf.ecore.EClass;
>+import org.eclipse.emf.ecore.InternalEObject;
>+
>+import org.eclipse.emf.ecore.impl.ENotificationImpl;
>+import org.eclipse.emf.ecore.impl.EObjectImpl;
>+
>+import org.eclipse.jst.javaee.web.OrderingOrderingType;
>+import org.eclipse.jst.javaee.web.OrderingType;
>+
>+import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Ordering Type'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.OrderingTypeImpl#getAfter After}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.OrderingTypeImpl#getBefore Before}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class OrderingTypeImpl extends EObjectImpl implements OrderingType {
>+	/**
>+	 * The cached value of the '{@link #getAfter() After}' containment reference.
>+	 * 
>+	 * 
>+	 * @see #getAfter()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected OrderingOrderingType after;
>+
>+	/**
>+	 * The cached value of the '{@link #getBefore() Before}' containment reference.
>+	 * 
>+	 * 
>+	 * @see #getBefore()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected OrderingOrderingType before;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected OrderingTypeImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return WebPackage.Literals.ORDERING_TYPE;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public OrderingOrderingType getAfter() {
>+		return after;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public NotificationChain basicSetAfter(OrderingOrderingType newAfter, NotificationChain msgs) {
>+		OrderingOrderingType oldAfter = after;
>+		after = newAfter;
>+		if (eNotificationRequired()) {
>+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WebPackage.ORDERING_TYPE__AFTER, oldAfter, newAfter);
>+			if (msgs == null) msgs = notification; else msgs.add(notification);
>+		}
>+		return msgs;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setAfter(OrderingOrderingType newAfter) {
>+		if (newAfter != after) {
>+			NotificationChain msgs = null;
>+			if (after != null)
>+				msgs = ((InternalEObject)after).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WebPackage.ORDERING_TYPE__AFTER, null, msgs);
>+			if (newAfter != null)
>+				msgs = ((InternalEObject)newAfter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WebPackage.ORDERING_TYPE__AFTER, null, msgs);
>+			msgs = basicSetAfter(newAfter, msgs);
>+			if (msgs != null) msgs.dispatch();
>+		}
>+		else if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.ORDERING_TYPE__AFTER, newAfter, newAfter));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public OrderingOrderingType getBefore() {
>+		return before;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public NotificationChain basicSetBefore(OrderingOrderingType newBefore, NotificationChain msgs) {
>+		OrderingOrderingType oldBefore = before;
>+		before = newBefore;
>+		if (eNotificationRequired()) {
>+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WebPackage.ORDERING_TYPE__BEFORE, oldBefore, newBefore);
>+			if (msgs == null) msgs = notification; else msgs.add(notification);
>+		}
>+		return msgs;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setBefore(OrderingOrderingType newBefore) {
>+		if (newBefore != before) {
>+			NotificationChain msgs = null;
>+			if (before != null)
>+				msgs = ((InternalEObject)before).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WebPackage.ORDERING_TYPE__BEFORE, null, msgs);
>+			if (newBefore != null)
>+				msgs = ((InternalEObject)newBefore).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WebPackage.ORDERING_TYPE__BEFORE, null, msgs);
>+			msgs = basicSetBefore(newBefore, msgs);
>+			if (msgs != null) msgs.dispatch();
>+		}
>+		else if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.ORDERING_TYPE__BEFORE, newBefore, newBefore));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
>+		switch (featureID) {
>+			case WebPackage.ORDERING_TYPE__AFTER:
>+				return basicSetAfter(null, msgs);
>+			case WebPackage.ORDERING_TYPE__BEFORE:
>+				return basicSetBefore(null, msgs);
>+		}
>+		return super.eInverseRemove(otherEnd, featureID, msgs);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case WebPackage.ORDERING_TYPE__AFTER:
>+				return getAfter();
>+			case WebPackage.ORDERING_TYPE__BEFORE:
>+				return getBefore();
>+		}
>+		return super.eGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case WebPackage.ORDERING_TYPE__AFTER:
>+				setAfter((OrderingOrderingType)newValue);
>+				return;
>+			case WebPackage.ORDERING_TYPE__BEFORE:
>+				setBefore((OrderingOrderingType)newValue);
>+				return;
>+		}
>+		super.eSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case WebPackage.ORDERING_TYPE__AFTER:
>+				setAfter((OrderingOrderingType)null);
>+				return;
>+			case WebPackage.ORDERING_TYPE__BEFORE:
>+				setBefore((OrderingOrderingType)null);
>+				return;
>+		}
>+		super.eUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case WebPackage.ORDERING_TYPE__AFTER:
>+				return after != null;
>+			case WebPackage.ORDERING_TYPE__BEFORE:
>+				return before != null;
>+		}
>+		return super.eIsSet(featureID);
>+	}
>+
>+} //OrderingTypeImpl
>Index: jee-models/org/eclipse/jst/javaee/web/CookieNameType.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/web/CookieNameType.java
>diff -N jee-models/org/eclipse/jst/javaee/web/CookieNameType.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/web/CookieNameType.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,66 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.web;
>+
>+import org.eclipse.jst.javaee.core.JavaEEObject;
>+
>+/**
>+ * 
>+ * A representation of the model object 'Cookie Name Type'.
>+ * 
>+ *
>+ * 
>+ * 
>+ * 
>+ * The name that will be assigned to any session tracking
>+ * cookies created by this web application.
>+ * The default is JSESSIONID
>+ * 
>+ * Used in: cookie-config
>+ * 
>+ * @since Java EE 6, Web 3.0
>+ * 
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.web.CookieNameType#getValue Value}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getCookieNameType()
>+ * @extends JavaEEObject
>+ * @generated
>+ */
>+public interface CookieNameType extends JavaEEObject {
>+	/**
>+	 * Returns the value of the 'Value' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Value' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Value' attribute.
>+	 * @see #setValue(String)
>+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getCookieNameType_Value()
>+	 * @generated
>+	 */
>+	String getValue();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.CookieNameType#getValue Value}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Value' attribute.
>+	 * @see #getValue()
>+	 * @generated
>+	 */
>+	void setValue(String value);
>+
>+} // CookieNameType
>Index: jee-models/org/eclipse/jst/javaee/webapp/internal/util/WebappAdapterFactory.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/webapp/internal/util/WebappAdapterFactory.java
>diff -N jee-models/org/eclipse/jst/javaee/webapp/internal/util/WebappAdapterFactory.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/webapp/internal/util/WebappAdapterFactory.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,126 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.webapp.internal.util;
>+
>+import org.eclipse.emf.common.notify.Adapter;
>+import org.eclipse.emf.common.notify.Notifier;
>+
>+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
>+
>+import org.eclipse.emf.ecore.EObject;
>+
>+import org.eclipse.jst.javaee.webapp.*;
>+
>+import org.eclipse.jst.javaee.webapp.internal.metadata.WebappPackage;
>+
>+/**
>+ * 
>+ * The Adapter Factory for the model.
>+ * It provides an adapter <code>createXXX</code> method for each class of the model.
>+ * 
>+ * @see org.eclipse.jst.javaee.webapp.internal.metadata.WebappPackage
>+ * @generated
>+ */
>+public class WebappAdapterFactory extends AdapterFactoryImpl {
>+	/**
>+	 * The cached model package.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected static WebappPackage modelPackage;
>+
>+	/**
>+	 * Creates an instance of the adapter factory.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public WebappAdapterFactory() {
>+		if (modelPackage == null) {
>+			modelPackage = WebappPackage.eINSTANCE;
>+		}
>+	}
>+
>+	/**
>+	 * Returns whether this factory is applicable for the type of the object.
>+	 * 
>+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
>+	 * 
>+	 * @return whether this factory is applicable for the type of the object.
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean isFactoryForType(Object object) {
>+		if (object == modelPackage) {
>+			return true;
>+		}
>+		if (object instanceof EObject) {
>+			return ((EObject)object).eClass().getEPackage() == modelPackage;
>+		}
>+		return false;
>+	}
>+
>+	/**
>+	 * The switch that delegates to the <code>createXXX</code> methods.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected WebappSwitch<Adapter> modelSwitch =
>+		new WebappSwitch<Adapter>() {
>+			@Override
>+			public Adapter caseWebAppDeploymentDescriptor(WebAppDeploymentDescriptor object) {
>+				return createWebAppDeploymentDescriptorAdapter();
>+			}
>+			@Override
>+			public Adapter defaultCase(EObject object) {
>+				return createEObjectAdapter();
>+			}
>+		};
>+
>+	/**
>+	 * Creates an adapter for the <code>target</code>.
>+	 * 
>+	 * 
>+	 * @param target the object to adapt.
>+	 * @return the adapter for the <code>target</code>.
>+	 * @generated
>+	 */
>+	@Override
>+	public Adapter createAdapter(Notifier target) {
>+		return modelSwitch.doSwitch((EObject)target);
>+	}
>+
>+
>+	/**
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.webapp.WebAppDeploymentDescriptor Web App Deployment Descriptor}'.
>+	 * 
>+	 * This default implementation returns null so that we can easily ignore cases;
>+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
>+	 * 
>+	 * @return the new adapter.
>+	 * @see org.eclipse.jst.javaee.webapp.WebAppDeploymentDescriptor
>+	 * @generated
>+	 */
>+	public Adapter createWebAppDeploymentDescriptorAdapter() {
>+		return null;
>+	}
>+
>+	/**
>+	 * Creates a new adapter for the default case.
>+	 * 
>+	 * This default implementation returns null.
>+	 * 
>+	 * @return the new adapter.
>+	 * @generated
>+	 */
>+	public Adapter createEObjectAdapter() {
>+		return null;
>+	}
>+
>+} //WebappAdapterFactory
>Index: jee-models/org/eclipse/jst/javaee/webapp/internal/util/WebappXMLProcessor.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/webapp/internal/util/WebappXMLProcessor.java
>diff -N jee-models/org/eclipse/jst/javaee/webapp/internal/util/WebappXMLProcessor.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/webapp/internal/util/WebappXMLProcessor.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,54 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.webapp.internal.util;
>+
>+import java.util.Map;
>+
>+import org.eclipse.emf.ecore.EPackage;
>+
>+import org.eclipse.emf.ecore.resource.Resource;
>+
>+import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
>+
>+import org.eclipse.jst.javaee.webapp.internal.metadata.WebappPackage;
>+
>+/**
>+ * This class contains helper methods to serialize and deserialize XML documents
>+ * 
>+ * 
>+ * @generated
>+ */
>+public class WebappXMLProcessor extends XMLProcessor {
>+
>+	/**
>+	 * Public constructor to instantiate the helper.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public WebappXMLProcessor() {
>+		super((EPackage.Registry.INSTANCE));
>+		WebappPackage.eINSTANCE.eClass();
>+	}
>+	
>+	/**
>+	 * Register for "*" and "xml" file extensions the WebappResourceFactoryImpl factory.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected Map<String, Resource.Factory> getRegistrations() {
>+		if (registrations == null) {
>+			super.getRegistrations();
>+			registrations.put(XML_EXTENSION, new WebappResourceFactoryImpl());
>+			registrations.put(STAR_EXTENSION, new WebappResourceFactoryImpl());
>+		}
>+		return registrations;
>+	}
>+
>+} //WebappXMLProcessor
>Index: jee-models/org/eclipse/jst/javaee/webapp/internal/impl/WebAppDeploymentDescriptorImpl.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/webapp/internal/impl/WebAppDeploymentDescriptorImpl.java
>diff -N jee-models/org/eclipse/jst/javaee/webapp/internal/impl/WebAppDeploymentDescriptorImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/webapp/internal/impl/WebAppDeploymentDescriptorImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,290 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.webapp.internal.impl;
>+
>+import java.util.Map;
>+
>+import org.eclipse.emf.common.notify.NotificationChain;
>+
>+import org.eclipse.emf.common.util.EMap;
>+
>+import org.eclipse.emf.ecore.EClass;
>+import org.eclipse.emf.ecore.EStructuralFeature;
>+import org.eclipse.emf.ecore.EcorePackage;
>+import org.eclipse.emf.ecore.InternalEObject;
>+
>+import org.eclipse.emf.ecore.impl.EObjectImpl;
>+import org.eclipse.emf.ecore.impl.EStringToStringMapEntryImpl;
>+
>+import org.eclipse.emf.ecore.util.BasicFeatureMap;
>+import org.eclipse.emf.ecore.util.EcoreEMap;
>+import org.eclipse.emf.ecore.util.FeatureMap;
>+import org.eclipse.emf.ecore.util.InternalEList;
>+
>+import org.eclipse.jst.javaee.web.WebApp;
>+
>+import org.eclipse.jst.javaee.webapp.WebAppDeploymentDescriptor;
>+
>+import org.eclipse.jst.javaee.webapp.internal.metadata.WebappPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Web App Deployment Descriptor'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.webapp.internal.impl.WebAppDeploymentDescriptorImpl#getMixed Mixed}</li>
>+ * <li>{@link org.eclipse.jst.javaee.webapp.internal.impl.WebAppDeploymentDescriptorImpl#getXMLNSPrefixMap XMLNS Prefix Map}</li>
>+ * <li>{@link org.eclipse.jst.javaee.webapp.internal.impl.WebAppDeploymentDescriptorImpl#getXSISchemaLocation XSI Schema Location}</li>
>+ * <li>{@link org.eclipse.jst.javaee.webapp.internal.impl.WebAppDeploymentDescriptorImpl#getWebApp Web App}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class WebAppDeploymentDescriptorImpl extends EObjectImpl implements WebAppDeploymentDescriptor {
>+	/**
>+	 * The cached value of the '{@link #getMixed() Mixed}' attribute list.
>+	 * 
>+	 * 
>+	 * @see #getMixed()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected FeatureMap mixed;
>+
>+	/**
>+	 * The cached value of the '{@link #getXMLNSPrefixMap() XMLNS Prefix Map}' map.
>+	 * 
>+	 * 
>+	 * @see #getXMLNSPrefixMap()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EMap<String, String> xMLNSPrefixMap;
>+
>+	/**
>+	 * The cached value of the '{@link #getXSISchemaLocation() XSI Schema Location}' map.
>+	 * 
>+	 * 
>+	 * @see #getXSISchemaLocation()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EMap<String, String> xSISchemaLocation;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected WebAppDeploymentDescriptorImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return WebappPackage.Literals.WEB_APP_DEPLOYMENT_DESCRIPTOR;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public FeatureMap getMixed() {
>+		if (mixed == null) {
>+			mixed = new BasicFeatureMap(this, WebappPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__MIXED);
>+		}
>+		return mixed;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public Map<String, String> getXMLNSPrefixMap() {
>+		if (xMLNSPrefixMap == null) {
>+			xMLNSPrefixMap = new EcoreEMap<String,String>(EcorePackage.Literals.ESTRING_TO_STRING_MAP_ENTRY, EStringToStringMapEntryImpl.class, this, WebappPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP);
>+		}
>+		return xMLNSPrefixMap.map();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public Map<String, String> getXSISchemaLocation() {
>+		if (xSISchemaLocation == null) {
>+			xSISchemaLocation = new EcoreEMap<String,String>(EcorePackage.Literals.ESTRING_TO_STRING_MAP_ENTRY, EStringToStringMapEntryImpl.class, this, WebappPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION);
>+		}
>+		return xSISchemaLocation.map();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public WebApp getWebApp() {
>+		return (WebApp)getMixed().get(WebappPackage.Literals.WEB_APP_DEPLOYMENT_DESCRIPTOR__WEB_APP, true);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public NotificationChain basicSetWebApp(WebApp newWebApp, NotificationChain msgs) {
>+		return ((FeatureMap.Internal)getMixed()).basicAdd(WebappPackage.Literals.WEB_APP_DEPLOYMENT_DESCRIPTOR__WEB_APP, newWebApp, msgs);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setWebApp(WebApp newWebApp) {
>+		((FeatureMap.Internal)getMixed()).set(WebappPackage.Literals.WEB_APP_DEPLOYMENT_DESCRIPTOR__WEB_APP, newWebApp);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
>+		switch (featureID) {
>+			case WebappPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__MIXED:
>+				return ((InternalEList<?>)getMixed()).basicRemove(otherEnd, msgs);
>+			case WebappPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP:
>+				return ((InternalEList<?>)((EMap.InternalMapView<String, String>)getXMLNSPrefixMap()).eMap()).basicRemove(otherEnd, msgs);
>+			case WebappPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION:
>+				return ((InternalEList<?>)((EMap.InternalMapView<String, String>)getXSISchemaLocation()).eMap()).basicRemove(otherEnd, msgs);
>+			case WebappPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__WEB_APP:
>+				return basicSetWebApp(null, msgs);
>+		}
>+		return super.eInverseRemove(otherEnd, featureID, msgs);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case WebappPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__MIXED:
>+				if (coreType) return getMixed();
>+				return ((FeatureMap.Internal)getMixed()).getWrapper();
>+			case WebappPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP:
>+				if (coreType) return ((EMap.InternalMapView<String, String>)getXMLNSPrefixMap()).eMap();
>+				else return getXMLNSPrefixMap();
>+			case WebappPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION:
>+				if (coreType) return ((EMap.InternalMapView<String, String>)getXSISchemaLocation()).eMap();
>+				else return getXSISchemaLocation();
>+			case WebappPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__WEB_APP:
>+				return getWebApp();
>+		}
>+		return super.eGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case WebappPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__MIXED:
>+				((FeatureMap.Internal)getMixed()).set(newValue);
>+				return;
>+			case WebappPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP:
>+				((EStructuralFeature.Setting)((EMap.InternalMapView<String, String>)getXMLNSPrefixMap()).eMap()).set(newValue);
>+				return;
>+			case WebappPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION:
>+				((EStructuralFeature.Setting)((EMap.InternalMapView<String, String>)getXSISchemaLocation()).eMap()).set(newValue);
>+				return;
>+			case WebappPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__WEB_APP:
>+				setWebApp((WebApp)newValue);
>+				return;
>+		}
>+		super.eSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case WebappPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__MIXED:
>+				getMixed().clear();
>+				return;
>+			case WebappPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP:
>+				getXMLNSPrefixMap().clear();
>+				return;
>+			case WebappPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION:
>+				getXSISchemaLocation().clear();
>+				return;
>+			case WebappPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__WEB_APP:
>+				setWebApp((WebApp)null);
>+				return;
>+		}
>+		super.eUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case WebappPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__MIXED:
>+				return mixed != null && !mixed.isEmpty();
>+			case WebappPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP:
>+				return xMLNSPrefixMap != null && !xMLNSPrefixMap.isEmpty();
>+			case WebappPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION:
>+				return xSISchemaLocation != null && !xSISchemaLocation.isEmpty();
>+			case WebappPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__WEB_APP:
>+				return getWebApp() != null;
>+		}
>+		return super.eIsSet(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		if (eIsProxy()) return super.toString();
>+
>+		StringBuffer result = new StringBuffer(super.toString());
>+		result.append(" (mixed: "); //$NON-NLS-1$
>+		result.append(mixed);
>+		result.append(')');
>+		return result.toString();
>+	}
>+
>+} //WebAppDeploymentDescriptorImpl
>Index: jee-models/org/eclipse/jst/javaee/web/internal/impl/AbsoluteOrderingTypeImpl.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/web/internal/impl/AbsoluteOrderingTypeImpl.java
>diff -N jee-models/org/eclipse/jst/javaee/web/internal/impl/AbsoluteOrderingTypeImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/web/internal/impl/AbsoluteOrderingTypeImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,217 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.web.internal.impl;
>+
>+import java.util.Collection;
>+import java.util.List;
>+
>+import org.eclipse.emf.common.notify.NotificationChain;
>+
>+import org.eclipse.emf.ecore.EClass;
>+import org.eclipse.emf.ecore.InternalEObject;
>+
>+import org.eclipse.emf.ecore.impl.EObjectImpl;
>+
>+import org.eclipse.emf.ecore.util.BasicFeatureMap;
>+import org.eclipse.emf.ecore.util.FeatureMap;
>+import org.eclipse.emf.ecore.util.InternalEList;
>+
>+import org.eclipse.jst.javaee.web.AbsoluteOrderingType;
>+import org.eclipse.jst.javaee.web.OrderingOthersType;
>+
>+import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Absolute Ordering Type'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.AbsoluteOrderingTypeImpl#getGroup Group}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.AbsoluteOrderingTypeImpl#getName Name}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.AbsoluteOrderingTypeImpl#getOthers Others}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class AbsoluteOrderingTypeImpl extends EObjectImpl implements AbsoluteOrderingType {
>+	/**
>+	 * The cached value of the '{@link #getGroup() Group}' attribute list.
>+	 * 
>+	 * 
>+	 * @see #getGroup()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected FeatureMap group;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected AbsoluteOrderingTypeImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return WebPackage.Literals.ABSOLUTE_ORDERING_TYPE;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public FeatureMap getGroup() {
>+		if (group == null) {
>+			group = new BasicFeatureMap(this, WebPackage.ABSOLUTE_ORDERING_TYPE__GROUP);
>+		}
>+		return group;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<String> getName() {
>+		return getGroup().list(WebPackage.Literals.ABSOLUTE_ORDERING_TYPE__NAME);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<OrderingOthersType> getOthers() {
>+		return getGroup().list(WebPackage.Literals.ABSOLUTE_ORDERING_TYPE__OTHERS);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
>+		switch (featureID) {
>+			case WebPackage.ABSOLUTE_ORDERING_TYPE__GROUP:
>+				return ((InternalEList<?>)getGroup()).basicRemove(otherEnd, msgs);
>+			case WebPackage.ABSOLUTE_ORDERING_TYPE__OTHERS:
>+				return ((InternalEList<?>)getOthers()).basicRemove(otherEnd, msgs);
>+		}
>+		return super.eInverseRemove(otherEnd, featureID, msgs);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case WebPackage.ABSOLUTE_ORDERING_TYPE__GROUP:
>+				if (coreType) return getGroup();
>+				return ((FeatureMap.Internal)getGroup()).getWrapper();
>+			case WebPackage.ABSOLUTE_ORDERING_TYPE__NAME:
>+				return getName();
>+			case WebPackage.ABSOLUTE_ORDERING_TYPE__OTHERS:
>+				return getOthers();
>+		}
>+		return super.eGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@SuppressWarnings("unchecked")
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case WebPackage.ABSOLUTE_ORDERING_TYPE__GROUP:
>+				((FeatureMap.Internal)getGroup()).set(newValue);
>+				return;
>+			case WebPackage.ABSOLUTE_ORDERING_TYPE__NAME:
>+				getName().clear();
>+				getName().addAll((Collection<? extends String>)newValue);
>+				return;
>+			case WebPackage.ABSOLUTE_ORDERING_TYPE__OTHERS:
>+				getOthers().clear();
>+				getOthers().addAll((Collection<? extends OrderingOthersType>)newValue);
>+				return;
>+		}
>+		super.eSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case WebPackage.ABSOLUTE_ORDERING_TYPE__GROUP:
>+				getGroup().clear();
>+				return;
>+			case WebPackage.ABSOLUTE_ORDERING_TYPE__NAME:
>+				getName().clear();
>+				return;
>+			case WebPackage.ABSOLUTE_ORDERING_TYPE__OTHERS:
>+				getOthers().clear();
>+				return;
>+		}
>+		super.eUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case WebPackage.ABSOLUTE_ORDERING_TYPE__GROUP:
>+				return group != null && !group.isEmpty();
>+			case WebPackage.ABSOLUTE_ORDERING_TYPE__NAME:
>+				return !getName().isEmpty();
>+			case WebPackage.ABSOLUTE_ORDERING_TYPE__OTHERS:
>+				return !getOthers().isEmpty();
>+		}
>+		return super.eIsSet(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		if (eIsProxy()) return super.toString();
>+
>+		StringBuffer result = new StringBuffer(super.toString());
>+		result.append(" (group: "); //$NON-NLS-1$
>+		result.append(group);
>+		result.append(')');
>+		return result.toString();
>+	}
>+
>+} //AbsoluteOrderingTypeImpl
>Index: jee-models/org/eclipse/jst/javaee/web/internal/impl/CookiePathTypeImpl.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/web/internal/impl/CookiePathTypeImpl.java
>diff -N jee-models/org/eclipse/jst/javaee/web/internal/impl/CookiePathTypeImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/web/internal/impl/CookiePathTypeImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,168 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.web.internal.impl;
>+
>+import org.eclipse.emf.common.notify.Notification;
>+
>+import org.eclipse.emf.ecore.EClass;
>+
>+import org.eclipse.emf.ecore.impl.ENotificationImpl;
>+import org.eclipse.emf.ecore.impl.EObjectImpl;
>+
>+import org.eclipse.jst.javaee.web.CookiePathType;
>+
>+import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Cookie Path Type'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.CookiePathTypeImpl#getValue Value}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class CookiePathTypeImpl extends EObjectImpl implements CookiePathType {
>+	/**
>+	 * The default value of the '{@link #getValue() Value}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getValue()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String VALUE_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getValue() Value}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getValue()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String value = VALUE_EDEFAULT;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected CookiePathTypeImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return WebPackage.Literals.COOKIE_PATH_TYPE;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getValue() {
>+		return value;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setValue(String newValue) {
>+		String oldValue = value;
>+		value = newValue;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.COOKIE_PATH_TYPE__VALUE, oldValue, value));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case WebPackage.COOKIE_PATH_TYPE__VALUE:
>+				return getValue();
>+		}
>+		return super.eGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case WebPackage.COOKIE_PATH_TYPE__VALUE:
>+				setValue((String)newValue);
>+				return;
>+		}
>+		super.eSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case WebPackage.COOKIE_PATH_TYPE__VALUE:
>+				setValue(VALUE_EDEFAULT);
>+				return;
>+		}
>+		super.eUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case WebPackage.COOKIE_PATH_TYPE__VALUE:
>+				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
>+		}
>+		return super.eIsSet(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		if (eIsProxy()) return super.toString();
>+
>+		StringBuffer result = new StringBuffer(super.toString());
>+		result.append(" (value: "); //$NON-NLS-1$
>+		result.append(value);
>+		result.append(')');
>+		return result.toString();
>+	}
>+
>+} //CookiePathTypeImpl
>Index: jee-models/org/eclipse/jst/javaee/web/internal/impl/CookieDomainTypeImpl.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/web/internal/impl/CookieDomainTypeImpl.java
>diff -N jee-models/org/eclipse/jst/javaee/web/internal/impl/CookieDomainTypeImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/web/internal/impl/CookieDomainTypeImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,168 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.web.internal.impl;
>+
>+import org.eclipse.emf.common.notify.Notification;
>+
>+import org.eclipse.emf.ecore.EClass;
>+
>+import org.eclipse.emf.ecore.impl.ENotificationImpl;
>+import org.eclipse.emf.ecore.impl.EObjectImpl;
>+
>+import org.eclipse.jst.javaee.web.CookieDomainType;
>+
>+import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Cookie Domain Type'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.CookieDomainTypeImpl#getValue Value}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class CookieDomainTypeImpl extends EObjectImpl implements CookieDomainType {
>+	/**
>+	 * The default value of the '{@link #getValue() Value}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getValue()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String VALUE_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getValue() Value}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getValue()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String value = VALUE_EDEFAULT;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected CookieDomainTypeImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return WebPackage.Literals.COOKIE_DOMAIN_TYPE;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getValue() {
>+		return value;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setValue(String newValue) {
>+		String oldValue = value;
>+		value = newValue;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.COOKIE_DOMAIN_TYPE__VALUE, oldValue, value));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case WebPackage.COOKIE_DOMAIN_TYPE__VALUE:
>+				return getValue();
>+		}
>+		return super.eGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case WebPackage.COOKIE_DOMAIN_TYPE__VALUE:
>+				setValue((String)newValue);
>+				return;
>+		}
>+		super.eSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case WebPackage.COOKIE_DOMAIN_TYPE__VALUE:
>+				setValue(VALUE_EDEFAULT);
>+				return;
>+		}
>+		super.eUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case WebPackage.COOKIE_DOMAIN_TYPE__VALUE:
>+				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
>+		}
>+		return super.eIsSet(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		if (eIsProxy()) return super.toString();
>+
>+		StringBuffer result = new StringBuffer(super.toString());
>+		result.append(" (value: "); //$NON-NLS-1$
>+		result.append(value);
>+		result.append(')');
>+		return result.toString();
>+	}
>+
>+} //CookieDomainTypeImpl
>Index: jee-models/org/eclipse/jst/javaee/web/internal/impl/OrderingOrderingTypeImpl.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/web/internal/impl/OrderingOrderingTypeImpl.java
>diff -N jee-models/org/eclipse/jst/javaee/web/internal/impl/OrderingOrderingTypeImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/web/internal/impl/OrderingOrderingTypeImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,239 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.web.internal.impl;
>+
>+import java.util.Collection;
>+import java.util.List;
>+
>+import org.eclipse.emf.common.notify.Notification;
>+import org.eclipse.emf.common.notify.NotificationChain;
>+
>+import org.eclipse.emf.common.util.EList;
>+
>+import org.eclipse.emf.ecore.EClass;
>+import org.eclipse.emf.ecore.InternalEObject;
>+
>+import org.eclipse.emf.ecore.impl.ENotificationImpl;
>+import org.eclipse.emf.ecore.impl.EObjectImpl;
>+
>+import org.eclipse.emf.ecore.util.EDataTypeEList;
>+
>+import org.eclipse.jst.javaee.web.OrderingOrderingType;
>+import org.eclipse.jst.javaee.web.OrderingOthersType;
>+
>+import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Ordering Ordering Type'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.OrderingOrderingTypeImpl#getName Name}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.OrderingOrderingTypeImpl#getOthers Others}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class OrderingOrderingTypeImpl extends EObjectImpl implements OrderingOrderingType {
>+	/**
>+	 * The cached value of the '{@link #getName() Name}' attribute list.
>+	 * 
>+	 * 
>+	 * @see #getName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<String> name;
>+
>+	/**
>+	 * The cached value of the '{@link #getOthers() Others}' containment reference.
>+	 * 
>+	 * 
>+	 * @see #getOthers()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected OrderingOthersType others;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected OrderingOrderingTypeImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return WebPackage.Literals.ORDERING_ORDERING_TYPE;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<String> getName() {
>+		if (name == null) {
>+			name = new EDataTypeEList<String>(String.class, this, WebPackage.ORDERING_ORDERING_TYPE__NAME);
>+		}
>+		return name;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public OrderingOthersType getOthers() {
>+		return others;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public NotificationChain basicSetOthers(OrderingOthersType newOthers, NotificationChain msgs) {
>+		OrderingOthersType oldOthers = others;
>+		others = newOthers;
>+		if (eNotificationRequired()) {
>+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WebPackage.ORDERING_ORDERING_TYPE__OTHERS, oldOthers, newOthers);
>+			if (msgs == null) msgs = notification; else msgs.add(notification);
>+		}
>+		return msgs;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setOthers(OrderingOthersType newOthers) {
>+		if (newOthers != others) {
>+			NotificationChain msgs = null;
>+			if (others != null)
>+				msgs = ((InternalEObject)others).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WebPackage.ORDERING_ORDERING_TYPE__OTHERS, null, msgs);
>+			if (newOthers != null)
>+				msgs = ((InternalEObject)newOthers).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WebPackage.ORDERING_ORDERING_TYPE__OTHERS, null, msgs);
>+			msgs = basicSetOthers(newOthers, msgs);
>+			if (msgs != null) msgs.dispatch();
>+		}
>+		else if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.ORDERING_ORDERING_TYPE__OTHERS, newOthers, newOthers));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
>+		switch (featureID) {
>+			case WebPackage.ORDERING_ORDERING_TYPE__OTHERS:
>+				return basicSetOthers(null, msgs);
>+		}
>+		return super.eInverseRemove(otherEnd, featureID, msgs);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case WebPackage.ORDERING_ORDERING_TYPE__NAME:
>+				return getName();
>+			case WebPackage.ORDERING_ORDERING_TYPE__OTHERS:
>+				return getOthers();
>+		}
>+		return super.eGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@SuppressWarnings("unchecked")
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case WebPackage.ORDERING_ORDERING_TYPE__NAME:
>+				getName().clear();
>+				getName().addAll((Collection<? extends String>)newValue);
>+				return;
>+			case WebPackage.ORDERING_ORDERING_TYPE__OTHERS:
>+				setOthers((OrderingOthersType)newValue);
>+				return;
>+		}
>+		super.eSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case WebPackage.ORDERING_ORDERING_TYPE__NAME:
>+				getName().clear();
>+				return;
>+			case WebPackage.ORDERING_ORDERING_TYPE__OTHERS:
>+				setOthers((OrderingOthersType)null);
>+				return;
>+		}
>+		super.eUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case WebPackage.ORDERING_ORDERING_TYPE__NAME:
>+				return name != null && !name.isEmpty();
>+			case WebPackage.ORDERING_ORDERING_TYPE__OTHERS:
>+				return others != null;
>+		}
>+		return super.eIsSet(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		if (eIsProxy()) return super.toString();
>+
>+		StringBuffer result = new StringBuffer(super.toString());
>+		result.append(" (name: "); //$NON-NLS-1$
>+		result.append(name);
>+		result.append(')');
>+		return result.toString();
>+	}
>+
>+} //OrderingOrderingTypeImpl
>Index: jee-models/org/eclipse/jst/javaee/web/internal/impl/CookieConfigTypeImpl.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/web/internal/impl/CookieConfigTypeImpl.java
>diff -N jee-models/org/eclipse/jst/javaee/web/internal/impl/CookieConfigTypeImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/web/internal/impl/CookieConfigTypeImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,682 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.web.internal.impl;
>+
>+import java.math.BigInteger;
>+
>+import org.eclipse.emf.common.notify.Notification;
>+import org.eclipse.emf.common.notify.NotificationChain;
>+
>+import org.eclipse.emf.ecore.EClass;
>+import org.eclipse.emf.ecore.InternalEObject;
>+
>+import org.eclipse.emf.ecore.impl.ENotificationImpl;
>+import org.eclipse.emf.ecore.impl.EObjectImpl;
>+
>+import org.eclipse.jst.javaee.web.CookieCommentType;
>+import org.eclipse.jst.javaee.web.CookieConfigType;
>+import org.eclipse.jst.javaee.web.CookieDomainType;
>+import org.eclipse.jst.javaee.web.CookieNameType;
>+import org.eclipse.jst.javaee.web.CookiePathType;
>+
>+import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Cookie Config Type'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.CookieConfigTypeImpl#getName Name}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.CookieConfigTypeImpl#getDomain Domain}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.CookieConfigTypeImpl#getPath Path}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.CookieConfigTypeImpl#getComment Comment}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.CookieConfigTypeImpl#isHttpOnly Http Only}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.CookieConfigTypeImpl#isSecure Secure}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.CookieConfigTypeImpl#getMaxAge Max Age}</li>
>+ * <li>{@link org.eclipse.jst.javaee.web.internal.impl.CookieConfigTypeImpl#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class CookieConfigTypeImpl extends EObjectImpl implements CookieConfigType {
>+	/**
>+	 * The cached value of the '{@link #getName() Name}' containment reference.
>+	 * 
>+	 * 
>+	 * @see #getName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected CookieNameType name;
>+
>+	/**
>+	 * The cached value of the '{@link #getDomain() Domain}' containment reference.
>+	 * 
>+	 * 
>+	 * @see #getDomain()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected CookieDomainType domain;
>+
>+	/**
>+	 * The cached value of the '{@link #getPath() Path}' containment reference.
>+	 * 
>+	 * 
>+	 * @see #getPath()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected CookiePathType path;
>+
>+	/**
>+	 * The cached value of the '{@link #getComment() Comment}' containment reference.
>+	 * 
>+	 * 
>+	 * @see #getComment()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected CookieCommentType comment;
>+
>+	/**
>+	 * The default value of the '{@link #isHttpOnly() Http Only}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isHttpOnly()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final boolean HTTP_ONLY_EDEFAULT = false;
>+
>+	/**
>+	 * The cached value of the '{@link #isHttpOnly() Http Only}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isHttpOnly()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean httpOnly = HTTP_ONLY_EDEFAULT;
>+
>+	/**
>+	 * This is true if the Http Only attribute has been set.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean httpOnlyESet;
>+
>+	/**
>+	 * The default value of the '{@link #isSecure() Secure}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isSecure()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final boolean SECURE_EDEFAULT = false;
>+
>+	/**
>+	 * The cached value of the '{@link #isSecure() Secure}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isSecure()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean secure = SECURE_EDEFAULT;
>+
>+	/**
>+	 * This is true if the Secure attribute has been set.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean secureESet;
>+
>+	/**
>+	 * The default value of the '{@link #getMaxAge() Max Age}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getMaxAge()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final BigInteger MAX_AGE_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getMaxAge() Max Age}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getMaxAge()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected BigInteger maxAge = MAX_AGE_EDEFAULT;
>+
>+	/**
>+	 * The default value of the '{@link #getId() Id}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getId()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String ID_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getId() Id}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getId()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String id = ID_EDEFAULT;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected CookieConfigTypeImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return WebPackage.Literals.COOKIE_CONFIG_TYPE;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public CookieNameType getName() {
>+		return name;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public NotificationChain basicSetName(CookieNameType newName, NotificationChain msgs) {
>+		CookieNameType oldName = name;
>+		name = newName;
>+		if (eNotificationRequired()) {
>+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WebPackage.COOKIE_CONFIG_TYPE__NAME, oldName, newName);
>+			if (msgs == null) msgs = notification; else msgs.add(notification);
>+		}
>+		return msgs;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setName(CookieNameType newName) {
>+		if (newName != name) {
>+			NotificationChain msgs = null;
>+			if (name != null)
>+				msgs = ((InternalEObject)name).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WebPackage.COOKIE_CONFIG_TYPE__NAME, null, msgs);
>+			if (newName != null)
>+				msgs = ((InternalEObject)newName).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WebPackage.COOKIE_CONFIG_TYPE__NAME, null, msgs);
>+			msgs = basicSetName(newName, msgs);
>+			if (msgs != null) msgs.dispatch();
>+		}
>+		else if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.COOKIE_CONFIG_TYPE__NAME, newName, newName));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public CookieDomainType getDomain() {
>+		return domain;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public NotificationChain basicSetDomain(CookieDomainType newDomain, NotificationChain msgs) {
>+		CookieDomainType oldDomain = domain;
>+		domain = newDomain;
>+		if (eNotificationRequired()) {
>+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WebPackage.COOKIE_CONFIG_TYPE__DOMAIN, oldDomain, newDomain);
>+			if (msgs == null) msgs = notification; else msgs.add(notification);
>+		}
>+		return msgs;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setDomain(CookieDomainType newDomain) {
>+		if (newDomain != domain) {
>+			NotificationChain msgs = null;
>+			if (domain != null)
>+				msgs = ((InternalEObject)domain).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WebPackage.COOKIE_CONFIG_TYPE__DOMAIN, null, msgs);
>+			if (newDomain != null)
>+				msgs = ((InternalEObject)newDomain).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WebPackage.COOKIE_CONFIG_TYPE__DOMAIN, null, msgs);
>+			msgs = basicSetDomain(newDomain, msgs);
>+			if (msgs != null) msgs.dispatch();
>+		}
>+		else if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.COOKIE_CONFIG_TYPE__DOMAIN, newDomain, newDomain));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public CookiePathType getPath() {
>+		return path;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public NotificationChain basicSetPath(CookiePathType newPath, NotificationChain msgs) {
>+		CookiePathType oldPath = path;
>+		path = newPath;
>+		if (eNotificationRequired()) {
>+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WebPackage.COOKIE_CONFIG_TYPE__PATH, oldPath, newPath);
>+			if (msgs == null) msgs = notification; else msgs.add(notification);
>+		}
>+		return msgs;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setPath(CookiePathType newPath) {
>+		if (newPath != path) {
>+			NotificationChain msgs = null;
>+			if (path != null)
>+				msgs = ((InternalEObject)path).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WebPackage.COOKIE_CONFIG_TYPE__PATH, null, msgs);
>+			if (newPath != null)
>+				msgs = ((InternalEObject)newPath).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WebPackage.COOKIE_CONFIG_TYPE__PATH, null, msgs);
>+			msgs = basicSetPath(newPath, msgs);
>+			if (msgs != null) msgs.dispatch();
>+		}
>+		else if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.COOKIE_CONFIG_TYPE__PATH, newPath, newPath));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public CookieCommentType getComment() {
>+		return comment;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public NotificationChain basicSetComment(CookieCommentType newComment, NotificationChain msgs) {
>+		CookieCommentType oldComment = comment;
>+		comment = newComment;
>+		if (eNotificationRequired()) {
>+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WebPackage.COOKIE_CONFIG_TYPE__COMMENT, oldComment, newComment);
>+			if (msgs == null) msgs = notification; else msgs.add(notification);
>+		}
>+		return msgs;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setComment(CookieCommentType newComment) {
>+		if (newComment != comment) {
>+			NotificationChain msgs = null;
>+			if (comment != null)
>+				msgs = ((InternalEObject)comment).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WebPackage.COOKIE_CONFIG_TYPE__COMMENT, null, msgs);
>+			if (newComment != null)
>+				msgs = ((InternalEObject)newComment).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WebPackage.COOKIE_CONFIG_TYPE__COMMENT, null, msgs);
>+			msgs = basicSetComment(newComment, msgs);
>+			if (msgs != null) msgs.dispatch();
>+		}
>+		else if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.COOKIE_CONFIG_TYPE__COMMENT, newComment, newComment));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isHttpOnly() {
>+		return httpOnly;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setHttpOnly(boolean newHttpOnly) {
>+		boolean oldHttpOnly = httpOnly;
>+		httpOnly = newHttpOnly;
>+		boolean oldHttpOnlyESet = httpOnlyESet;
>+		httpOnlyESet = true;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.COOKIE_CONFIG_TYPE__HTTP_ONLY, oldHttpOnly, httpOnly, !oldHttpOnlyESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void unsetHttpOnly() {
>+		boolean oldHttpOnly = httpOnly;
>+		boolean oldHttpOnlyESet = httpOnlyESet;
>+		httpOnly = HTTP_ONLY_EDEFAULT;
>+		httpOnlyESet = false;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.UNSET, WebPackage.COOKIE_CONFIG_TYPE__HTTP_ONLY, oldHttpOnly, HTTP_ONLY_EDEFAULT, oldHttpOnlyESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isSetHttpOnly() {
>+		return httpOnlyESet;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isSecure() {
>+		return secure;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setSecure(boolean newSecure) {
>+		boolean oldSecure = secure;
>+		secure = newSecure;
>+		boolean oldSecureESet = secureESet;
>+		secureESet = true;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.COOKIE_CONFIG_TYPE__SECURE, oldSecure, secure, !oldSecureESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void unsetSecure() {
>+		boolean oldSecure = secure;
>+		boolean oldSecureESet = secureESet;
>+		secure = SECURE_EDEFAULT;
>+		secureESet = false;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.UNSET, WebPackage.COOKIE_CONFIG_TYPE__SECURE, oldSecure, SECURE_EDEFAULT, oldSecureESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isSetSecure() {
>+		return secureESet;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public BigInteger getMaxAge() {
>+		return maxAge;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setMaxAge(BigInteger newMaxAge) {
>+		BigInteger oldMaxAge = maxAge;
>+		maxAge = newMaxAge;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.COOKIE_CONFIG_TYPE__MAX_AGE, oldMaxAge, maxAge));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getId() {
>+		return id;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setId(String newId) {
>+		String oldId = id;
>+		id = newId;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.COOKIE_CONFIG_TYPE__ID, oldId, id));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
>+		switch (featureID) {
>+			case WebPackage.COOKIE_CONFIG_TYPE__NAME:
>+				return basicSetName(null, msgs);
>+			case WebPackage.COOKIE_CONFIG_TYPE__DOMAIN:
>+				return basicSetDomain(null, msgs);
>+			case WebPackage.COOKIE_CONFIG_TYPE__PATH:
>+				return basicSetPath(null, msgs);
>+			case WebPackage.COOKIE_CONFIG_TYPE__COMMENT:
>+				return basicSetComment(null, msgs);
>+		}
>+		return super.eInverseRemove(otherEnd, featureID, msgs);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case WebPackage.COOKIE_CONFIG_TYPE__NAME:
>+				return getName();
>+			case WebPackage.COOKIE_CONFIG_TYPE__DOMAIN:
>+				return getDomain();
>+			case WebPackage.COOKIE_CONFIG_TYPE__PATH:
>+				return getPath();
>+			case WebPackage.COOKIE_CONFIG_TYPE__COMMENT:
>+				return getComment();
>+			case WebPackage.COOKIE_CONFIG_TYPE__HTTP_ONLY:
>+				return isHttpOnly();
>+			case WebPackage.COOKIE_CONFIG_TYPE__SECURE:
>+				return isSecure();
>+			case WebPackage.COOKIE_CONFIG_TYPE__MAX_AGE:
>+				return getMaxAge();
>+			case WebPackage.COOKIE_CONFIG_TYPE__ID:
>+				return getId();
>+		}
>+		return super.eGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case WebPackage.COOKIE_CONFIG_TYPE__NAME:
>+				setName((CookieNameType)newValue);
>+				return;
>+			case WebPackage.COOKIE_CONFIG_TYPE__DOMAIN:
>+				setDomain((CookieDomainType)newValue);
>+				return;
>+			case WebPackage.COOKIE_CONFIG_TYPE__PATH:
>+				setPath((CookiePathType)newValue);
>+				return;
>+			case WebPackage.COOKIE_CONFIG_TYPE__COMMENT:
>+				setComment((CookieCommentType)newValue);
>+				return;
>+			case WebPackage.COOKIE_CONFIG_TYPE__HTTP_ONLY:
>+				setHttpOnly((Boolean)newValue);
>+				return;
>+			case WebPackage.COOKIE_CONFIG_TYPE__SECURE:
>+				setSecure((Boolean)newValue);
>+				return;
>+			case WebPackage.COOKIE_CONFIG_TYPE__MAX_AGE:
>+				setMaxAge((BigInteger)newValue);
>+				return;
>+			case WebPackage.COOKIE_CONFIG_TYPE__ID:
>+				setId((String)newValue);
>+				return;
>+		}
>+		super.eSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case WebPackage.COOKIE_CONFIG_TYPE__NAME:
>+				setName((CookieNameType)null);
>+				return;
>+			case WebPackage.COOKIE_CONFIG_TYPE__DOMAIN:
>+				setDomain((CookieDomainType)null);
>+				return;
>+			case WebPackage.COOKIE_CONFIG_TYPE__PATH:
>+				setPath((CookiePathType)null);
>+				return;
>+			case WebPackage.COOKIE_CONFIG_TYPE__COMMENT:
>+				setComment((CookieCommentType)null);
>+				return;
>+			case WebPackage.COOKIE_CONFIG_TYPE__HTTP_ONLY:
>+				unsetHttpOnly();
>+				return;
>+			case WebPackage.COOKIE_CONFIG_TYPE__SECURE:
>+				unsetSecure();
>+				return;
>+			case WebPackage.COOKIE_CONFIG_TYPE__MAX_AGE:
>+				setMaxAge(MAX_AGE_EDEFAULT);
>+				return;
>+			case WebPackage.COOKIE_CONFIG_TYPE__ID:
>+				setId(ID_EDEFAULT);
>+				return;
>+		}
>+		super.eUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case WebPackage.COOKIE_CONFIG_TYPE__NAME:
>+				return name != null;
>+			case WebPackage.COOKIE_CONFIG_TYPE__DOMAIN:
>+				return domain != null;
>+			case WebPackage.COOKIE_CONFIG_TYPE__PATH:
>+				return path != null;
>+			case WebPackage.COOKIE_CONFIG_TYPE__COMMENT:
>+				return comment != null;
>+			case WebPackage.COOKIE_CONFIG_TYPE__HTTP_ONLY:
>+				return isSetHttpOnly();
>+			case WebPackage.COOKIE_CONFIG_TYPE__SECURE:
>+				return isSetSecure();
>+			case WebPackage.COOKIE_CONFIG_TYPE__MAX_AGE:
>+				return MAX_AGE_EDEFAULT == null ? maxAge != null : !MAX_AGE_EDEFAULT.equals(maxAge);
>+			case WebPackage.COOKIE_CONFIG_TYPE__ID:
>+				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
>+		}
>+		return super.eIsSet(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		if (eIsProxy()) return super.toString();
>+
>+		StringBuffer result = new StringBuffer(super.toString());
>+		result.append(" (httpOnly: "); //$NON-NLS-1$
>+		if (httpOnlyESet) result.append(httpOnly); else result.append("<unset>"); //$NON-NLS-1$
>+		result.append(", secure: "); //$NON-NLS-1$
>+		if (secureESet) result.append(secure); else result.append("<unset>"); //$NON-NLS-1$
>+		result.append(", maxAge: "); //$NON-NLS-1$
>+		result.append(maxAge);
>+		result.append(", id: "); //$NON-NLS-1$
>+		result.append(id);
>+		result.append(')');
>+		return result.toString();
>+	}
>+
>+} //CookieConfigTypeImpl
>Index: jee-models/org/eclipse/jst/javaee/webapp/internal/util/WebappResourceImpl.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/webapp/internal/util/WebappResourceImpl.java
>diff -N jee-models/org/eclipse/jst/javaee/webapp/internal/util/WebappResourceImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/webapp/internal/util/WebappResourceImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,32 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.webapp.internal.util;
>+
>+import org.eclipse.emf.common.util.URI;
>+
>+import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
>+
>+/**
>+ * 
>+ * The Resource associated with the package.
>+ * 
>+ * @see org.eclipse.jst.javaee.webapp.internal.util.WebappResourceFactoryImpl
>+ * @generated
>+ */
>+public class WebappResourceImpl extends XMLResourceImpl {
>+	/**
>+	 * Creates an instance of the resource.
>+	 * 
>+	 * 
>+	 * @param uri the URI of the new resource.
>+	 * @generated
>+	 */
>+	public WebappResourceImpl(URI uri) {
>+		super(uri);
>+	}
>+
>+} //WebappResourceImpl

Actions: View | Diff

Attachments on bug 252615: 148288 | 149599 | 149600 | 149601 | 149713