262 files changed, 0 insertions, 108913 deletions

diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/Application.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/Application.java
deleted file mode 100644
index dcdfb59b6..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/Application.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.application;
-
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Application</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The applicationType defines the structure of the
- * 	application.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.application.Application#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.application.Application#getDisplayNames <em>Display Names</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.application.Application#getIcons <em>Icons</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.application.Application#getModules <em>Modules</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.application.Application#getSecurityRoles <em>Security Roles</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.application.Application#getLibraryDirectory <em>Library Directory</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.application.Application#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.application.Application#getVersion <em>Version</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getApplication()
- * @extends JavaEEObject
- * @generated
- */
-public interface Application extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getApplication_Descriptions()
-	 * @generated
-	 */
-	List getDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>Display Names</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.DisplayName}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Names</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Names</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getApplication_DisplayNames()
-	 * @generated
-	 */
-	List getDisplayNames();
-
-	/**
-	 * Returns the value of the '<em><b>Icons</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Icon}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Icons</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Icons</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getApplication_Icons()
-	 * @generated
-	 */
-	List getIcons();
-
-	/**
-	 * Returns the value of the '<em><b>Modules</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.application.Module}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The application deployment descriptor must have one
-	 * 	    module element for each Java EE module in the
-	 * 	    application package. A module element is defined
-	 * 	    by moduleType definition.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Modules</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getApplication_Modules()
-	 * @generated
-	 */
-	List getModules();
-
-	/**
-	 * Returns the value of the '<em><b>Security Roles</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.SecurityRole}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Security Roles</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Security Roles</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getApplication_SecurityRoles()
-	 * @generated
-	 */
-	List getSecurityRoles();
-
-	/**
-	 * Returns the value of the '<em><b>Library Directory</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The library-directory element specifies the pathname
-	 * 	    of a directory within the application package, relative
-	 * 	    to the top level of the application package.  All files
-	 * 	    named "*.jar" in this directory must be made available
-	 * 	    in the class path of all components included in this
-	 * 	    application package.  If this element isn't specified,
-	 * 	    the directory named "lib" is searched.  An empty element
-	 * 	    may be used to disable searching.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Library Directory</em>' attribute.
-	 * @see #setLibraryDirectory(String)
-	 * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getApplication_LibraryDirectory()
-	 * @generated
-	 */
-	String getLibraryDirectory();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.application.Application#getLibraryDirectory <em>Library Directory</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Library Directory</em>' attribute.
-	 * @see #getLibraryDirectory()
-	 * @generated
-	 */
-	void setLibraryDirectory(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getApplication_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.application.Application#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Version</b></em>' attribute.
-	 * The default value is <code>"5"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	  The required value for the version is 5.
-	 * 
-	 * 	
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Version</em>' attribute.
-	 * @see #isSetVersion()
-	 * @see #unsetVersion()
-	 * @see #setVersion(String)
-	 * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getApplication_Version()
-	 * @generated
-	 */
-	String getVersion();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.application.Application#getVersion <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Version</em>' attribute.
-	 * @see #isSetVersion()
-	 * @see #unsetVersion()
-	 * @see #getVersion()
-	 * @generated
-	 */
-	void setVersion(String value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.javaee.application.Application#getVersion <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetVersion()
-	 * @see #getVersion()
-	 * @see #setVersion(String)
-	 * @generated
-	 */
-	void unsetVersion();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.application.Application#getVersion <em>Version</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Version</em>' attribute is set.
-	 * @see #unsetVersion()
-	 * @see #getVersion()
-	 * @see #setVersion(String)
-	 * @generated
-	 */
-	boolean isSetVersion();
-
-	/**
-	 * Gets the first module matching the specified uri
-	 * @param uri The uri of a module to find.
-	 * @return The first matching module or null if no module is found.
-	 */
-	public Module getFirstModule(String uri);
-
-	public Module getModule(String uri, String altDD);
-
-} // Application
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/ApplicationDeploymentDescriptor.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/ApplicationDeploymentDescriptor.java
deleted file mode 100644
index fc6ae210a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/ApplicationDeploymentDescriptor.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.application;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Deployment Descriptor</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.application.ApplicationDeploymentDescriptor#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.application.ApplicationDeploymentDescriptor#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.application.ApplicationDeploymentDescriptor#getXSISchemaLocation <em>XSI Schema Location</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.application.ApplicationDeploymentDescriptor#getApplication <em>Application</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getApplicationDeploymentDescriptor()
- * @extends JavaEEObject
- * @generated
- */
-public interface ApplicationDeploymentDescriptor extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Mixed</em>' attribute list.
-	 * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getApplicationDeploymentDescriptor_Mixed()
-	 * @generated
-	 */
-	FeatureMap getMixed();
-
-	/**
-	 * Returns the value of the '<em><b>XMLNS Prefix Map</b></em>' map.
-	 * The key is of type {@link java.lang.String},
-	 * and the value is of type {@link java.lang.String},
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>XMLNS Prefix Map</em>' map isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>XMLNS Prefix Map</em>' map.
-	 * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getApplicationDeploymentDescriptor_XMLNSPrefixMap()
-	 * @generated
-	 */
-	Map getXMLNSPrefixMap();
-
-	/**
-	 * Returns the value of the '<em><b>XSI Schema Location</b></em>' map.
-	 * The key is of type {@link java.lang.String},
-	 * and the value is of type {@link java.lang.String},
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>XSI Schema Location</em>' map isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>XSI Schema Location</em>' map.
-	 * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getApplicationDeploymentDescriptor_XSISchemaLocation()
-	 * @generated
-	 */
-	Map getXSISchemaLocation();
-
-	/**
-	 * Returns the value of the '<em><b>Application</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	The application element is the root element of a Java EE
-	 * 	application deployment descriptor.
-	 * 
-	 *       
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Application</em>' containment reference.
-	 * @see #setApplication(Application)
-	 * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getApplicationDeploymentDescriptor_Application()
-	 * @generated
-	 */
-	Application getApplication();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.application.ApplicationDeploymentDescriptor#getApplication <em>Application</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Application</em>' containment reference.
-	 * @see #getApplication()
-	 * @generated
-	 */
-	void setApplication(Application value);
-
-} // ApplicationDeploymentDescriptor
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/ApplicationFactory.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/ApplicationFactory.java
deleted file mode 100644
index 965a01413..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/ApplicationFactory.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.application;
-
-import org.eclipse.emf.ecore.EFactory;
-
-import org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage
- * @generated
- */
-public interface ApplicationFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	ApplicationFactory eINSTANCE = org.eclipse.jst.javaee.application.internal.impl.ApplicationFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Application</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Application</em>'.
-	 * @generated
-	 */
-	Application createApplication();
-
-	/**
-	 * Returns a new object of class '<em>Deployment Descriptor</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Deployment Descriptor</em>'.
-	 * @generated
-	 */
-	ApplicationDeploymentDescriptor createApplicationDeploymentDescriptor();
-
-	/**
-	 * Returns a new object of class '<em>Module</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Module</em>'.
-	 * @generated
-	 */
-	Module createModule();
-
-	/**
-	 * Returns a new object of class '<em>Web</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Web</em>'.
-	 * @generated
-	 */
-	Web createWeb();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	ApplicationPackage getApplicationPackage();
-
-} //ApplicationFactory
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/IApplicationResource.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/IApplicationResource.java
deleted file mode 100644
index 12939afd9..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/IApplicationResource.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.eclipse.jst.javaee.application;
-
-import org.eclipse.emf.ecore.EObject;
-
-public interface IApplicationResource {
-
-	/**
-	 * Return the first element in the EList.
-	 */
-	public abstract EObject getRootObject();
-
-	/**
-	 * Return the ear
-	 */
-	public abstract Application getApplication();
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/Module.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/Module.java
deleted file mode 100644
index c8f9310d2..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/Module.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.application;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Module</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The moduleType defines a single Java EE module and contains a
- * 	connector, ejb, java, or web element, which indicates the
- * 	module type and contains a path to the module file, and an
- * 	optional alt-dd element, which specifies an optional URI to
- * 	the post-assembly version of the deployment descriptor.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.application.Module#getConnector <em>Connector</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.application.Module#getEjb <em>Ejb</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.application.Module#getJava <em>Java</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.application.Module#getWeb <em>Web</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.application.Module#getAltDd <em>Alt Dd</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.application.Module#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getModule()
- * @extends JavaEEObject
- * @generated
- */
-public interface Module extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Connector</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	      The connector element specifies the URI of a
-	 * 	      resource adapter archive file, relative to the
-	 * 	      top level of the application package.
-	 * 
-	 * 	    
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Connector</em>' attribute.
-	 * @see #setConnector(String)
-	 * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getModule_Connector()
-	 * @generated
-	 */
-	String getConnector();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.application.Module#getConnector <em>Connector</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Connector</em>' attribute.
-	 * @see #getConnector()
-	 * @generated
-	 */
-	void setConnector(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Ejb</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	      The ejb element specifies the URI of an ejb-jar,
-	 * 	      relative to the top level of the application
-	 * 	      package.
-	 * 
-	 * 	    
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Ejb</em>' attribute.
-	 * @see #setEjb(String)
-	 * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getModule_Ejb()
-	 * @generated
-	 */
-	String getEjb();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.application.Module#getEjb <em>Ejb</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Ejb</em>' attribute.
-	 * @see #getEjb()
-	 * @generated
-	 */
-	void setEjb(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Java</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	      The java element specifies the URI of a java
-	 * 	      application client module, relative to the top
-	 * 	      level of the application package.
-	 * 
-	 * 	    
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Java</em>' attribute.
-	 * @see #setJava(String)
-	 * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getModule_Java()
-	 * @generated
-	 */
-	String getJava();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.application.Module#getJava <em>Java</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Java</em>' attribute.
-	 * @see #getJava()
-	 * @generated
-	 */
-	void setJava(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Web</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Web</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Web</em>' containment reference.
-	 * @see #setWeb(Web)
-	 * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getModule_Web()
-	 * @generated
-	 */
-	Web getWeb();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.application.Module#getWeb <em>Web</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Web</em>' containment reference.
-	 * @see #getWeb()
-	 * @generated
-	 */
-	void setWeb(Web value);
-
-	/**
-	 * Returns the value of the '<em><b>Alt Dd</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The alt-dd element specifies an optional URI to the
-	 * 	    post-assembly version of the deployment descriptor
-	 * 	    file for a particular Java EE module.  The URI must
-	 * 	    specify the full pathname of the deployment
-	 * 	    descriptor file relative to the application's root
-	 * 	    directory. If alt-dd is not specified, the deployer
-	 * 	    must read the deployment descriptor from the default
-	 * 	    location and file name required by the respective
-	 * 	    component specification.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Alt Dd</em>' attribute.
-	 * @see #setAltDd(String)
-	 * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getModule_AltDd()
-	 * @generated
-	 */
-	String getAltDd();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.application.Module#getAltDd <em>Alt Dd</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Alt Dd</em>' attribute.
-	 * @see #getAltDd()
-	 * @generated
-	 */
-	void setAltDd(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getModule_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.application.Module#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-	public String getUri();
-
-} // Module
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/Web.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/Web.java
deleted file mode 100644
index c4bf1ffee..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/Web.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.application;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Web</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The webType defines the web-uri and context-root of
- * 	a web application module.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.application.Web#getWebUri <em>Web Uri</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.application.Web#getContextRoot <em>Context Root</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.application.Web#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getWeb()
- * @extends JavaEEObject
- * @generated
- */
-public interface Web extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Web Uri</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The web-uri element specifies the URI of a web
-	 * 	    application file, relative to the top level of the
-	 * 	    application package.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Web Uri</em>' attribute.
-	 * @see #setWebUri(String)
-	 * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getWeb_WebUri()
-	 * @generated
-	 */
-	String getWebUri();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.application.Web#getWebUri <em>Web Uri</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Web Uri</em>' attribute.
-	 * @see #getWebUri()
-	 * @generated
-	 */
-	void setWebUri(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Context Root</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The context-root element specifies the context root
-	 * 	    of a web application.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Context Root</em>' attribute.
-	 * @see #setContextRoot(String)
-	 * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getWeb_ContextRoot()
-	 * @generated
-	 */
-	String getContextRoot();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.application.Web#getContextRoot <em>Context Root</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Context Root</em>' attribute.
-	 * @see #getContextRoot()
-	 * @generated
-	 */
-	void setContextRoot(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getWeb_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.application.Web#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // Web
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/impl/ApplicationDeploymentDescriptorImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/impl/ApplicationDeploymentDescriptorImpl.java
deleted file mode 100644
index eb25c40c6..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/impl/ApplicationDeploymentDescriptorImpl.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.application.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.application.Application;
-import org.eclipse.jst.javaee.application.ApplicationDeploymentDescriptor;
-
-import org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Deployment Descriptor</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.application.internal.impl.ApplicationDeploymentDescriptorImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.application.internal.impl.ApplicationDeploymentDescriptorImpl#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.application.internal.impl.ApplicationDeploymentDescriptorImpl#getXSISchemaLocation <em>XSI Schema Location</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.application.internal.impl.ApplicationDeploymentDescriptorImpl#getApplication <em>Application</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ApplicationDeploymentDescriptorImpl extends EObjectImpl implements ApplicationDeploymentDescriptor {
-	/**
-	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMixed()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureMap mixed = null;
-
-	/**
-	 * The cached value of the '{@link #getXMLNSPrefixMap() <em>XMLNS Prefix Map</em>}' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getXMLNSPrefixMap()
-	 * @generated
-	 * @ordered
-	 */
-	protected EMap xMLNSPrefixMap = null;
-
-	/**
-	 * The cached value of the '{@link #getXSISchemaLocation() <em>XSI Schema Location</em>}' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getXSISchemaLocation()
-	 * @generated
-	 * @ordered
-	 */
-	protected EMap xSISchemaLocation = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ApplicationDeploymentDescriptorImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return ApplicationPackage.Literals.APPLICATION_DEPLOYMENT_DESCRIPTOR;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureMap getMixed() {
-		if (mixed == null) {
-			mixed = new BasicFeatureMap(this, ApplicationPackage.APPLICATION_DEPLOYMENT_DESCRIPTOR__MIXED);
-		}
-		return mixed;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Map getXMLNSPrefixMap() {
-		if (xMLNSPrefixMap == null) {
-			xMLNSPrefixMap = new EcoreEMap(EcorePackage.Literals.ESTRING_TO_STRING_MAP_ENTRY, EStringToStringMapEntryImpl.class, this, ApplicationPackage.APPLICATION_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP);
-		}
-		return xMLNSPrefixMap.map();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Map getXSISchemaLocation() {
-		if (xSISchemaLocation == null) {
-			xSISchemaLocation = new EcoreEMap(EcorePackage.Literals.ESTRING_TO_STRING_MAP_ENTRY, EStringToStringMapEntryImpl.class, this, ApplicationPackage.APPLICATION_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION);
-		}
-		return xSISchemaLocation.map();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Application getApplication() {
-		return (Application)getMixed().get(ApplicationPackage.Literals.APPLICATION_DEPLOYMENT_DESCRIPTOR__APPLICATION, true);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetApplication(Application newApplication, NotificationChain msgs) {
-		return ((FeatureMap.Internal)getMixed()).basicAdd(ApplicationPackage.Literals.APPLICATION_DEPLOYMENT_DESCRIPTOR__APPLICATION, newApplication, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setApplication(Application newApplication) {
-		((FeatureMap.Internal)getMixed()).set(ApplicationPackage.Literals.APPLICATION_DEPLOYMENT_DESCRIPTOR__APPLICATION, newApplication);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case ApplicationPackage.APPLICATION_DEPLOYMENT_DESCRIPTOR__MIXED:
-				return ((InternalEList)getMixed()).basicRemove(otherEnd, msgs);
-			case ApplicationPackage.APPLICATION_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP:
-				return ((InternalEList)((EMap.InternalMapView)getXMLNSPrefixMap()).eMap()).basicRemove(otherEnd, msgs);
-			case ApplicationPackage.APPLICATION_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION:
-				return ((InternalEList)((EMap.InternalMapView)getXSISchemaLocation()).eMap()).basicRemove(otherEnd, msgs);
-			case ApplicationPackage.APPLICATION_DEPLOYMENT_DESCRIPTOR__APPLICATION:
-				return basicSetApplication(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ApplicationPackage.APPLICATION_DEPLOYMENT_DESCRIPTOR__MIXED:
-				if (coreType) return getMixed();
-				return ((FeatureMap.Internal)getMixed()).getWrapper();
-			case ApplicationPackage.APPLICATION_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP:
-				if (coreType) return ((EMap.InternalMapView)getXMLNSPrefixMap()).eMap();
-				else return getXMLNSPrefixMap();
-			case ApplicationPackage.APPLICATION_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION:
-				if (coreType) return ((EMap.InternalMapView)getXSISchemaLocation()).eMap();
-				else return getXSISchemaLocation();
-			case ApplicationPackage.APPLICATION_DEPLOYMENT_DESCRIPTOR__APPLICATION:
-				return getApplication();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ApplicationPackage.APPLICATION_DEPLOYMENT_DESCRIPTOR__MIXED:
-				((FeatureMap.Internal)getMixed()).set(newValue);
-				return;
-			case ApplicationPackage.APPLICATION_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP:
-				((EStructuralFeature.Setting)((EMap.InternalMapView)getXMLNSPrefixMap()).eMap()).set(newValue);
-				return;
-			case ApplicationPackage.APPLICATION_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION:
-				((EStructuralFeature.Setting)((EMap.InternalMapView)getXSISchemaLocation()).eMap()).set(newValue);
-				return;
-			case ApplicationPackage.APPLICATION_DEPLOYMENT_DESCRIPTOR__APPLICATION:
-				setApplication((Application)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ApplicationPackage.APPLICATION_DEPLOYMENT_DESCRIPTOR__MIXED:
-				getMixed().clear();
-				return;
-			case ApplicationPackage.APPLICATION_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP:
-				getXMLNSPrefixMap().clear();
-				return;
-			case ApplicationPackage.APPLICATION_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION:
-				getXSISchemaLocation().clear();
-				return;
-			case ApplicationPackage.APPLICATION_DEPLOYMENT_DESCRIPTOR__APPLICATION:
-				setApplication((Application)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ApplicationPackage.APPLICATION_DEPLOYMENT_DESCRIPTOR__MIXED:
-				return mixed != null && !mixed.isEmpty();
-			case ApplicationPackage.APPLICATION_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP:
-				return xMLNSPrefixMap != null && !xMLNSPrefixMap.isEmpty();
-			case ApplicationPackage.APPLICATION_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION:
-				return xSISchemaLocation != null && !xSISchemaLocation.isEmpty();
-			case ApplicationPackage.APPLICATION_DEPLOYMENT_DESCRIPTOR__APPLICATION:
-				return getApplication() != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	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();
-	}
-
-} //ApplicationDeploymentDescriptorImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/impl/ApplicationFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/impl/ApplicationFactoryImpl.java
deleted file mode 100644
index 6a5690bdb..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/impl/ApplicationFactoryImpl.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.application.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.application.*;
-
-import org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class ApplicationFactoryImpl extends EFactoryImpl implements ApplicationFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ApplicationFactory init() {
-		try {
-			ApplicationFactory theApplicationFactory = (ApplicationFactory)EPackage.Registry.INSTANCE.getEFactory("http://java.sun.com/xml/ns/javaee/application"); //$NON-NLS-1$ 
-			if (theApplicationFactory != null) {
-				return theApplicationFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new ApplicationFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ApplicationFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case ApplicationPackage.APPLICATION: return (EObject)createApplication();
-			case ApplicationPackage.APPLICATION_DEPLOYMENT_DESCRIPTOR: return (EObject)createApplicationDeploymentDescriptor();
-			case ApplicationPackage.MODULE: return (EObject)createModule();
-			case ApplicationPackage.WEB: return (EObject)createWeb();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Application createApplication() {
-		ApplicationImpl application = new ApplicationImpl();
-		return application;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ApplicationDeploymentDescriptor createApplicationDeploymentDescriptor() {
-		ApplicationDeploymentDescriptorImpl applicationDeploymentDescriptor = new ApplicationDeploymentDescriptorImpl();
-		return applicationDeploymentDescriptor;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Module createModule() {
-		ModuleImpl module = new ModuleImpl();
-		return module;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Web createWeb() {
-		WebImpl web = new WebImpl();
-		return web;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ApplicationPackage getApplicationPackage() {
-		return (ApplicationPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	public static ApplicationPackage getPackage() {
-		return ApplicationPackage.eINSTANCE;
-	}
-
-} //ApplicationFactoryImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/impl/ApplicationImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/impl/ApplicationImpl.java
deleted file mode 100644
index b6734ce2e..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/impl/ApplicationImpl.java
+++ /dev/null
@@ -1,544 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.application.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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.javaee.application.Application;
-import org.eclipse.jst.javaee.application.Module;
-import org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage;
-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.SecurityRole;
-import org.eclipse.jst.jee.application.ICommonApplication;
-import org.eclipse.jst.jee.application.ICommonModule;
-import org.eclipse.wst.common.internal.emf.utilities.StringUtil;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Application</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.application.internal.impl.ApplicationImpl#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.application.internal.impl.ApplicationImpl#getDisplayNames <em>Display Names</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.application.internal.impl.ApplicationImpl#getIcons <em>Icons</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.application.internal.impl.ApplicationImpl#getModules <em>Modules</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.application.internal.impl.ApplicationImpl#getSecurityRoles <em>Security Roles</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.application.internal.impl.ApplicationImpl#getLibraryDirectory <em>Library Directory</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.application.internal.impl.ApplicationImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.application.internal.impl.ApplicationImpl#getVersion <em>Version</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ApplicationImpl extends EObjectImpl implements Application, ICommonApplication {
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayNames() <em>Display Names</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayNames()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList displayNames = null;
-
-	/**
-	 * The cached value of the '{@link #getIcons() <em>Icons</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIcons()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList icons = null;
-
-	/**
-	 * The cached value of the '{@link #getModules() <em>Modules</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getModules()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList modules = null;
-
-	/**
-	 * The cached value of the '{@link #getSecurityRoles() <em>Security Roles</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSecurityRoles()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList securityRoles = null;
-
-	/**
-	 * The default value of the '{@link #getLibraryDirectory() <em>Library Directory</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLibraryDirectory()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LIBRARY_DIRECTORY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLibraryDirectory() <em>Library Directory</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLibraryDirectory()
-	 * @generated
-	 * @ordered
-	 */
-	protected String libraryDirectory = LIBRARY_DIRECTORY_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VERSION_EDEFAULT = "5"; //$NON-NLS-1$
-
-	/**
-	 * The cached value of the '{@link #getVersion() <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected String version = VERSION_EDEFAULT;
-
-	/**
-	 * This is true if the Version attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean versionESet = false;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ApplicationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return ApplicationPackage.Literals.APPLICATION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, ApplicationPackage.APPLICATION__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDisplayNames() {
-		if (displayNames == null) {
-			displayNames = new EObjectContainmentEList(DisplayName.class, this, ApplicationPackage.APPLICATION__DISPLAY_NAMES);
-		}
-		return displayNames;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getIcons() {
-		if (icons == null) {
-			icons = new EObjectContainmentEList(Icon.class, this, ApplicationPackage.APPLICATION__ICONS);
-		}
-		return icons;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getModules() {
-		if (modules == null) {
-			modules = new EObjectContainmentEList(Module.class, this, ApplicationPackage.APPLICATION__MODULES);
-		}
-		return modules;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getSecurityRoles() {
-		if (securityRoles == null) {
-			securityRoles = new EObjectContainmentEList(SecurityRole.class, this, ApplicationPackage.APPLICATION__SECURITY_ROLES);
-		}
-		return securityRoles;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLibraryDirectory() {
-		return libraryDirectory;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLibraryDirectory(String newLibraryDirectory) {
-		String oldLibraryDirectory = libraryDirectory;
-		libraryDirectory = newLibraryDirectory;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ApplicationPackage.APPLICATION__LIBRARY_DIRECTORY, oldLibraryDirectory, libraryDirectory));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ApplicationPackage.APPLICATION__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getVersion() {
-		return version;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setVersion(String newVersion) {
-		String oldVersion = version;
-		version = newVersion;
-		boolean oldVersionESet = versionESet;
-		versionESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ApplicationPackage.APPLICATION__VERSION, oldVersion, version, !oldVersionESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetVersion() {
-		String oldVersion = version;
-		boolean oldVersionESet = versionESet;
-		version = VERSION_EDEFAULT;
-		versionESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, ApplicationPackage.APPLICATION__VERSION, oldVersion, VERSION_EDEFAULT, oldVersionESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetVersion() {
-		return versionESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case ApplicationPackage.APPLICATION__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-			case ApplicationPackage.APPLICATION__DISPLAY_NAMES:
-				return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
-			case ApplicationPackage.APPLICATION__ICONS:
-				return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
-			case ApplicationPackage.APPLICATION__MODULES:
-				return ((InternalEList)getModules()).basicRemove(otherEnd, msgs);
-			case ApplicationPackage.APPLICATION__SECURITY_ROLES:
-				return ((InternalEList)getSecurityRoles()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ApplicationPackage.APPLICATION__DESCRIPTIONS:
-				return getDescriptions();
-			case ApplicationPackage.APPLICATION__DISPLAY_NAMES:
-				return getDisplayNames();
-			case ApplicationPackage.APPLICATION__ICONS:
-				return getIcons();
-			case ApplicationPackage.APPLICATION__MODULES:
-				return getModules();
-			case ApplicationPackage.APPLICATION__SECURITY_ROLES:
-				return getSecurityRoles();
-			case ApplicationPackage.APPLICATION__LIBRARY_DIRECTORY:
-				return getLibraryDirectory();
-			case ApplicationPackage.APPLICATION__ID:
-				return getId();
-			case ApplicationPackage.APPLICATION__VERSION:
-				return getVersion();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ApplicationPackage.APPLICATION__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case ApplicationPackage.APPLICATION__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				getDisplayNames().addAll((Collection)newValue);
-				return;
-			case ApplicationPackage.APPLICATION__ICONS:
-				getIcons().clear();
-				getIcons().addAll((Collection)newValue);
-				return;
-			case ApplicationPackage.APPLICATION__MODULES:
-				getModules().clear();
-				getModules().addAll((Collection)newValue);
-				return;
-			case ApplicationPackage.APPLICATION__SECURITY_ROLES:
-				getSecurityRoles().clear();
-				getSecurityRoles().addAll((Collection)newValue);
-				return;
-			case ApplicationPackage.APPLICATION__LIBRARY_DIRECTORY:
-				setLibraryDirectory((String)newValue);
-				return;
-			case ApplicationPackage.APPLICATION__ID:
-				setId((String)newValue);
-				return;
-			case ApplicationPackage.APPLICATION__VERSION:
-				setVersion((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ApplicationPackage.APPLICATION__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case ApplicationPackage.APPLICATION__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				return;
-			case ApplicationPackage.APPLICATION__ICONS:
-				getIcons().clear();
-				return;
-			case ApplicationPackage.APPLICATION__MODULES:
-				getModules().clear();
-				return;
-			case ApplicationPackage.APPLICATION__SECURITY_ROLES:
-				getSecurityRoles().clear();
-				return;
-			case ApplicationPackage.APPLICATION__LIBRARY_DIRECTORY:
-				setLibraryDirectory(LIBRARY_DIRECTORY_EDEFAULT);
-				return;
-			case ApplicationPackage.APPLICATION__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case ApplicationPackage.APPLICATION__VERSION:
-				unsetVersion();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ApplicationPackage.APPLICATION__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case ApplicationPackage.APPLICATION__DISPLAY_NAMES:
-				return displayNames != null && !displayNames.isEmpty();
-			case ApplicationPackage.APPLICATION__ICONS:
-				return icons != null && !icons.isEmpty();
-			case ApplicationPackage.APPLICATION__MODULES:
-				return modules != null && !modules.isEmpty();
-			case ApplicationPackage.APPLICATION__SECURITY_ROLES:
-				return securityRoles != null && !securityRoles.isEmpty();
-			case ApplicationPackage.APPLICATION__LIBRARY_DIRECTORY:
-				return LIBRARY_DIRECTORY_EDEFAULT == null ? libraryDirectory != null : !LIBRARY_DIRECTORY_EDEFAULT.equals(libraryDirectory);
-			case ApplicationPackage.APPLICATION__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case ApplicationPackage.APPLICATION__VERSION:
-				return isSetVersion();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (libraryDirectory: "); //$NON-NLS-1$
-		result.append(libraryDirectory);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(", version: "); //$NON-NLS-1$
-		if (versionESet) result.append(version); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(')');
-		return result.toString();
-	}
-
-	/**
-	 * Gets the first module matching the specified uri
-	 * @param uri The uri of a module to find.
-	 * @return The first matching module or null if no module is found.
-	 */
-	public Module getFirstModule(String uri){
-		if (uri == null) return null;
-		java.util.Iterator allModules = getModules().iterator();
-		while (allModules.hasNext()){
-			Module aModule = (Module)allModules.next();
-			if(uri.equals(aModule.getUri())) return aModule;
-		}
-		return null;
-	}
-
-	public Module getModule(String uri, String altDD) {
-		List allModules = getModules();
-		for (int i = 0; i < allModules.size(); i++) {
-			Module aModule = (Module) allModules.get(i);
-			if (StringUtil.stringsEqual(uri, aModule.getUri()) && StringUtil.stringsEqual(altDD, aModule.getAltDd()))
-				return aModule;
-		}
-		return null;
-	}
-
-	public List getEARModules() {
-		return getModules();
-	}
-
-	public ICommonModule getFirstEARModule(String uri) {
-		return (ICommonModule) getFirstModule(uri);
-	}
-
-} //ApplicationImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/impl/ApplicationPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/impl/ApplicationPackageImpl.java
deleted file mode 100644
index 93108bb95..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/impl/ApplicationPackageImpl.java
+++ /dev/null
@@ -1,725 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.application.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.emf.ecore.xml.type.XMLTypePackage;
-
-import org.eclipse.jst.javaee.application.Application;
-import org.eclipse.jst.javaee.application.ApplicationDeploymentDescriptor;
-import org.eclipse.jst.javaee.application.ApplicationFactory;
-import org.eclipse.jst.javaee.application.Module;
-import org.eclipse.jst.javaee.application.Web;
-
-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.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;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class ApplicationPackageImpl extends EPackageImpl implements ApplicationPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass applicationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass applicationDeploymentDescriptorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass moduleEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass webEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>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.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private ApplicationPackageImpl() {
-		super(eNS_URI, ApplicationFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> 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.
-	 * <p>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.
-	 * <p>Invocation of this method will not affect any packages that have
-	 * already been initialized.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static ApplicationPackage init() {
-		if (isInited) return (ApplicationPackage)EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI);
-
-		// Obtain or create and register package
-		ApplicationPackageImpl theApplicationPackage = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof ApplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new ApplicationPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		XMLNamespacePackage.eINSTANCE.eClass();
-		XMLTypePackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		WebPackageImpl theWebPackage = (WebPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebPackage.eNS_URI) instanceof WebPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebPackage.eNS_URI) : WebPackage.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);
-		JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) instanceof JspPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) : JspPackage.eINSTANCE);
-
-		// Create package meta-data objects
-		theApplicationPackage.createPackageContents();
-		theWebPackage.createPackageContents();
-		theJavaeePackage.createPackageContents();
-		theEjbPackage.createPackageContents();
-		theApplicationclientPackage.createPackageContents();
-		theJspPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theApplicationPackage.initializePackageContents();
-		theWebPackage.initializePackageContents();
-		theJavaeePackage.initializePackageContents();
-		theEjbPackage.initializePackageContents();
-		theApplicationclientPackage.initializePackageContents();
-		theJspPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theApplicationPackage.freeze();
-
-		return theApplicationPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getApplication() {
-		return applicationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getApplication_Descriptions() {
-		return (EReference)applicationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getApplication_DisplayNames() {
-		return (EReference)applicationEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getApplication_Icons() {
-		return (EReference)applicationEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getApplication_Modules() {
-		return (EReference)applicationEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getApplication_SecurityRoles() {
-		return (EReference)applicationEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getApplication_LibraryDirectory() {
-		return (EAttribute)applicationEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getApplication_Id() {
-		return (EAttribute)applicationEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getApplication_Version() {
-		return (EAttribute)applicationEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getApplicationDeploymentDescriptor() {
-		return applicationDeploymentDescriptorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getApplicationDeploymentDescriptor_Mixed() {
-		return (EAttribute)applicationDeploymentDescriptorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getApplicationDeploymentDescriptor_XMLNSPrefixMap() {
-		return (EReference)applicationDeploymentDescriptorEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getApplicationDeploymentDescriptor_XSISchemaLocation() {
-		return (EReference)applicationDeploymentDescriptorEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getApplicationDeploymentDescriptor_Application() {
-		return (EReference)applicationDeploymentDescriptorEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getModule() {
-		return moduleEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getModule_Connector() {
-		return (EAttribute)moduleEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getModule_Ejb() {
-		return (EAttribute)moduleEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getModule_Java() {
-		return (EAttribute)moduleEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getModule_Web() {
-		return (EReference)moduleEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getModule_AltDd() {
-		return (EAttribute)moduleEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getModule_Id() {
-		return (EAttribute)moduleEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getWeb() {
-		return webEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWeb_WebUri() {
-		return (EAttribute)webEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWeb_ContextRoot() {
-		return (EAttribute)webEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWeb_Id() {
-		return (EAttribute)webEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ApplicationFactory getApplicationFactory() {
-		return (ApplicationFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @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.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		applicationEClass = createEClass(APPLICATION);
-		createEReference(applicationEClass, APPLICATION__DESCRIPTIONS);
-		createEReference(applicationEClass, APPLICATION__DISPLAY_NAMES);
-		createEReference(applicationEClass, APPLICATION__ICONS);
-		createEReference(applicationEClass, APPLICATION__MODULES);
-		createEReference(applicationEClass, APPLICATION__SECURITY_ROLES);
-		createEAttribute(applicationEClass, APPLICATION__LIBRARY_DIRECTORY);
-		createEAttribute(applicationEClass, APPLICATION__ID);
-		createEAttribute(applicationEClass, APPLICATION__VERSION);
-
-		applicationDeploymentDescriptorEClass = createEClass(APPLICATION_DEPLOYMENT_DESCRIPTOR);
-		createEAttribute(applicationDeploymentDescriptorEClass, APPLICATION_DEPLOYMENT_DESCRIPTOR__MIXED);
-		createEReference(applicationDeploymentDescriptorEClass, APPLICATION_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP);
-		createEReference(applicationDeploymentDescriptorEClass, APPLICATION_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION);
-		createEReference(applicationDeploymentDescriptorEClass, APPLICATION_DEPLOYMENT_DESCRIPTOR__APPLICATION);
-
-		moduleEClass = createEClass(MODULE);
-		createEAttribute(moduleEClass, MODULE__CONNECTOR);
-		createEAttribute(moduleEClass, MODULE__EJB);
-		createEAttribute(moduleEClass, MODULE__JAVA);
-		createEReference(moduleEClass, MODULE__WEB);
-		createEAttribute(moduleEClass, MODULE__ALT_DD);
-		createEAttribute(moduleEClass, MODULE__ID);
-
-		webEClass = createEClass(WEB);
-		createEAttribute(webEClass, WEB__WEB_URI);
-		createEAttribute(webEClass, WEB__CONTEXT_ROOT);
-		createEAttribute(webEClass, WEB__ID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @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.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @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);
-
-		// Add supertypes to classes
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(applicationEClass, Application.class, "Application", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getApplication_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getApplication_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getApplication_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getApplication_Modules(), this.getModule(), null, "modules", null, 1, -1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getApplication_SecurityRoles(), theJavaeePackage.getSecurityRole(), null, "securityRoles", null, 0, -1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getApplication_LibraryDirectory(), theJavaeePackage.getPathType(), "libraryDirectory", null, 0, 1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getApplication_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getApplication_Version(), theJavaeePackage.getDeweyVersionType(), "version", "5", 1, 1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
-		initEClass(applicationDeploymentDescriptorEClass, ApplicationDeploymentDescriptor.class, "ApplicationDeploymentDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getApplicationDeploymentDescriptor_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(getApplicationDeploymentDescriptor_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(getApplicationDeploymentDescriptor_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(getApplicationDeploymentDescriptor_Application(), this.getApplication(), null, "application", 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(moduleEClass, Module.class, "Module", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getModule_Connector(), theJavaeePackage.getPathType(), "connector", null, 0, 1, Module.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getModule_Ejb(), theJavaeePackage.getPathType(), "ejb", null, 0, 1, Module.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getModule_Java(), theJavaeePackage.getPathType(), "java", null, 0, 1, Module.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getModule_Web(), this.getWeb(), null, "web", null, 0, 1, Module.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getModule_AltDd(), theJavaeePackage.getPathType(), "altDd", null, 0, 1, Module.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getModule_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, Module.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(webEClass, Web.class, "Web", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getWeb_WebUri(), theJavaeePackage.getPathType(), "webUri", null, 1, 1, Web.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getWeb_ContextRoot(), theXMLTypePackage.getToken(), "contextRoot", null, 1, 1, Web.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getWeb_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, Web.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !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 <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void createExtendedMetaDataAnnotations() {
-		String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$				
-		addAnnotation
-		  (applicationEClass, 
-		   source, 
-		   new String[] {
-			 "name", "applicationType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getApplication_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
-		  (getApplication_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
-		  (getApplication_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
-		  (getApplication_Modules(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "module", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getApplication_SecurityRoles(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "security-role", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getApplication_LibraryDirectory(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "library-directory", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getApplication_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getApplication_Version(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "version" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (applicationDeploymentDescriptorEClass, 
-		   source, 
-		   new String[] {
-			 "name", "", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "mixed" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getApplicationDeploymentDescriptor_Mixed(), 
-		   source, 
-		   new String[] {
-			 "kind", "elementWildcard", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", ":mixed" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getApplicationDeploymentDescriptor_XMLNSPrefixMap(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "xmlns:prefix" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getApplicationDeploymentDescriptor_XSISchemaLocation(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "xsi:schemaLocation" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getApplicationDeploymentDescriptor_Application(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "application", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (moduleEClass, 
-		   source, 
-		   new String[] {
-			 "name", "moduleType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getModule_Connector(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "connector", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getModule_Ejb(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ejb", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getModule_Java(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "java", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getModule_Web(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "web", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getModule_AltDd(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "alt-dd", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getModule_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (webEClass, 
-		   source, 
-		   new String[] {
-			 "name", "webType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getWeb_WebUri(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "web-uri", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getWeb_ContextRoot(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "context-root", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getWeb_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });
-	}
-
-} //ApplicationPackageImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/impl/ModuleImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/impl/ModuleImpl.java
deleted file mode 100644
index c5b254266..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/impl/ModuleImpl.java
+++ /dev/null
@@ -1,506 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.application.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.application.Module;
-import org.eclipse.jst.javaee.application.Web;
-import org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage;
-import org.eclipse.jst.jee.application.ICommonModule;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Module</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.application.internal.impl.ModuleImpl#getConnector <em>Connector</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.application.internal.impl.ModuleImpl#getEjb <em>Ejb</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.application.internal.impl.ModuleImpl#getJava <em>Java</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.application.internal.impl.ModuleImpl#getWeb <em>Web</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.application.internal.impl.ModuleImpl#getAltDd <em>Alt Dd</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.application.internal.impl.ModuleImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ModuleImpl extends EObjectImpl implements Module, ICommonModule {
-	/**
-	 * The default value of the '{@link #getConnector() <em>Connector</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConnector()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CONNECTOR_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getConnector() <em>Connector</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConnector()
-	 * @generated
-	 * @ordered
-	 */
-	protected String connector = CONNECTOR_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getEjb() <em>Ejb</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjb()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EJB_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getEjb() <em>Ejb</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjb()
-	 * @generated
-	 * @ordered
-	 */
-	protected String ejb = EJB_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getJava() <em>Java</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getJava()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String JAVA_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getJava() <em>Java</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getJava()
-	 * @generated
-	 * @ordered
-	 */
-	protected String java = JAVA_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getWeb() <em>Web</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWeb()
-	 * @generated
-	 * @ordered
-	 */
-	protected Web web = null;
-
-	/**
-	 * The default value of the '{@link #getAltDd() <em>Alt Dd</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAltDd()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ALT_DD_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAltDd() <em>Alt Dd</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAltDd()
-	 * @generated
-	 * @ordered
-	 */
-	protected String altDd = ALT_DD_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ModuleImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return ApplicationPackage.Literals.MODULE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getConnector() {
-		return connector;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setConnector(String newConnector) {
-		String oldConnector = connector;
-		connector = newConnector;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ApplicationPackage.MODULE__CONNECTOR, oldConnector, connector));
-	}
-	// Returns the uri of the given module type
-	public String getUri() {
-		if (eIsSet(ApplicationPackage.MODULE__EJB))
-			return getEjb();
-		else if (eIsSet(ApplicationPackage.MODULE__CONNECTOR))
-			return getConnector();
-		else if (eIsSet(ApplicationPackage.MODULE__JAVA))
-			return getJava();
-		else if (eIsSet(ApplicationPackage.MODULE__WEB))
-			return getWeb().getWebUri();
-		return null;
-		
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getEjb() {
-		return ejb;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEjb(String newEjb) {
-		String oldEjb = ejb;
-		ejb = newEjb;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ApplicationPackage.MODULE__EJB, oldEjb, ejb));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getJava() {
-		return java;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setJava(String newJava) {
-		String oldJava = java;
-		java = newJava;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ApplicationPackage.MODULE__JAVA, oldJava, java));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Web getWeb() {
-		return web;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetWeb(Web newWeb, NotificationChain msgs) {
-		Web oldWeb = web;
-		web = newWeb;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ApplicationPackage.MODULE__WEB, oldWeb, newWeb);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setWeb(Web newWeb) {
-		if (newWeb != web) {
-			NotificationChain msgs = null;
-			if (web != null)
-				msgs = ((InternalEObject)web).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ApplicationPackage.MODULE__WEB, null, msgs);
-			if (newWeb != null)
-				msgs = ((InternalEObject)newWeb).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ApplicationPackage.MODULE__WEB, null, msgs);
-			msgs = basicSetWeb(newWeb, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ApplicationPackage.MODULE__WEB, newWeb, newWeb));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getAltDd() {
-		return altDd;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAltDd(String newAltDd) {
-		String oldAltDd = altDd;
-		altDd = newAltDd;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ApplicationPackage.MODULE__ALT_DD, oldAltDd, altDd));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ApplicationPackage.MODULE__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case ApplicationPackage.MODULE__WEB:
-				return basicSetWeb(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ApplicationPackage.MODULE__CONNECTOR:
-				return getConnector();
-			case ApplicationPackage.MODULE__EJB:
-				return getEjb();
-			case ApplicationPackage.MODULE__JAVA:
-				return getJava();
-			case ApplicationPackage.MODULE__WEB:
-				return getWeb();
-			case ApplicationPackage.MODULE__ALT_DD:
-				return getAltDd();
-			case ApplicationPackage.MODULE__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ApplicationPackage.MODULE__CONNECTOR:
-				setConnector((String)newValue);
-				return;
-			case ApplicationPackage.MODULE__EJB:
-				setEjb((String)newValue);
-				return;
-			case ApplicationPackage.MODULE__JAVA:
-				setJava((String)newValue);
-				return;
-			case ApplicationPackage.MODULE__WEB:
-				setWeb((Web)newValue);
-				return;
-			case ApplicationPackage.MODULE__ALT_DD:
-				setAltDd((String)newValue);
-				return;
-			case ApplicationPackage.MODULE__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ApplicationPackage.MODULE__CONNECTOR:
-				setConnector(CONNECTOR_EDEFAULT);
-				return;
-			case ApplicationPackage.MODULE__EJB:
-				setEjb(EJB_EDEFAULT);
-				return;
-			case ApplicationPackage.MODULE__JAVA:
-				setJava(JAVA_EDEFAULT);
-				return;
-			case ApplicationPackage.MODULE__WEB:
-				setWeb((Web)null);
-				return;
-			case ApplicationPackage.MODULE__ALT_DD:
-				setAltDd(ALT_DD_EDEFAULT);
-				return;
-			case ApplicationPackage.MODULE__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ApplicationPackage.MODULE__CONNECTOR:
-				return CONNECTOR_EDEFAULT == null ? connector != null : !CONNECTOR_EDEFAULT.equals(connector);
-			case ApplicationPackage.MODULE__EJB:
-				return EJB_EDEFAULT == null ? ejb != null : !EJB_EDEFAULT.equals(ejb);
-			case ApplicationPackage.MODULE__JAVA:
-				return JAVA_EDEFAULT == null ? java != null : !JAVA_EDEFAULT.equals(java);
-			case ApplicationPackage.MODULE__WEB:
-				return web != null;
-			case ApplicationPackage.MODULE__ALT_DD:
-				return ALT_DD_EDEFAULT == null ? altDd != null : !ALT_DD_EDEFAULT.equals(altDd);
-			case ApplicationPackage.MODULE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (connector: "); //$NON-NLS-1$
-		result.append(connector);
-		result.append(", ejb: "); //$NON-NLS-1$
-		result.append(ejb);
-		result.append(", java: "); //$NON-NLS-1$
-		result.append(java);
-		result.append(", altDd: "); //$NON-NLS-1$
-		result.append(altDd);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-	public void setUri(String value) {
-		// TODO Auto-generated method stub
-		
-	}
-	public boolean isConnectorModule() {
-		if (eIsSet(ApplicationPackage.MODULE__CONNECTOR))
-			return true;
-		return false;
-	}
-	/* Returns false by default
-	 *
-	 */
-	public boolean isEjbModule() {
-		if (eIsSet(ApplicationPackage.MODULE__EJB) )
-			return true;
-		return false;
-	}
-	/* 
-	 * Returns false by default
-	 */
-	public boolean isJavaModule() {
-		if (eIsSet(ApplicationPackage.MODULE__JAVA))
-			return true;
-		return false;
-	}
-	/* 
-	 * Returns false by default
-	 */
-	public boolean isWebModule() {
-		if (eIsSet(ApplicationPackage.MODULE__WEB))
-			return true;
-		return false;
-	}	
-
-} //ModuleImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/impl/WebImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/impl/WebImpl.java
deleted file mode 100644
index 7e911c7fc..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/impl/WebImpl.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.application.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.application.Web;
-
-import org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Web</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.application.internal.impl.WebImpl#getWebUri <em>Web Uri</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.application.internal.impl.WebImpl#getContextRoot <em>Context Root</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.application.internal.impl.WebImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class WebImpl extends EObjectImpl implements Web {
-	/**
-	 * The default value of the '{@link #getWebUri() <em>Web Uri</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWebUri()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String WEB_URI_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getWebUri() <em>Web Uri</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWebUri()
-	 * @generated
-	 * @ordered
-	 */
-	protected String webUri = WEB_URI_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getContextRoot() <em>Context Root</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getContextRoot()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CONTEXT_ROOT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getContextRoot() <em>Context Root</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getContextRoot()
-	 * @generated
-	 * @ordered
-	 */
-	protected String contextRoot = CONTEXT_ROOT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected WebImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return ApplicationPackage.Literals.WEB;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getWebUri() {
-		return webUri;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setWebUri(String newWebUri) {
-		String oldWebUri = webUri;
-		webUri = newWebUri;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ApplicationPackage.WEB__WEB_URI, oldWebUri, webUri));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getContextRoot() {
-		return contextRoot;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setContextRoot(String newContextRoot) {
-		String oldContextRoot = contextRoot;
-		contextRoot = newContextRoot;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ApplicationPackage.WEB__CONTEXT_ROOT, oldContextRoot, contextRoot));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ApplicationPackage.WEB__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ApplicationPackage.WEB__WEB_URI:
-				return getWebUri();
-			case ApplicationPackage.WEB__CONTEXT_ROOT:
-				return getContextRoot();
-			case ApplicationPackage.WEB__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ApplicationPackage.WEB__WEB_URI:
-				setWebUri((String)newValue);
-				return;
-			case ApplicationPackage.WEB__CONTEXT_ROOT:
-				setContextRoot((String)newValue);
-				return;
-			case ApplicationPackage.WEB__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ApplicationPackage.WEB__WEB_URI:
-				setWebUri(WEB_URI_EDEFAULT);
-				return;
-			case ApplicationPackage.WEB__CONTEXT_ROOT:
-				setContextRoot(CONTEXT_ROOT_EDEFAULT);
-				return;
-			case ApplicationPackage.WEB__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ApplicationPackage.WEB__WEB_URI:
-				return WEB_URI_EDEFAULT == null ? webUri != null : !WEB_URI_EDEFAULT.equals(webUri);
-			case ApplicationPackage.WEB__CONTEXT_ROOT:
-				return CONTEXT_ROOT_EDEFAULT == null ? contextRoot != null : !CONTEXT_ROOT_EDEFAULT.equals(contextRoot);
-			case ApplicationPackage.WEB__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (webUri: "); //$NON-NLS-1$
-		result.append(webUri);
-		result.append(", contextRoot: "); //$NON-NLS-1$
-		result.append(contextRoot);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //WebImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/metadata/ApplicationPackage.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/metadata/ApplicationPackage.java
deleted file mode 100644
index b50c0b2e3..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/metadata/ApplicationPackage.java
+++ /dev/null
@@ -1,1098 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.application.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;
-import org.eclipse.jst.javaee.application.ApplicationFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> 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>
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * 
- *       @(#)application_5.xsds	1.17 08/05/05
- *     
- * 
- * 
- *       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.
- * 
- *     
- * 
- *       
- * 
- * 	This is the XML Schema for the application 5 deployment
- * 	descriptor.  The deployment descriptor must be named
- * 	"META-INF/application.xml" in the application's ear file.
- * 	All application deployment descriptors must indicate
- * 	the application schema by using the Java EE namespace:
- * 
- * 	http://java.sun.com/xml/ns/javaee
- * 
- * 	and indicate the version of the schema by
- * 	using the version element as shown below:
- * 
- * 	    &lt;application xmlns="http://java.sun.com/xml/ns/javaee"
- * 	      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- * 	      xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- * 		http://java.sun.com/xml/ns/javaee/application_5.xsd"
- * 	      version="5"&gt;
- * 	      ...
- * 	    &lt;/application&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/application_5.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
- *     
- * 
- * 
- *       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.
- * 
- *     
- * 
- * 
- * 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
- *     
- * 
- * 
- *       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.
- * 
- *     
- * 
- * 
- *       (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:
- * 
- *     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.
- *   
- *     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
- *   
- * 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.
- * 
- *         &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.
- *   
- * <!-- end-model-doc -->
- * @see org.eclipse.jst.javaee.application.ApplicationFactory
- * @generated
- */
-public interface ApplicationPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "application"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	String eNS_URI = "http://java.sun.com/xml/ns/javaee/application_5.xsd"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "application"; //$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	ApplicationPackage eINSTANCE = org.eclipse.jst.javaee.application.internal.impl.ApplicationPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.application.internal.impl.ApplicationImpl <em>Application</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.application.internal.impl.ApplicationImpl
-	 * @see org.eclipse.jst.javaee.application.internal.impl.ApplicationPackageImpl#getApplication()
-	 * @generated
-	 */
-	int APPLICATION = 0;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION__DESCRIPTIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION__DISPLAY_NAMES = 1;
-
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION__ICONS = 2;
-
-	/**
-	 * The feature id for the '<em><b>Modules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION__MODULES = 3;
-
-	/**
-	 * The feature id for the '<em><b>Security Roles</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION__SECURITY_ROLES = 4;
-
-	/**
-	 * The feature id for the '<em><b>Library Directory</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION__LIBRARY_DIRECTORY = 5;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION__ID = 6;
-
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION__VERSION = 7;
-
-	/**
-	 * The number of structural features of the '<em>Application</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_FEATURE_COUNT = 8;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.application.internal.impl.ApplicationDeploymentDescriptorImpl <em>Deployment Descriptor</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.application.internal.impl.ApplicationDeploymentDescriptorImpl
-	 * @see org.eclipse.jst.javaee.application.internal.impl.ApplicationPackageImpl#getApplicationDeploymentDescriptor()
-	 * @generated
-	 */
-	int APPLICATION_DEPLOYMENT_DESCRIPTOR = 1;
-
-	/**
-	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_DEPLOYMENT_DESCRIPTOR__MIXED = 0;
-
-	/**
-	 * The feature id for the '<em><b>XMLNS Prefix Map</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP = 1;
-
-	/**
-	 * The feature id for the '<em><b>XSI Schema Location</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION = 2;
-
-	/**
-	 * The feature id for the '<em><b>Application</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_DEPLOYMENT_DESCRIPTOR__APPLICATION = 3;
-
-	/**
-	 * The number of structural features of the '<em>Deployment Descriptor</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_DEPLOYMENT_DESCRIPTOR_FEATURE_COUNT = 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.application.internal.impl.ModuleImpl <em>Module</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.application.internal.impl.ModuleImpl
-	 * @see org.eclipse.jst.javaee.application.internal.impl.ApplicationPackageImpl#getModule()
-	 * @generated
-	 */
-	int MODULE = 2;
-
-	/**
-	 * The feature id for the '<em><b>Connector</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MODULE__CONNECTOR = 0;
-
-	/**
-	 * The feature id for the '<em><b>Ejb</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MODULE__EJB = 1;
-
-	/**
-	 * The feature id for the '<em><b>Java</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MODULE__JAVA = 2;
-
-	/**
-	 * The feature id for the '<em><b>Web</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MODULE__WEB = 3;
-
-	/**
-	 * The feature id for the '<em><b>Alt Dd</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MODULE__ALT_DD = 4;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MODULE__ID = 5;
-
-	/**
-	 * The number of structural features of the '<em>Module</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MODULE_FEATURE_COUNT = 6;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.application.internal.impl.WebImpl <em>Web</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.application.internal.impl.WebImpl
-	 * @see org.eclipse.jst.javaee.application.internal.impl.ApplicationPackageImpl#getWeb()
-	 * @generated
-	 */
-	int WEB = 3;
-
-	/**
-	 * The feature id for the '<em><b>Web Uri</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB__WEB_URI = 0;
-
-	/**
-	 * The feature id for the '<em><b>Context Root</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB__CONTEXT_ROOT = 1;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB__ID = 2;
-
-	/**
-	 * The number of structural features of the '<em>Web</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_FEATURE_COUNT = 3;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.application.Application <em>Application</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Application</em>'.
-	 * @see org.eclipse.jst.javaee.application.Application
-	 * @generated
-	 */
-	EClass getApplication();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.application.Application#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.javaee.application.Application#getDescriptions()
-	 * @see #getApplication()
-	 * @generated
-	 */
-	EReference getApplication_Descriptions();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.application.Application#getDisplayNames <em>Display Names</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Display Names</em>'.
-	 * @see org.eclipse.jst.javaee.application.Application#getDisplayNames()
-	 * @see #getApplication()
-	 * @generated
-	 */
-	EReference getApplication_DisplayNames();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.application.Application#getIcons <em>Icons</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Icons</em>'.
-	 * @see org.eclipse.jst.javaee.application.Application#getIcons()
-	 * @see #getApplication()
-	 * @generated
-	 */
-	EReference getApplication_Icons();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.application.Application#getModules <em>Modules</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Modules</em>'.
-	 * @see org.eclipse.jst.javaee.application.Application#getModules()
-	 * @see #getApplication()
-	 * @generated
-	 */
-	EReference getApplication_Modules();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.application.Application#getSecurityRoles <em>Security Roles</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Security Roles</em>'.
-	 * @see org.eclipse.jst.javaee.application.Application#getSecurityRoles()
-	 * @see #getApplication()
-	 * @generated
-	 */
-	EReference getApplication_SecurityRoles();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.application.Application#getLibraryDirectory <em>Library Directory</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Library Directory</em>'.
-	 * @see org.eclipse.jst.javaee.application.Application#getLibraryDirectory()
-	 * @see #getApplication()
-	 * @generated
-	 */
-	EAttribute getApplication_LibraryDirectory();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.application.Application#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.application.Application#getId()
-	 * @see #getApplication()
-	 * @generated
-	 */
-	EAttribute getApplication_Id();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.application.Application#getVersion <em>Version</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Version</em>'.
-	 * @see org.eclipse.jst.javaee.application.Application#getVersion()
-	 * @see #getApplication()
-	 * @generated
-	 */
-	EAttribute getApplication_Version();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.application.ApplicationDeploymentDescriptor <em>Deployment Descriptor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Deployment Descriptor</em>'.
-	 * @see org.eclipse.jst.javaee.application.ApplicationDeploymentDescriptor
-	 * @generated
-	 */
-	EClass getApplicationDeploymentDescriptor();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.application.ApplicationDeploymentDescriptor#getMixed <em>Mixed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Mixed</em>'.
-	 * @see org.eclipse.jst.javaee.application.ApplicationDeploymentDescriptor#getMixed()
-	 * @see #getApplicationDeploymentDescriptor()
-	 * @generated
-	 */
-	EAttribute getApplicationDeploymentDescriptor_Mixed();
-
-	/**
-	 * Returns the meta object for the map '{@link org.eclipse.jst.javaee.application.ApplicationDeploymentDescriptor#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the map '<em>XMLNS Prefix Map</em>'.
-	 * @see org.eclipse.jst.javaee.application.ApplicationDeploymentDescriptor#getXMLNSPrefixMap()
-	 * @see #getApplicationDeploymentDescriptor()
-	 * @generated
-	 */
-	EReference getApplicationDeploymentDescriptor_XMLNSPrefixMap();
-
-	/**
-	 * Returns the meta object for the map '{@link org.eclipse.jst.javaee.application.ApplicationDeploymentDescriptor#getXSISchemaLocation <em>XSI Schema Location</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the map '<em>XSI Schema Location</em>'.
-	 * @see org.eclipse.jst.javaee.application.ApplicationDeploymentDescriptor#getXSISchemaLocation()
-	 * @see #getApplicationDeploymentDescriptor()
-	 * @generated
-	 */
-	EReference getApplicationDeploymentDescriptor_XSISchemaLocation();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.application.ApplicationDeploymentDescriptor#getApplication <em>Application</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Application</em>'.
-	 * @see org.eclipse.jst.javaee.application.ApplicationDeploymentDescriptor#getApplication()
-	 * @see #getApplicationDeploymentDescriptor()
-	 * @generated
-	 */
-	EReference getApplicationDeploymentDescriptor_Application();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.application.Module <em>Module</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Module</em>'.
-	 * @see org.eclipse.jst.javaee.application.Module
-	 * @generated
-	 */
-	EClass getModule();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.application.Module#getConnector <em>Connector</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Connector</em>'.
-	 * @see org.eclipse.jst.javaee.application.Module#getConnector()
-	 * @see #getModule()
-	 * @generated
-	 */
-	EAttribute getModule_Connector();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.application.Module#getEjb <em>Ejb</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Ejb</em>'.
-	 * @see org.eclipse.jst.javaee.application.Module#getEjb()
-	 * @see #getModule()
-	 * @generated
-	 */
-	EAttribute getModule_Ejb();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.application.Module#getJava <em>Java</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Java</em>'.
-	 * @see org.eclipse.jst.javaee.application.Module#getJava()
-	 * @see #getModule()
-	 * @generated
-	 */
-	EAttribute getModule_Java();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.application.Module#getWeb <em>Web</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Web</em>'.
-	 * @see org.eclipse.jst.javaee.application.Module#getWeb()
-	 * @see #getModule()
-	 * @generated
-	 */
-	EReference getModule_Web();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.application.Module#getAltDd <em>Alt Dd</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Alt Dd</em>'.
-	 * @see org.eclipse.jst.javaee.application.Module#getAltDd()
-	 * @see #getModule()
-	 * @generated
-	 */
-	EAttribute getModule_AltDd();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.application.Module#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.application.Module#getId()
-	 * @see #getModule()
-	 * @generated
-	 */
-	EAttribute getModule_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.application.Web <em>Web</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Web</em>'.
-	 * @see org.eclipse.jst.javaee.application.Web
-	 * @generated
-	 */
-	EClass getWeb();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.application.Web#getWebUri <em>Web Uri</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Web Uri</em>'.
-	 * @see org.eclipse.jst.javaee.application.Web#getWebUri()
-	 * @see #getWeb()
-	 * @generated
-	 */
-	EAttribute getWeb_WebUri();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.application.Web#getContextRoot <em>Context Root</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Context Root</em>'.
-	 * @see org.eclipse.jst.javaee.application.Web#getContextRoot()
-	 * @see #getWeb()
-	 * @generated
-	 */
-	EAttribute getWeb_ContextRoot();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.application.Web#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.application.Web#getId()
-	 * @see #getWeb()
-	 * @generated
-	 */
-	EAttribute getWeb_Id();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	ApplicationFactory getApplicationFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * 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>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals  {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.application.internal.impl.ApplicationImpl <em>Application</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.application.internal.impl.ApplicationImpl
-		 * @see org.eclipse.jst.javaee.application.internal.impl.ApplicationPackageImpl#getApplication()
-		 * @generated
-		 */
-		EClass APPLICATION = eINSTANCE.getApplication();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference APPLICATION__DESCRIPTIONS = eINSTANCE.getApplication_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Display Names</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference APPLICATION__DISPLAY_NAMES = eINSTANCE.getApplication_DisplayNames();
-
-		/**
-		 * The meta object literal for the '<em><b>Icons</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference APPLICATION__ICONS = eINSTANCE.getApplication_Icons();
-
-		/**
-		 * The meta object literal for the '<em><b>Modules</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference APPLICATION__MODULES = eINSTANCE.getApplication_Modules();
-
-		/**
-		 * The meta object literal for the '<em><b>Security Roles</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference APPLICATION__SECURITY_ROLES = eINSTANCE.getApplication_SecurityRoles();
-
-		/**
-		 * The meta object literal for the '<em><b>Library Directory</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute APPLICATION__LIBRARY_DIRECTORY = eINSTANCE.getApplication_LibraryDirectory();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute APPLICATION__ID = eINSTANCE.getApplication_Id();
-
-		/**
-		 * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute APPLICATION__VERSION = eINSTANCE.getApplication_Version();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.application.internal.impl.ApplicationDeploymentDescriptorImpl <em>Deployment Descriptor</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.application.internal.impl.ApplicationDeploymentDescriptorImpl
-		 * @see org.eclipse.jst.javaee.application.internal.impl.ApplicationPackageImpl#getApplicationDeploymentDescriptor()
-		 * @generated
-		 */
-		EClass APPLICATION_DEPLOYMENT_DESCRIPTOR = eINSTANCE.getApplicationDeploymentDescriptor();
-
-		/**
-		 * The meta object literal for the '<em><b>Mixed</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute APPLICATION_DEPLOYMENT_DESCRIPTOR__MIXED = eINSTANCE.getApplicationDeploymentDescriptor_Mixed();
-
-		/**
-		 * The meta object literal for the '<em><b>XMLNS Prefix Map</b></em>' map feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference APPLICATION_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP = eINSTANCE.getApplicationDeploymentDescriptor_XMLNSPrefixMap();
-
-		/**
-		 * The meta object literal for the '<em><b>XSI Schema Location</b></em>' map feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference APPLICATION_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION = eINSTANCE.getApplicationDeploymentDescriptor_XSISchemaLocation();
-
-		/**
-		 * The meta object literal for the '<em><b>Application</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference APPLICATION_DEPLOYMENT_DESCRIPTOR__APPLICATION = eINSTANCE.getApplicationDeploymentDescriptor_Application();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.application.internal.impl.ModuleImpl <em>Module</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.application.internal.impl.ModuleImpl
-		 * @see org.eclipse.jst.javaee.application.internal.impl.ApplicationPackageImpl#getModule()
-		 * @generated
-		 */
-		EClass MODULE = eINSTANCE.getModule();
-
-		/**
-		 * The meta object literal for the '<em><b>Connector</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MODULE__CONNECTOR = eINSTANCE.getModule_Connector();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MODULE__EJB = eINSTANCE.getModule_Ejb();
-
-		/**
-		 * The meta object literal for the '<em><b>Java</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MODULE__JAVA = eINSTANCE.getModule_Java();
-
-		/**
-		 * The meta object literal for the '<em><b>Web</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MODULE__WEB = eINSTANCE.getModule_Web();
-
-		/**
-		 * The meta object literal for the '<em><b>Alt Dd</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MODULE__ALT_DD = eINSTANCE.getModule_AltDd();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MODULE__ID = eINSTANCE.getModule_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.application.internal.impl.WebImpl <em>Web</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.application.internal.impl.WebImpl
-		 * @see org.eclipse.jst.javaee.application.internal.impl.ApplicationPackageImpl#getWeb()
-		 * @generated
-		 */
-		EClass WEB = eINSTANCE.getWeb();
-
-		/**
-		 * The meta object literal for the '<em><b>Web Uri</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WEB__WEB_URI = eINSTANCE.getWeb_WebUri();
-
-		/**
-		 * The meta object literal for the '<em><b>Context Root</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WEB__CONTEXT_ROOT = eINSTANCE.getWeb_ContextRoot();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WEB__ID = eINSTANCE.getWeb_Id();
-
-	}
-
-} //ApplicationPackage
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/util/ApplicationAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/util/ApplicationAdapterFactory.java
deleted file mode 100644
index f5b432ced..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/util/ApplicationAdapterFactory.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.application.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.application.*;
-
-import org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage
- * @generated
- */
-public class ApplicationAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static ApplicationPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ApplicationAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = ApplicationPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ApplicationSwitch modelSwitch =
-		new ApplicationSwitch() {
-			public Object caseApplication(Application object) {
-				return createApplicationAdapter();
-			}
-			public Object caseApplicationDeploymentDescriptor(ApplicationDeploymentDescriptor object) {
-				return createApplicationDeploymentDescriptorAdapter();
-			}
-			public Object caseModule(Module object) {
-				return createModuleAdapter();
-			}
-			public Object caseWeb(Web object) {
-				return createWebAdapter();
-			}
-			public Object defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	public Adapter createAdapter(Notifier target) {
-		return (Adapter)modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.application.Application <em>Application</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.application.Application
-	 * @generated
-	 */
-	public Adapter createApplicationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.application.ApplicationDeploymentDescriptor <em>Deployment Descriptor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.application.ApplicationDeploymentDescriptor
-	 * @generated
-	 */
-	public Adapter createApplicationDeploymentDescriptorAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.application.Module <em>Module</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.application.Module
-	 * @generated
-	 */
-	public Adapter createModuleAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.application.Web <em>Web</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.application.Web
-	 * @generated
-	 */
-	public Adapter createWebAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //ApplicationAdapterFactory
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/util/ApplicationResourceFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/util/ApplicationResourceFactoryImpl.java
deleted file mode 100644
index a471abfa8..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/util/ApplicationResourceFactoryImpl.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.application.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;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource Factory</b> associated with the package.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.javaee.application.internal.util.ApplicationResourceImpl
- * @generated
- */
-public class ApplicationResourceFactoryImpl extends ResourceFactoryImpl {
-	/**
-	 * Creates an instance of the resource factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ApplicationResourceFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public Resource createResource(URI uri) {
-		XMLResource result = new ApplicationResourceImpl(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);
-//		XMLOptions xmlOptions = new XMLOptionsImpl();
-//
-//		xmlOptions.setProcessSchemaLocations(true);
-//		    
-//		result.getDefaultLoadOptions().put(XMLResource.OPTION_XML_OPTIONS, xmlOptions);
-		return result;
-	}
-
-} //ApplicationResourceFactoryImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/util/ApplicationResourceImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/util/ApplicationResourceImpl.java
deleted file mode 100644
index 6277f6c7c..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/util/ApplicationResourceImpl.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.application.internal.util;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.xmi.XMLHelper;
-import org.eclipse.emf.ecore.xmi.XMLLoad;
-import org.eclipse.jst.javaee.application.Application;
-import org.eclipse.jst.javaee.application.ApplicationDeploymentDescriptor;
-import org.eclipse.jst.javaee.application.IApplicationResource;
-import org.eclipse.jst.javaee.core.JEEXMLLoadImpl;
-import org.eclipse.jst.javaee.core.internal.util.JavaeeResourceImpl;
-import org.eclipse.wst.common.internal.emf.resource.IRootObjectResource;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource </b> associated with the package.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.javaee.application.internal.util.ApplicationResourceFactoryImpl
- * @generated
- */
-public class ApplicationResourceImpl extends JavaeeResourceImpl implements IRootObjectResource, IApplicationResource {
-	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param uri the URI of the new resource.
-	 * @generated
-	 */
-	public ApplicationResourceImpl(URI uri) {
-		super(uri);
-	}
-	protected XMLLoad createXMLLoad() {
-		 return new JEEXMLLoadImpl(createXMLHelper());
-	}
-
-	
-	protected XMLHelper createXMLHelper() {
-		
-		return new EarXMLHelperImpl(this);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.javaee.application.internal.util.IApplicationResource#getRootObject()
-	 */
-	public EObject getRootObject() {
-		if (contents == null || contents.isEmpty())
-			return null;
-		Object root = getContents().get(0);
-		if(root == null){
-			return null;
-		}
-		return (EObject)((ApplicationDeploymentDescriptor)root).getApplication();
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.javaee.application.internal.util.IApplicationResource#getApplication()
-	 */
-	public Application getApplication() {
-		return (Application)getRootObject();
-	}
-
-} //ApplicationResourceImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/util/ApplicationSwitch.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/util/ApplicationSwitch.java
deleted file mode 100644
index 915817204..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/util/ApplicationSwitch.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.application.internal.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.jst.javaee.application.*;
-
-import org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> 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.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage
- * @generated
- */
-public class ApplicationSwitch {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static ApplicationPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ApplicationSwitch() {
-		if (modelPackage == null) {
-			modelPackage = ApplicationPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	public Object 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.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage) {
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
-			List eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch((EClass)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.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case ApplicationPackage.APPLICATION: {
-				Application application = (Application)theEObject;
-				Object result = caseApplication(application);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ApplicationPackage.APPLICATION_DEPLOYMENT_DESCRIPTOR: {
-				ApplicationDeploymentDescriptor applicationDeploymentDescriptor = (ApplicationDeploymentDescriptor)theEObject;
-				Object result = caseApplicationDeploymentDescriptor(applicationDeploymentDescriptor);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ApplicationPackage.MODULE: {
-				Module module = (Module)theEObject;
-				Object result = caseModule(module);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ApplicationPackage.WEB: {
-				Web web = (Web)theEObject;
-				Object result = caseWeb(web);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Application</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Application</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseApplication(Application object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Deployment Descriptor</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Deployment Descriptor</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseApplicationDeploymentDescriptor(ApplicationDeploymentDescriptor object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Module</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Module</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseModule(Module object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Web</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Web</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWeb(Web object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	public Object defaultCase(EObject object) {
-		return null;
-	}
-
-} //ApplicationSwitch
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/util/ApplicationXMLProcessor.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/util/ApplicationXMLProcessor.java
deleted file mode 100644
index 2f5486754..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/util/ApplicationXMLProcessor.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.application.internal.util;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
-import org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage;
-
-/**
- * This class contains helper methods to serialize and deserialize XML documents
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ApplicationXMLProcessor extends XMLProcessor {
-	/**
-	 * Public constructor to instantiate the helper.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ApplicationXMLProcessor() {
-		super((EPackage.Registry.INSTANCE));
-		ApplicationPackage.eINSTANCE.eClass();
-	}
-	
-	/**
-	 * Register for "*" and "xml" file extensions the ApplicationResourceFactoryImpl factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Map getRegistrations() {
-		if (registrations == null) {
-			super.getRegistrations();
-			registrations.put(XML_EXTENSION, new ApplicationResourceFactoryImpl());
-			registrations.put(STAR_EXTENSION, new ApplicationResourceFactoryImpl());
-		}
-		return registrations;
-	}
-
-} //ApplicationXMLProcessor
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/util/EarXMLHelperImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/util/EarXMLHelperImpl.java
deleted file mode 100644
index ff3bef912..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/util/EarXMLHelperImpl.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.application.internal.util;
-
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage;
-import org.eclipse.jst.javaee.core.internal.util.JEEXMLHelperImpl;
-
-public class EarXMLHelperImpl extends JEEXMLHelperImpl {
-
-	public EarXMLHelperImpl(XMLResource resource) {
-		super(resource);
-		// TODO Auto-generated constructor stub
-	}
-
-	
-	public String getURI(String prefix) {
-		if (prefix != null && prefix.equals(""))
-			return ApplicationPackage.eNS_URI;
-		else
-			return super.getURI(prefix);
-	}
-	
-	protected String getQName(EPackage ePackage, String name, boolean mustHavePrefix)
-	  {
-	   String nsPrefix = getPrefix(ePackage, mustHavePrefix);
-	// Not using EE5 package namespace - default jee5 namespace is used
-	   if (nsPrefix.equals(ApplicationPackage.eNS_PREFIX)) 
-	    {
-	    	return name;
-	    }
-	    else return super.getQName(ePackage, name, mustHavePrefix);
-	  }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/ApplicationClient.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/ApplicationClient.java
deleted file mode 100644
index ec9c9be26..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/ApplicationClient.java
+++ /dev/null
@@ -1,431 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.applicationclient;
-
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Application Client</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getDisplayNames <em>Display Names</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getIcons <em>Icons</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getEnvEntries <em>Env Entries</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getEjbRefs <em>Ejb Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getServiceRefs <em>Service Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getResourceRefs <em>Resource Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getResourceEnvRefs <em>Resource Env Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getMessageDestinationRefs <em>Message Destination Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getPersistenceUnitRefs <em>Persistence Unit Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getPostConstructs <em>Post Constructs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getPreDestroys <em>Pre Destroys</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getCallbackHandler <em>Callback Handler</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getMessageDestinations <em>Message Destinations</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#isMetadataComplete <em>Metadata Complete</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getVersion <em>Version</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage#getApplicationClient()
- * @extends JavaEEObject
- * @generated
- */
-public interface ApplicationClient extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage#getApplicationClient_Descriptions()
-	 * @generated
-	 */
-	List getDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>Display Names</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.DisplayName}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Names</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Names</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage#getApplicationClient_DisplayNames()
-	 * @generated
-	 */
-	List getDisplayNames();
-
-	/**
-	 * Returns the value of the '<em><b>Icons</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Icon}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Icons</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Icons</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage#getApplicationClient_Icons()
-	 * @generated
-	 */
-	List getIcons();
-
-	/**
-	 * Returns the value of the '<em><b>Env Entries</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.EnvEntry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Env Entries</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Env Entries</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage#getApplicationClient_EnvEntries()
-	 * @generated
-	 */
-	List getEnvEntries();
-
-	/**
-	 * Returns the value of the '<em><b>Ejb Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.EjbRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ejb Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ejb Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage#getApplicationClient_EjbRefs()
-	 * @generated
-	 */
-	List getEjbRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Service Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.ServiceRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Service Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Service Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage#getApplicationClient_ServiceRefs()
-	 * @generated
-	 */
-	List getServiceRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Resource Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.ResourceRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Resource Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Resource Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage#getApplicationClient_ResourceRefs()
-	 * @generated
-	 */
-	List getResourceRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Resource Env Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.ResourceEnvRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Resource Env Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Resource Env Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage#getApplicationClient_ResourceEnvRefs()
-	 * @generated
-	 */
-	List getResourceEnvRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Message Destination Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.MessageDestinationRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Message Destination Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Message Destination Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage#getApplicationClient_MessageDestinationRefs()
-	 * @generated
-	 */
-	List getMessageDestinationRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Persistence Unit Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.PersistenceUnitRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Persistence Unit Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Persistence Unit Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage#getApplicationClient_PersistenceUnitRefs()
-	 * @generated
-	 */
-	List getPersistenceUnitRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Post Constructs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.LifecycleCallback}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Post Constructs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Post Constructs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage#getApplicationClient_PostConstructs()
-	 * @generated
-	 */
-	List getPostConstructs();
-
-	/**
-	 * Returns the value of the '<em><b>Pre Destroys</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.LifecycleCallback}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Pre Destroys</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Pre Destroys</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage#getApplicationClient_PreDestroys()
-	 * @generated
-	 */
-	List getPreDestroys();
-
-	/**
-	 * Returns the value of the '<em><b>Callback Handler</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The callback-handler element names a class provided by
-	 * 	    the application.  The class must have a no args
-	 * 	    constructor and must implement the
-	 * 	    javax.security.auth.callback.CallbackHandler
-	 * 	    interface.  The class will be instantiated by the
-	 * 	    application client container and used by the container
-	 * 	    to collect authentication information from the user.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Callback Handler</em>' attribute.
-	 * @see #setCallbackHandler(String)
-	 * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage#getApplicationClient_CallbackHandler()
-	 * @generated
-	 */
-	String getCallbackHandler();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getCallbackHandler <em>Callback Handler</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Callback Handler</em>' attribute.
-	 * @see #getCallbackHandler()
-	 * @generated
-	 */
-	void setCallbackHandler(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Message Destinations</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.MessageDestination}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Message Destinations</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Message Destinations</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage#getApplicationClient_MessageDestinations()
-	 * @generated
-	 */
-	List getMessageDestinations();
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage#getApplicationClient_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Metadata Complete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	  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.
-	 * 
-	 * 	
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Metadata Complete</em>' attribute.
-	 * @see #isSetMetadataComplete()
-	 * @see #unsetMetadataComplete()
-	 * @see #setMetadataComplete(boolean)
-	 * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage#getApplicationClient_MetadataComplete()
-	 * @generated
-	 */
-	boolean isMetadataComplete();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#isMetadataComplete <em>Metadata Complete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Metadata Complete</em>' attribute.
-	 * @see #isSetMetadataComplete()
-	 * @see #unsetMetadataComplete()
-	 * @see #isMetadataComplete()
-	 * @generated
-	 */
-	void setMetadataComplete(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#isMetadataComplete <em>Metadata Complete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetMetadataComplete()
-	 * @see #isMetadataComplete()
-	 * @see #setMetadataComplete(boolean)
-	 * @generated
-	 */
-	void unsetMetadataComplete();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#isMetadataComplete <em>Metadata Complete</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Metadata Complete</em>' attribute is set.
-	 * @see #unsetMetadataComplete()
-	 * @see #isMetadataComplete()
-	 * @see #setMetadataComplete(boolean)
-	 * @generated
-	 */
-	boolean isSetMetadataComplete();
-
-	/**
-	 * Returns the value of the '<em><b>Version</b></em>' attribute.
-	 * The default value is <code>"5"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	  The required value for the version is 5.
-	 * 
-	 * 	
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Version</em>' attribute.
-	 * @see #isSetVersion()
-	 * @see #unsetVersion()
-	 * @see #setVersion(String)
-	 * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage#getApplicationClient_Version()
-	 * @generated
-	 */
-	String getVersion();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getVersion <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Version</em>' attribute.
-	 * @see #isSetVersion()
-	 * @see #unsetVersion()
-	 * @see #getVersion()
-	 * @generated
-	 */
-	void setVersion(String value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getVersion <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetVersion()
-	 * @see #getVersion()
-	 * @see #setVersion(String)
-	 * @generated
-	 */
-	void unsetVersion();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getVersion <em>Version</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Version</em>' attribute is set.
-	 * @see #unsetVersion()
-	 * @see #getVersion()
-	 * @see #setVersion(String)
-	 * @generated
-	 */
-	boolean isSetVersion();
-
-} // ApplicationClient
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/ApplicationClientDeploymentDescriptor.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/ApplicationClientDeploymentDescriptor.java
deleted file mode 100644
index d683805e5..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/ApplicationClientDeploymentDescriptor.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.applicationclient;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Application Client Deployment Descriptor</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.applicationclient.ApplicationClientDeploymentDescriptor#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.applicationclient.ApplicationClientDeploymentDescriptor#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.applicationclient.ApplicationClientDeploymentDescriptor#getXSISchemaLocation <em>XSI Schema Location</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.applicationclient.ApplicationClientDeploymentDescriptor#getApplicationClient <em>Application Client</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage#getApplicationClientDeploymentDescriptor()
- * @extends JavaEEObject
- * @generated
- */
-public interface ApplicationClientDeploymentDescriptor extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Mixed</em>' attribute list.
-	 * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage#getApplicationClientDeploymentDescriptor_Mixed()
-	 * @generated
-	 */
-	FeatureMap getMixed();
-
-	/**
-	 * Returns the value of the '<em><b>XMLNS Prefix Map</b></em>' map.
-	 * The key is of type {@link java.lang.String},
-	 * and the value is of type {@link java.lang.String},
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>XMLNS Prefix Map</em>' map isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>XMLNS Prefix Map</em>' map.
-	 * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage#getApplicationClientDeploymentDescriptor_XMLNSPrefixMap()
-	 * @generated
-	 */
-	Map getXMLNSPrefixMap();
-
-	/**
-	 * Returns the value of the '<em><b>XSI Schema Location</b></em>' map.
-	 * The key is of type {@link java.lang.String},
-	 * and the value is of type {@link java.lang.String},
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>XSI Schema Location</em>' map isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>XSI Schema Location</em>' map.
-	 * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage#getApplicationClientDeploymentDescriptor_XSISchemaLocation()
-	 * @generated
-	 */
-	Map getXSISchemaLocation();
-
-	/**
-	 * Returns the value of the '<em><b>Application Client</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	The application-client element is the root element of an
-	 * 	application client deployment descriptor.  The application
-	 * 	client deployment descriptor describes the EJB components
-	 * 	and external resources referenced by the application
-	 * 	client.
-	 * 
-	 *       
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Application Client</em>' containment reference.
-	 * @see #setApplicationClient(ApplicationClient)
-	 * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage#getApplicationClientDeploymentDescriptor_ApplicationClient()
-	 * @generated
-	 */
-	ApplicationClient getApplicationClient();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.applicationclient.ApplicationClientDeploymentDescriptor#getApplicationClient <em>Application Client</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Application Client</em>' containment reference.
-	 * @see #getApplicationClient()
-	 * @generated
-	 */
-	void setApplicationClient(ApplicationClient value);
-
-} // ApplicationClientDeploymentDescriptor
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/ApplicationclientFactory.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/ApplicationclientFactory.java
deleted file mode 100644
index 26ebd4a8e..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/ApplicationclientFactory.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.applicationclient;
-
-import org.eclipse.emf.ecore.EFactory;
-
-import org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage
- * @generated
- */
-public interface ApplicationclientFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	ApplicationclientFactory eINSTANCE = org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationclientFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Application Client</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Application Client</em>'.
-	 * @generated
-	 */
-	ApplicationClient createApplicationClient();
-
-	/**
-	 * Returns a new object of class '<em>Application Client Deployment Descriptor</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Application Client Deployment Descriptor</em>'.
-	 * @generated
-	 */
-	ApplicationClientDeploymentDescriptor createApplicationClientDeploymentDescriptor();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	ApplicationclientPackage getApplicationclientPackage();
-
-} //ApplicationclientFactory
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/IApplicationClientResource.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/IApplicationClientResource.java
deleted file mode 100644
index f764185b8..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/IApplicationClientResource.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.eclipse.jst.javaee.applicationclient;
-
-import org.eclipse.emf.ecore.EObject;
-
-public interface IApplicationClientResource {
-
-	/**
-	 * Return the first element in the EList.
-	 */
-	public abstract EObject getRootObject();
-
-	/**
-	 * Return the ear
-	 */
-	public abstract ApplicationClient getApplicationClient();
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/impl/ApplicationClientDeploymentDescriptorImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/impl/ApplicationClientDeploymentDescriptorImpl.java
deleted file mode 100644
index 88c0e8a0b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/impl/ApplicationClientDeploymentDescriptorImpl.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.applicationclient.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.applicationclient.ApplicationClient;
-import org.eclipse.jst.javaee.applicationclient.ApplicationClientDeploymentDescriptor;
-
-import org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Application Client Deployment Descriptor</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientDeploymentDescriptorImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientDeploymentDescriptorImpl#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientDeploymentDescriptorImpl#getXSISchemaLocation <em>XSI Schema Location</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientDeploymentDescriptorImpl#getApplicationClient <em>Application Client</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ApplicationClientDeploymentDescriptorImpl extends EObjectImpl implements ApplicationClientDeploymentDescriptor {
-	/**
-	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMixed()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureMap mixed = null;
-
-	/**
-	 * The cached value of the '{@link #getXMLNSPrefixMap() <em>XMLNS Prefix Map</em>}' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getXMLNSPrefixMap()
-	 * @generated
-	 * @ordered
-	 */
-	protected EMap xMLNSPrefixMap = null;
-
-	/**
-	 * The cached value of the '{@link #getXSISchemaLocation() <em>XSI Schema Location</em>}' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getXSISchemaLocation()
-	 * @generated
-	 * @ordered
-	 */
-	protected EMap xSISchemaLocation = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ApplicationClientDeploymentDescriptorImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return ApplicationclientPackage.Literals.APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureMap getMixed() {
-		if (mixed == null) {
-			mixed = new BasicFeatureMap(this, ApplicationclientPackage.APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__MIXED);
-		}
-		return mixed;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Map getXMLNSPrefixMap() {
-		if (xMLNSPrefixMap == null) {
-			xMLNSPrefixMap = new EcoreEMap(EcorePackage.Literals.ESTRING_TO_STRING_MAP_ENTRY, EStringToStringMapEntryImpl.class, this, ApplicationclientPackage.APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP);
-		}
-		return xMLNSPrefixMap.map();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Map getXSISchemaLocation() {
-		if (xSISchemaLocation == null) {
-			xSISchemaLocation = new EcoreEMap(EcorePackage.Literals.ESTRING_TO_STRING_MAP_ENTRY, EStringToStringMapEntryImpl.class, this, ApplicationclientPackage.APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION);
-		}
-		return xSISchemaLocation.map();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ApplicationClient getApplicationClient() {
-		return (ApplicationClient)getMixed().get(ApplicationclientPackage.Literals.APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__APPLICATION_CLIENT, true);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetApplicationClient(ApplicationClient newApplicationClient, NotificationChain msgs) {
-		return ((FeatureMap.Internal)getMixed()).basicAdd(ApplicationclientPackage.Literals.APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__APPLICATION_CLIENT, newApplicationClient, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setApplicationClient(ApplicationClient newApplicationClient) {
-		((FeatureMap.Internal)getMixed()).set(ApplicationclientPackage.Literals.APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__APPLICATION_CLIENT, newApplicationClient);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case ApplicationclientPackage.APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__MIXED:
-				return ((InternalEList)getMixed()).basicRemove(otherEnd, msgs);
-			case ApplicationclientPackage.APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP:
-				return ((InternalEList)((EMap.InternalMapView)getXMLNSPrefixMap()).eMap()).basicRemove(otherEnd, msgs);
-			case ApplicationclientPackage.APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION:
-				return ((InternalEList)((EMap.InternalMapView)getXSISchemaLocation()).eMap()).basicRemove(otherEnd, msgs);
-			case ApplicationclientPackage.APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__APPLICATION_CLIENT:
-				return basicSetApplicationClient(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ApplicationclientPackage.APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__MIXED:
-				if (coreType) return getMixed();
-				return ((FeatureMap.Internal)getMixed()).getWrapper();
-			case ApplicationclientPackage.APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP:
-				if (coreType) return ((EMap.InternalMapView)getXMLNSPrefixMap()).eMap();
-				else return getXMLNSPrefixMap();
-			case ApplicationclientPackage.APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION:
-				if (coreType) return ((EMap.InternalMapView)getXSISchemaLocation()).eMap();
-				else return getXSISchemaLocation();
-			case ApplicationclientPackage.APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__APPLICATION_CLIENT:
-				return getApplicationClient();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ApplicationclientPackage.APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__MIXED:
-				((FeatureMap.Internal)getMixed()).set(newValue);
-				return;
-			case ApplicationclientPackage.APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP:
-				((EStructuralFeature.Setting)((EMap.InternalMapView)getXMLNSPrefixMap()).eMap()).set(newValue);
-				return;
-			case ApplicationclientPackage.APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION:
-				((EStructuralFeature.Setting)((EMap.InternalMapView)getXSISchemaLocation()).eMap()).set(newValue);
-				return;
-			case ApplicationclientPackage.APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__APPLICATION_CLIENT:
-				setApplicationClient((ApplicationClient)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ApplicationclientPackage.APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__MIXED:
-				getMixed().clear();
-				return;
-			case ApplicationclientPackage.APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP:
-				getXMLNSPrefixMap().clear();
-				return;
-			case ApplicationclientPackage.APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION:
-				getXSISchemaLocation().clear();
-				return;
-			case ApplicationclientPackage.APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__APPLICATION_CLIENT:
-				setApplicationClient((ApplicationClient)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ApplicationclientPackage.APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__MIXED:
-				return mixed != null && !mixed.isEmpty();
-			case ApplicationclientPackage.APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP:
-				return xMLNSPrefixMap != null && !xMLNSPrefixMap.isEmpty();
-			case ApplicationclientPackage.APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION:
-				return xSISchemaLocation != null && !xSISchemaLocation.isEmpty();
-			case ApplicationclientPackage.APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__APPLICATION_CLIENT:
-				return getApplicationClient() != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	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();
-	}
-
-} //ApplicationClientDeploymentDescriptorImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/impl/ApplicationClientImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/impl/ApplicationClientImpl.java
deleted file mode 100644
index 8b2b57c83..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/impl/ApplicationClientImpl.java
+++ /dev/null
@@ -1,898 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.applicationclient.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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jst.javaee.applicationclient.ApplicationClient;
-
-import org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage;
-
-import org.eclipse.jst.javaee.core.Description;
-import org.eclipse.jst.javaee.core.DisplayName;
-import org.eclipse.jst.javaee.core.EjbRef;
-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.MessageDestination;
-import org.eclipse.jst.javaee.core.MessageDestinationRef;
-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.ServiceRef;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Application Client</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientImpl#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientImpl#getDisplayNames <em>Display Names</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientImpl#getIcons <em>Icons</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientImpl#getEnvEntries <em>Env Entries</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientImpl#getEjbRefs <em>Ejb Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientImpl#getServiceRefs <em>Service Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientImpl#getResourceRefs <em>Resource Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientImpl#getResourceEnvRefs <em>Resource Env Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientImpl#getMessageDestinationRefs <em>Message Destination Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientImpl#getPersistenceUnitRefs <em>Persistence Unit Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientImpl#getPostConstructs <em>Post Constructs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientImpl#getPreDestroys <em>Pre Destroys</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientImpl#getCallbackHandler <em>Callback Handler</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientImpl#getMessageDestinations <em>Message Destinations</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientImpl#isMetadataComplete <em>Metadata Complete</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientImpl#getVersion <em>Version</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ApplicationClientImpl extends EObjectImpl implements ApplicationClient {
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayNames() <em>Display Names</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayNames()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList displayNames = null;
-
-	/**
-	 * The cached value of the '{@link #getIcons() <em>Icons</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIcons()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList icons = null;
-
-	/**
-	 * The cached value of the '{@link #getEnvEntries() <em>Env Entries</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEnvEntries()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList envEntries = null;
-
-	/**
-	 * The cached value of the '{@link #getEjbRefs() <em>Ejb Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList ejbRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getServiceRefs() <em>Service Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getServiceRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList serviceRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getResourceRefs() <em>Resource Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResourceRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList resourceRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getResourceEnvRefs() <em>Resource Env Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResourceEnvRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList resourceEnvRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getMessageDestinationRefs() <em>Message Destination Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessageDestinationRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList messageDestinationRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getPersistenceUnitRefs() <em>Persistence Unit Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPersistenceUnitRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList persistenceUnitRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getPostConstructs() <em>Post Constructs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPostConstructs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList postConstructs = null;
-
-	/**
-	 * The cached value of the '{@link #getPreDestroys() <em>Pre Destroys</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPreDestroys()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList preDestroys = null;
-
-	/**
-	 * The default value of the '{@link #getCallbackHandler() <em>Callback Handler</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCallbackHandler()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CALLBACK_HANDLER_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCallbackHandler() <em>Callback Handler</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCallbackHandler()
-	 * @generated
-	 * @ordered
-	 */
-	protected String callbackHandler = CALLBACK_HANDLER_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getMessageDestinations() <em>Message Destinations</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessageDestinations()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList messageDestinations = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isMetadataComplete() <em>Metadata Complete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMetadataComplete()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean METADATA_COMPLETE_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isMetadataComplete() <em>Metadata Complete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMetadataComplete()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean metadataComplete = METADATA_COMPLETE_EDEFAULT;
-
-	/**
-	 * This is true if the Metadata Complete attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean metadataCompleteESet = false;
-
-	/**
-	 * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VERSION_EDEFAULT = "5"; //$NON-NLS-1$
-
-	/**
-	 * The cached value of the '{@link #getVersion() <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected String version = VERSION_EDEFAULT;
-
-	/**
-	 * This is true if the Version attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean versionESet = false;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ApplicationClientImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return ApplicationclientPackage.Literals.APPLICATION_CLIENT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, ApplicationclientPackage.APPLICATION_CLIENT__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDisplayNames() {
-		if (displayNames == null) {
-			displayNames = new EObjectContainmentEList(DisplayName.class, this, ApplicationclientPackage.APPLICATION_CLIENT__DISPLAY_NAMES);
-		}
-		return displayNames;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getIcons() {
-		if (icons == null) {
-			icons = new EObjectContainmentEList(Icon.class, this, ApplicationclientPackage.APPLICATION_CLIENT__ICONS);
-		}
-		return icons;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getEnvEntries() {
-		if (envEntries == null) {
-			envEntries = new EObjectContainmentEList(EnvEntry.class, this, ApplicationclientPackage.APPLICATION_CLIENT__ENV_ENTRIES);
-		}
-		return envEntries;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getEjbRefs() {
-		if (ejbRefs == null) {
-			ejbRefs = new EObjectContainmentEList(EjbRef.class, this, ApplicationclientPackage.APPLICATION_CLIENT__EJB_REFS);
-		}
-		return ejbRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getServiceRefs() {
-		if (serviceRefs == null) {
-			serviceRefs = new EObjectContainmentEList(ServiceRef.class, this, ApplicationclientPackage.APPLICATION_CLIENT__SERVICE_REFS);
-		}
-		return serviceRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getResourceRefs() {
-		if (resourceRefs == null) {
-			resourceRefs = new EObjectContainmentEList(ResourceRef.class, this, ApplicationclientPackage.APPLICATION_CLIENT__RESOURCE_REFS);
-		}
-		return resourceRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getResourceEnvRefs() {
-		if (resourceEnvRefs == null) {
-			resourceEnvRefs = new EObjectContainmentEList(ResourceEnvRef.class, this, ApplicationclientPackage.APPLICATION_CLIENT__RESOURCE_ENV_REFS);
-		}
-		return resourceEnvRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getMessageDestinationRefs() {
-		if (messageDestinationRefs == null) {
-			messageDestinationRefs = new EObjectContainmentEList(MessageDestinationRef.class, this, ApplicationclientPackage.APPLICATION_CLIENT__MESSAGE_DESTINATION_REFS);
-		}
-		return messageDestinationRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPersistenceUnitRefs() {
-		if (persistenceUnitRefs == null) {
-			persistenceUnitRefs = new EObjectContainmentEList(PersistenceUnitRef.class, this, ApplicationclientPackage.APPLICATION_CLIENT__PERSISTENCE_UNIT_REFS);
-		}
-		return persistenceUnitRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPostConstructs() {
-		if (postConstructs == null) {
-			postConstructs = new EObjectContainmentEList(LifecycleCallback.class, this, ApplicationclientPackage.APPLICATION_CLIENT__POST_CONSTRUCTS);
-		}
-		return postConstructs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPreDestroys() {
-		if (preDestroys == null) {
-			preDestroys = new EObjectContainmentEList(LifecycleCallback.class, this, ApplicationclientPackage.APPLICATION_CLIENT__PRE_DESTROYS);
-		}
-		return preDestroys;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getCallbackHandler() {
-		return callbackHandler;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCallbackHandler(String newCallbackHandler) {
-		String oldCallbackHandler = callbackHandler;
-		callbackHandler = newCallbackHandler;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ApplicationclientPackage.APPLICATION_CLIENT__CALLBACK_HANDLER, oldCallbackHandler, callbackHandler));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getMessageDestinations() {
-		if (messageDestinations == null) {
-			messageDestinations = new EObjectContainmentEList(MessageDestination.class, this, ApplicationclientPackage.APPLICATION_CLIENT__MESSAGE_DESTINATIONS);
-		}
-		return messageDestinations;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ApplicationclientPackage.APPLICATION_CLIENT__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isMetadataComplete() {
-		return metadataComplete;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMetadataComplete(boolean newMetadataComplete) {
-		boolean oldMetadataComplete = metadataComplete;
-		metadataComplete = newMetadataComplete;
-		boolean oldMetadataCompleteESet = metadataCompleteESet;
-		metadataCompleteESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ApplicationclientPackage.APPLICATION_CLIENT__METADATA_COMPLETE, oldMetadataComplete, metadataComplete, !oldMetadataCompleteESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetMetadataComplete() {
-		boolean oldMetadataComplete = metadataComplete;
-		boolean oldMetadataCompleteESet = metadataCompleteESet;
-		metadataComplete = METADATA_COMPLETE_EDEFAULT;
-		metadataCompleteESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, ApplicationclientPackage.APPLICATION_CLIENT__METADATA_COMPLETE, oldMetadataComplete, METADATA_COMPLETE_EDEFAULT, oldMetadataCompleteESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetMetadataComplete() {
-		return metadataCompleteESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getVersion() {
-		return version;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setVersion(String newVersion) {
-		String oldVersion = version;
-		version = newVersion;
-		boolean oldVersionESet = versionESet;
-		versionESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ApplicationclientPackage.APPLICATION_CLIENT__VERSION, oldVersion, version, !oldVersionESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetVersion() {
-		String oldVersion = version;
-		boolean oldVersionESet = versionESet;
-		version = VERSION_EDEFAULT;
-		versionESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, ApplicationclientPackage.APPLICATION_CLIENT__VERSION, oldVersion, VERSION_EDEFAULT, oldVersionESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetVersion() {
-		return versionESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case ApplicationclientPackage.APPLICATION_CLIENT__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-			case ApplicationclientPackage.APPLICATION_CLIENT__DISPLAY_NAMES:
-				return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
-			case ApplicationclientPackage.APPLICATION_CLIENT__ICONS:
-				return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
-			case ApplicationclientPackage.APPLICATION_CLIENT__ENV_ENTRIES:
-				return ((InternalEList)getEnvEntries()).basicRemove(otherEnd, msgs);
-			case ApplicationclientPackage.APPLICATION_CLIENT__EJB_REFS:
-				return ((InternalEList)getEjbRefs()).basicRemove(otherEnd, msgs);
-			case ApplicationclientPackage.APPLICATION_CLIENT__SERVICE_REFS:
-				return ((InternalEList)getServiceRefs()).basicRemove(otherEnd, msgs);
-			case ApplicationclientPackage.APPLICATION_CLIENT__RESOURCE_REFS:
-				return ((InternalEList)getResourceRefs()).basicRemove(otherEnd, msgs);
-			case ApplicationclientPackage.APPLICATION_CLIENT__RESOURCE_ENV_REFS:
-				return ((InternalEList)getResourceEnvRefs()).basicRemove(otherEnd, msgs);
-			case ApplicationclientPackage.APPLICATION_CLIENT__MESSAGE_DESTINATION_REFS:
-				return ((InternalEList)getMessageDestinationRefs()).basicRemove(otherEnd, msgs);
-			case ApplicationclientPackage.APPLICATION_CLIENT__PERSISTENCE_UNIT_REFS:
-				return ((InternalEList)getPersistenceUnitRefs()).basicRemove(otherEnd, msgs);
-			case ApplicationclientPackage.APPLICATION_CLIENT__POST_CONSTRUCTS:
-				return ((InternalEList)getPostConstructs()).basicRemove(otherEnd, msgs);
-			case ApplicationclientPackage.APPLICATION_CLIENT__PRE_DESTROYS:
-				return ((InternalEList)getPreDestroys()).basicRemove(otherEnd, msgs);
-			case ApplicationclientPackage.APPLICATION_CLIENT__MESSAGE_DESTINATIONS:
-				return ((InternalEList)getMessageDestinations()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ApplicationclientPackage.APPLICATION_CLIENT__DESCRIPTIONS:
-				return getDescriptions();
-			case ApplicationclientPackage.APPLICATION_CLIENT__DISPLAY_NAMES:
-				return getDisplayNames();
-			case ApplicationclientPackage.APPLICATION_CLIENT__ICONS:
-				return getIcons();
-			case ApplicationclientPackage.APPLICATION_CLIENT__ENV_ENTRIES:
-				return getEnvEntries();
-			case ApplicationclientPackage.APPLICATION_CLIENT__EJB_REFS:
-				return getEjbRefs();
-			case ApplicationclientPackage.APPLICATION_CLIENT__SERVICE_REFS:
-				return getServiceRefs();
-			case ApplicationclientPackage.APPLICATION_CLIENT__RESOURCE_REFS:
-				return getResourceRefs();
-			case ApplicationclientPackage.APPLICATION_CLIENT__RESOURCE_ENV_REFS:
-				return getResourceEnvRefs();
-			case ApplicationclientPackage.APPLICATION_CLIENT__MESSAGE_DESTINATION_REFS:
-				return getMessageDestinationRefs();
-			case ApplicationclientPackage.APPLICATION_CLIENT__PERSISTENCE_UNIT_REFS:
-				return getPersistenceUnitRefs();
-			case ApplicationclientPackage.APPLICATION_CLIENT__POST_CONSTRUCTS:
-				return getPostConstructs();
-			case ApplicationclientPackage.APPLICATION_CLIENT__PRE_DESTROYS:
-				return getPreDestroys();
-			case ApplicationclientPackage.APPLICATION_CLIENT__CALLBACK_HANDLER:
-				return getCallbackHandler();
-			case ApplicationclientPackage.APPLICATION_CLIENT__MESSAGE_DESTINATIONS:
-				return getMessageDestinations();
-			case ApplicationclientPackage.APPLICATION_CLIENT__ID:
-				return getId();
-			case ApplicationclientPackage.APPLICATION_CLIENT__METADATA_COMPLETE:
-				return isMetadataComplete() ? Boolean.TRUE : Boolean.FALSE;
-			case ApplicationclientPackage.APPLICATION_CLIENT__VERSION:
-				return getVersion();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ApplicationclientPackage.APPLICATION_CLIENT__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case ApplicationclientPackage.APPLICATION_CLIENT__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				getDisplayNames().addAll((Collection)newValue);
-				return;
-			case ApplicationclientPackage.APPLICATION_CLIENT__ICONS:
-				getIcons().clear();
-				getIcons().addAll((Collection)newValue);
-				return;
-			case ApplicationclientPackage.APPLICATION_CLIENT__ENV_ENTRIES:
-				getEnvEntries().clear();
-				getEnvEntries().addAll((Collection)newValue);
-				return;
-			case ApplicationclientPackage.APPLICATION_CLIENT__EJB_REFS:
-				getEjbRefs().clear();
-				getEjbRefs().addAll((Collection)newValue);
-				return;
-			case ApplicationclientPackage.APPLICATION_CLIENT__SERVICE_REFS:
-				getServiceRefs().clear();
-				getServiceRefs().addAll((Collection)newValue);
-				return;
-			case ApplicationclientPackage.APPLICATION_CLIENT__RESOURCE_REFS:
-				getResourceRefs().clear();
-				getResourceRefs().addAll((Collection)newValue);
-				return;
-			case ApplicationclientPackage.APPLICATION_CLIENT__RESOURCE_ENV_REFS:
-				getResourceEnvRefs().clear();
-				getResourceEnvRefs().addAll((Collection)newValue);
-				return;
-			case ApplicationclientPackage.APPLICATION_CLIENT__MESSAGE_DESTINATION_REFS:
-				getMessageDestinationRefs().clear();
-				getMessageDestinationRefs().addAll((Collection)newValue);
-				return;
-			case ApplicationclientPackage.APPLICATION_CLIENT__PERSISTENCE_UNIT_REFS:
-				getPersistenceUnitRefs().clear();
-				getPersistenceUnitRefs().addAll((Collection)newValue);
-				return;
-			case ApplicationclientPackage.APPLICATION_CLIENT__POST_CONSTRUCTS:
-				getPostConstructs().clear();
-				getPostConstructs().addAll((Collection)newValue);
-				return;
-			case ApplicationclientPackage.APPLICATION_CLIENT__PRE_DESTROYS:
-				getPreDestroys().clear();
-				getPreDestroys().addAll((Collection)newValue);
-				return;
-			case ApplicationclientPackage.APPLICATION_CLIENT__CALLBACK_HANDLER:
-				setCallbackHandler((String)newValue);
-				return;
-			case ApplicationclientPackage.APPLICATION_CLIENT__MESSAGE_DESTINATIONS:
-				getMessageDestinations().clear();
-				getMessageDestinations().addAll((Collection)newValue);
-				return;
-			case ApplicationclientPackage.APPLICATION_CLIENT__ID:
-				setId((String)newValue);
-				return;
-			case ApplicationclientPackage.APPLICATION_CLIENT__METADATA_COMPLETE:
-				setMetadataComplete(((Boolean)newValue).booleanValue());
-				return;
-			case ApplicationclientPackage.APPLICATION_CLIENT__VERSION:
-				setVersion((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ApplicationclientPackage.APPLICATION_CLIENT__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case ApplicationclientPackage.APPLICATION_CLIENT__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				return;
-			case ApplicationclientPackage.APPLICATION_CLIENT__ICONS:
-				getIcons().clear();
-				return;
-			case ApplicationclientPackage.APPLICATION_CLIENT__ENV_ENTRIES:
-				getEnvEntries().clear();
-				return;
-			case ApplicationclientPackage.APPLICATION_CLIENT__EJB_REFS:
-				getEjbRefs().clear();
-				return;
-			case ApplicationclientPackage.APPLICATION_CLIENT__SERVICE_REFS:
-				getServiceRefs().clear();
-				return;
-			case ApplicationclientPackage.APPLICATION_CLIENT__RESOURCE_REFS:
-				getResourceRefs().clear();
-				return;
-			case ApplicationclientPackage.APPLICATION_CLIENT__RESOURCE_ENV_REFS:
-				getResourceEnvRefs().clear();
-				return;
-			case ApplicationclientPackage.APPLICATION_CLIENT__MESSAGE_DESTINATION_REFS:
-				getMessageDestinationRefs().clear();
-				return;
-			case ApplicationclientPackage.APPLICATION_CLIENT__PERSISTENCE_UNIT_REFS:
-				getPersistenceUnitRefs().clear();
-				return;
-			case ApplicationclientPackage.APPLICATION_CLIENT__POST_CONSTRUCTS:
-				getPostConstructs().clear();
-				return;
-			case ApplicationclientPackage.APPLICATION_CLIENT__PRE_DESTROYS:
-				getPreDestroys().clear();
-				return;
-			case ApplicationclientPackage.APPLICATION_CLIENT__CALLBACK_HANDLER:
-				setCallbackHandler(CALLBACK_HANDLER_EDEFAULT);
-				return;
-			case ApplicationclientPackage.APPLICATION_CLIENT__MESSAGE_DESTINATIONS:
-				getMessageDestinations().clear();
-				return;
-			case ApplicationclientPackage.APPLICATION_CLIENT__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case ApplicationclientPackage.APPLICATION_CLIENT__METADATA_COMPLETE:
-				unsetMetadataComplete();
-				return;
-			case ApplicationclientPackage.APPLICATION_CLIENT__VERSION:
-				unsetVersion();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ApplicationclientPackage.APPLICATION_CLIENT__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case ApplicationclientPackage.APPLICATION_CLIENT__DISPLAY_NAMES:
-				return displayNames != null && !displayNames.isEmpty();
-			case ApplicationclientPackage.APPLICATION_CLIENT__ICONS:
-				return icons != null && !icons.isEmpty();
-			case ApplicationclientPackage.APPLICATION_CLIENT__ENV_ENTRIES:
-				return envEntries != null && !envEntries.isEmpty();
-			case ApplicationclientPackage.APPLICATION_CLIENT__EJB_REFS:
-				return ejbRefs != null && !ejbRefs.isEmpty();
-			case ApplicationclientPackage.APPLICATION_CLIENT__SERVICE_REFS:
-				return serviceRefs != null && !serviceRefs.isEmpty();
-			case ApplicationclientPackage.APPLICATION_CLIENT__RESOURCE_REFS:
-				return resourceRefs != null && !resourceRefs.isEmpty();
-			case ApplicationclientPackage.APPLICATION_CLIENT__RESOURCE_ENV_REFS:
-				return resourceEnvRefs != null && !resourceEnvRefs.isEmpty();
-			case ApplicationclientPackage.APPLICATION_CLIENT__MESSAGE_DESTINATION_REFS:
-				return messageDestinationRefs != null && !messageDestinationRefs.isEmpty();
-			case ApplicationclientPackage.APPLICATION_CLIENT__PERSISTENCE_UNIT_REFS:
-				return persistenceUnitRefs != null && !persistenceUnitRefs.isEmpty();
-			case ApplicationclientPackage.APPLICATION_CLIENT__POST_CONSTRUCTS:
-				return postConstructs != null && !postConstructs.isEmpty();
-			case ApplicationclientPackage.APPLICATION_CLIENT__PRE_DESTROYS:
-				return preDestroys != null && !preDestroys.isEmpty();
-			case ApplicationclientPackage.APPLICATION_CLIENT__CALLBACK_HANDLER:
-				return CALLBACK_HANDLER_EDEFAULT == null ? callbackHandler != null : !CALLBACK_HANDLER_EDEFAULT.equals(callbackHandler);
-			case ApplicationclientPackage.APPLICATION_CLIENT__MESSAGE_DESTINATIONS:
-				return messageDestinations != null && !messageDestinations.isEmpty();
-			case ApplicationclientPackage.APPLICATION_CLIENT__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case ApplicationclientPackage.APPLICATION_CLIENT__METADATA_COMPLETE:
-				return isSetMetadataComplete();
-			case ApplicationclientPackage.APPLICATION_CLIENT__VERSION:
-				return isSetVersion();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (callbackHandler: "); //$NON-NLS-1$
-		result.append(callbackHandler);
-		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();
-	}
-
-} //ApplicationClientImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/impl/ApplicationclientFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/impl/ApplicationclientFactoryImpl.java
deleted file mode 100644
index b4d84efe8..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/impl/ApplicationclientFactoryImpl.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.applicationclient.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.applicationclient.*;
-
-import org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class ApplicationclientFactoryImpl extends EFactoryImpl implements ApplicationclientFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ApplicationclientFactory init() {
-		try {
-			ApplicationclientFactory theApplicationclientFactory = (ApplicationclientFactory)EPackage.Registry.INSTANCE.getEFactory("http://java.sun.com/xml/ns/javaee/applicationclient"); //$NON-NLS-1$ 
-			if (theApplicationclientFactory != null) {
-				return theApplicationclientFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new ApplicationclientFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ApplicationclientFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case ApplicationclientPackage.APPLICATION_CLIENT: return (EObject)createApplicationClient();
-			case ApplicationclientPackage.APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR: return (EObject)createApplicationClientDeploymentDescriptor();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ApplicationClient createApplicationClient() {
-		ApplicationClientImpl applicationClient = new ApplicationClientImpl();
-		return applicationClient;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ApplicationClientDeploymentDescriptor createApplicationClientDeploymentDescriptor() {
-		ApplicationClientDeploymentDescriptorImpl applicationClientDeploymentDescriptor = new ApplicationClientDeploymentDescriptorImpl();
-		return applicationClientDeploymentDescriptor;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ApplicationclientPackage getApplicationclientPackage() {
-		return (ApplicationclientPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	public static ApplicationclientPackage getPackage() {
-		return ApplicationclientPackage.eINSTANCE;
-	}
-
-} //ApplicationclientFactoryImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/impl/ApplicationclientPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/impl/ApplicationclientPackageImpl.java
deleted file mode 100644
index eddbd605f..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/impl/ApplicationclientPackageImpl.java
+++ /dev/null
@@ -1,670 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.applicationclient.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.emf.ecore.xml.type.XMLTypePackage;
-
-import org.eclipse.jst.javaee.application.internal.impl.ApplicationPackageImpl;
-
-import org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage;
-
-import org.eclipse.jst.javaee.applicationclient.ApplicationClient;
-import org.eclipse.jst.javaee.applicationclient.ApplicationClientDeploymentDescriptor;
-import org.eclipse.jst.javaee.applicationclient.ApplicationclientFactory;
-
-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.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;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class ApplicationclientPackageImpl extends EPackageImpl implements ApplicationclientPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass applicationClientEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass applicationClientDeploymentDescriptorEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>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.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private ApplicationclientPackageImpl() {
-		super(eNS_URI, ApplicationclientFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> 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.
-	 * <p>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.
-	 * <p>Invocation of this method will not affect any packages that have
-	 * already been initialized.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static ApplicationclientPackage init() {
-		if (isInited) return (ApplicationclientPackage)EPackage.Registry.INSTANCE.getEPackage(ApplicationclientPackage.eNS_URI);
-
-		// Obtain or create and register package
-		ApplicationclientPackageImpl theApplicationclientPackage = (ApplicationclientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof ApplicationclientPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new ApplicationclientPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		XMLNamespacePackage.eINSTANCE.eClass();
-		XMLTypePackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		WebPackageImpl theWebPackage = (WebPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebPackage.eNS_URI) instanceof WebPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebPackage.eNS_URI) : WebPackage.eINSTANCE);
-		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);
-		JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) instanceof JspPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) : JspPackage.eINSTANCE);
-
-		// Create package meta-data objects
-		theApplicationclientPackage.createPackageContents();
-		theWebPackage.createPackageContents();
-		theApplicationPackage.createPackageContents();
-		theJavaeePackage.createPackageContents();
-		theEjbPackage.createPackageContents();
-		theJspPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theApplicationclientPackage.initializePackageContents();
-		theWebPackage.initializePackageContents();
-		theApplicationPackage.initializePackageContents();
-		theJavaeePackage.initializePackageContents();
-		theEjbPackage.initializePackageContents();
-		theJspPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theApplicationclientPackage.freeze();
-
-		return theApplicationclientPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getApplicationClient() {
-		return applicationClientEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getApplicationClient_Descriptions() {
-		return (EReference)applicationClientEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getApplicationClient_DisplayNames() {
-		return (EReference)applicationClientEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getApplicationClient_Icons() {
-		return (EReference)applicationClientEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getApplicationClient_EnvEntries() {
-		return (EReference)applicationClientEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getApplicationClient_EjbRefs() {
-		return (EReference)applicationClientEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getApplicationClient_ServiceRefs() {
-		return (EReference)applicationClientEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getApplicationClient_ResourceRefs() {
-		return (EReference)applicationClientEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getApplicationClient_ResourceEnvRefs() {
-		return (EReference)applicationClientEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getApplicationClient_MessageDestinationRefs() {
-		return (EReference)applicationClientEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getApplicationClient_PersistenceUnitRefs() {
-		return (EReference)applicationClientEClass.getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getApplicationClient_PostConstructs() {
-		return (EReference)applicationClientEClass.getEStructuralFeatures().get(10);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getApplicationClient_PreDestroys() {
-		return (EReference)applicationClientEClass.getEStructuralFeatures().get(11);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getApplicationClient_CallbackHandler() {
-		return (EAttribute)applicationClientEClass.getEStructuralFeatures().get(12);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getApplicationClient_MessageDestinations() {
-		return (EReference)applicationClientEClass.getEStructuralFeatures().get(13);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getApplicationClient_Id() {
-		return (EAttribute)applicationClientEClass.getEStructuralFeatures().get(14);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getApplicationClient_MetadataComplete() {
-		return (EAttribute)applicationClientEClass.getEStructuralFeatures().get(15);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getApplicationClient_Version() {
-		return (EAttribute)applicationClientEClass.getEStructuralFeatures().get(16);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getApplicationClientDeploymentDescriptor() {
-		return applicationClientDeploymentDescriptorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getApplicationClientDeploymentDescriptor_Mixed() {
-		return (EAttribute)applicationClientDeploymentDescriptorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getApplicationClientDeploymentDescriptor_XMLNSPrefixMap() {
-		return (EReference)applicationClientDeploymentDescriptorEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getApplicationClientDeploymentDescriptor_XSISchemaLocation() {
-		return (EReference)applicationClientDeploymentDescriptorEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getApplicationClientDeploymentDescriptor_ApplicationClient() {
-		return (EReference)applicationClientDeploymentDescriptorEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ApplicationclientFactory getApplicationclientFactory() {
-		return (ApplicationclientFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @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.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		applicationClientEClass = createEClass(APPLICATION_CLIENT);
-		createEReference(applicationClientEClass, APPLICATION_CLIENT__DESCRIPTIONS);
-		createEReference(applicationClientEClass, APPLICATION_CLIENT__DISPLAY_NAMES);
-		createEReference(applicationClientEClass, APPLICATION_CLIENT__ICONS);
-		createEReference(applicationClientEClass, APPLICATION_CLIENT__ENV_ENTRIES);
-		createEReference(applicationClientEClass, APPLICATION_CLIENT__EJB_REFS);
-		createEReference(applicationClientEClass, APPLICATION_CLIENT__SERVICE_REFS);
-		createEReference(applicationClientEClass, APPLICATION_CLIENT__RESOURCE_REFS);
-		createEReference(applicationClientEClass, APPLICATION_CLIENT__RESOURCE_ENV_REFS);
-		createEReference(applicationClientEClass, APPLICATION_CLIENT__MESSAGE_DESTINATION_REFS);
-		createEReference(applicationClientEClass, APPLICATION_CLIENT__PERSISTENCE_UNIT_REFS);
-		createEReference(applicationClientEClass, APPLICATION_CLIENT__POST_CONSTRUCTS);
-		createEReference(applicationClientEClass, APPLICATION_CLIENT__PRE_DESTROYS);
-		createEAttribute(applicationClientEClass, APPLICATION_CLIENT__CALLBACK_HANDLER);
-		createEReference(applicationClientEClass, APPLICATION_CLIENT__MESSAGE_DESTINATIONS);
-		createEAttribute(applicationClientEClass, APPLICATION_CLIENT__ID);
-		createEAttribute(applicationClientEClass, APPLICATION_CLIENT__METADATA_COMPLETE);
-		createEAttribute(applicationClientEClass, APPLICATION_CLIENT__VERSION);
-
-		applicationClientDeploymentDescriptorEClass = createEClass(APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR);
-		createEAttribute(applicationClientDeploymentDescriptorEClass, APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__MIXED);
-		createEReference(applicationClientDeploymentDescriptorEClass, APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP);
-		createEReference(applicationClientDeploymentDescriptorEClass, APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION);
-		createEReference(applicationClientDeploymentDescriptorEClass, APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__APPLICATION_CLIENT);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @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.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @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);
-
-		// Add supertypes to classes
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(applicationClientEClass, ApplicationClient.class, "ApplicationClient", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getApplicationClient_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getApplicationClient_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getApplicationClient_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getApplicationClient_EnvEntries(), theJavaeePackage.getEnvEntry(), null, "envEntries", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getApplicationClient_EjbRefs(), theJavaeePackage.getEjbRef(), null, "ejbRefs", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getApplicationClient_ServiceRefs(), theJavaeePackage.getServiceRef(), null, "serviceRefs", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getApplicationClient_ResourceRefs(), theJavaeePackage.getResourceRef(), null, "resourceRefs", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getApplicationClient_ResourceEnvRefs(), theJavaeePackage.getResourceEnvRef(), null, "resourceEnvRefs", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getApplicationClient_MessageDestinationRefs(), theJavaeePackage.getMessageDestinationRef(), null, "messageDestinationRefs", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getApplicationClient_PersistenceUnitRefs(), theJavaeePackage.getPersistenceUnitRef(), null, "persistenceUnitRefs", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getApplicationClient_PostConstructs(), theJavaeePackage.getLifecycleCallback(), null, "postConstructs", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getApplicationClient_PreDestroys(), theJavaeePackage.getLifecycleCallback(), null, "preDestroys", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getApplicationClient_CallbackHandler(), theJavaeePackage.getFullyQualifiedClassType(), "callbackHandler", null, 0, 1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getApplicationClient_MessageDestinations(), theJavaeePackage.getMessageDestination(), null, "messageDestinations", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getApplicationClient_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getApplicationClient_MetadataComplete(), theXMLTypePackage.getBoolean(), "metadataComplete", null, 0, 1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getApplicationClient_Version(), theJavaeePackage.getDeweyVersionType(), "version", "5", 1, 1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
-		initEClass(applicationClientDeploymentDescriptorEClass, ApplicationClientDeploymentDescriptor.class, "ApplicationClientDeploymentDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getApplicationClientDeploymentDescriptor_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(getApplicationClientDeploymentDescriptor_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(getApplicationClientDeploymentDescriptor_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(getApplicationClientDeploymentDescriptor_ApplicationClient(), this.getApplicationClient(), null, "applicationClient", 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 <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void createExtendedMetaDataAnnotations() {
-		String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$			
-		addAnnotation
-		  (applicationClientEClass, 
-		   source, 
-		   new String[] {
-			 "name", "application-clientType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getApplicationClient_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
-		  (getApplicationClient_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
-		  (getApplicationClient_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
-		  (getApplicationClient_EnvEntries(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "env-entry", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getApplicationClient_EjbRefs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ejb-ref", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getApplicationClient_ServiceRefs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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$
-		   });		
-		addAnnotation
-		  (getApplicationClient_ResourceRefs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "resource-ref", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getApplicationClient_ResourceEnvRefs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "resource-env-ref", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getApplicationClient_MessageDestinationRefs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "message-destination-ref", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getApplicationClient_PersistenceUnitRefs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "persistence-unit-ref", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getApplicationClient_PostConstructs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "post-construct", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getApplicationClient_PreDestroys(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "pre-destroy", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getApplicationClient_CallbackHandler(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "callback-handler", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getApplicationClient_MessageDestinations(), 
-		   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$
-		   });		
-		addAnnotation
-		  (getApplicationClient_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getApplicationClient_MetadataComplete(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "metadata-complete" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getApplicationClient_Version(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "version" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (applicationClientDeploymentDescriptorEClass, 
-		   source, 
-		   new String[] {
-			 "name", "", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "mixed" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getApplicationClientDeploymentDescriptor_Mixed(), 
-		   source, 
-		   new String[] {
-			 "kind", "elementWildcard", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", ":mixed" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getApplicationClientDeploymentDescriptor_XMLNSPrefixMap(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "xmlns:prefix" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getApplicationClientDeploymentDescriptor_XSISchemaLocation(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "xsi:schemaLocation" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getApplicationClientDeploymentDescriptor_ApplicationClient(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "application-client", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });
-	}
-
-} //ApplicationclientPackageImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/metadata/ApplicationclientPackage.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/metadata/ApplicationclientPackage.java
deleted file mode 100644
index 0a3c672b4..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/metadata/ApplicationclientPackage.java
+++ /dev/null
@@ -1,1021 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.applicationclient.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;
-import org.eclipse.jst.javaee.applicationclient.ApplicationclientFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> 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>
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * 
- *       @(#)application-client_5.xsds	1.26 02/17/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.
- * 
- *     
- * 
- *       
- * 
- * 	This is the XML Schema for the application client 5
- * 	deployment descriptor.  The deployment descriptor must
- * 	be named "META-INF/application-client.xml" in the
- * 	application client's jar file.  All application client
- * 	deployment descriptors must indicate the application
- * 	client schema by using the Java EE namespace:
- * 
- * 	http://java.sun.com/xml/ns/javaee
- * 
- * 	and indicate the version of the schema by
- * 	using the version element as shown below:
- * 
- * 	    &lt;application-client xmlns="http://java.sun.com/xml/ns/javaee"
- * 	      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- * 	      xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- * 		http://java.sun.com/xml/ns/javaee/application-client_5.xsd"
- * 	      version="5"&gt;
- * 	      ...
- * 	    &lt;/application-client&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/application-client_5.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
- *     
- * 
- * 
- *       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.
- * 
- *     
- * 
- * 
- * 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
- *     
- * 
- * 
- *       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.
- * 
- *     
- * 
- * 
- *       (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:
- * 
- *     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.
- *   
- *     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
- *   
- * 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.
- * 
- *         &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.
- *   
- * <!-- end-model-doc -->
- * @see org.eclipse.jst.javaee.applicationclient.ApplicationclientFactory
- * @generated
- */
-public interface ApplicationclientPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "applicationclient"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	String eNS_URI = "http://java.sun.com/xml/ns/javaee/application-client_5.xsd"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "applicationclient"; //$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	ApplicationclientPackage eINSTANCE = org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationclientPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientImpl <em>Application Client</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientImpl
-	 * @see org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationclientPackageImpl#getApplicationClient()
-	 * @generated
-	 */
-	int APPLICATION_CLIENT = 0;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_CLIENT__DESCRIPTIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_CLIENT__DISPLAY_NAMES = 1;
-
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_CLIENT__ICONS = 2;
-
-	/**
-	 * The feature id for the '<em><b>Env Entries</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_CLIENT__ENV_ENTRIES = 3;
-
-	/**
-	 * The feature id for the '<em><b>Ejb Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_CLIENT__EJB_REFS = 4;
-
-	/**
-	 * The feature id for the '<em><b>Service Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_CLIENT__SERVICE_REFS = 5;
-
-	/**
-	 * The feature id for the '<em><b>Resource Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_CLIENT__RESOURCE_REFS = 6;
-
-	/**
-	 * The feature id for the '<em><b>Resource Env Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_CLIENT__RESOURCE_ENV_REFS = 7;
-
-	/**
-	 * The feature id for the '<em><b>Message Destination Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_CLIENT__MESSAGE_DESTINATION_REFS = 8;
-
-	/**
-	 * The feature id for the '<em><b>Persistence Unit Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_CLIENT__PERSISTENCE_UNIT_REFS = 9;
-
-	/**
-	 * The feature id for the '<em><b>Post Constructs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_CLIENT__POST_CONSTRUCTS = 10;
-
-	/**
-	 * The feature id for the '<em><b>Pre Destroys</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_CLIENT__PRE_DESTROYS = 11;
-
-	/**
-	 * The feature id for the '<em><b>Callback Handler</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_CLIENT__CALLBACK_HANDLER = 12;
-
-	/**
-	 * The feature id for the '<em><b>Message Destinations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_CLIENT__MESSAGE_DESTINATIONS = 13;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_CLIENT__ID = 14;
-
-	/**
-	 * The feature id for the '<em><b>Metadata Complete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_CLIENT__METADATA_COMPLETE = 15;
-
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_CLIENT__VERSION = 16;
-
-	/**
-	 * The number of structural features of the '<em>Application Client</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_CLIENT_FEATURE_COUNT = 17;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientDeploymentDescriptorImpl <em>Application Client Deployment Descriptor</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientDeploymentDescriptorImpl
-	 * @see org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationclientPackageImpl#getApplicationClientDeploymentDescriptor()
-	 * @generated
-	 */
-	int APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR = 1;
-
-	/**
-	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__MIXED = 0;
-
-	/**
-	 * The feature id for the '<em><b>XMLNS Prefix Map</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP = 1;
-
-	/**
-	 * The feature id for the '<em><b>XSI Schema Location</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION = 2;
-
-	/**
-	 * The feature id for the '<em><b>Application Client</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__APPLICATION_CLIENT = 3;
-
-	/**
-	 * The number of structural features of the '<em>Application Client Deployment Descriptor</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR_FEATURE_COUNT = 4;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient <em>Application Client</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Application Client</em>'.
-	 * @see org.eclipse.jst.javaee.applicationclient.ApplicationClient
-	 * @generated
-	 */
-	EClass getApplicationClient();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.javaee.applicationclient.ApplicationClient#getDescriptions()
-	 * @see #getApplicationClient()
-	 * @generated
-	 */
-	EReference getApplicationClient_Descriptions();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getDisplayNames <em>Display Names</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Display Names</em>'.
-	 * @see org.eclipse.jst.javaee.applicationclient.ApplicationClient#getDisplayNames()
-	 * @see #getApplicationClient()
-	 * @generated
-	 */
-	EReference getApplicationClient_DisplayNames();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getIcons <em>Icons</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Icons</em>'.
-	 * @see org.eclipse.jst.javaee.applicationclient.ApplicationClient#getIcons()
-	 * @see #getApplicationClient()
-	 * @generated
-	 */
-	EReference getApplicationClient_Icons();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getEnvEntries <em>Env Entries</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Env Entries</em>'.
-	 * @see org.eclipse.jst.javaee.applicationclient.ApplicationClient#getEnvEntries()
-	 * @see #getApplicationClient()
-	 * @generated
-	 */
-	EReference getApplicationClient_EnvEntries();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getEjbRefs <em>Ejb Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Ejb Refs</em>'.
-	 * @see org.eclipse.jst.javaee.applicationclient.ApplicationClient#getEjbRefs()
-	 * @see #getApplicationClient()
-	 * @generated
-	 */
-	EReference getApplicationClient_EjbRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getServiceRefs <em>Service Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Service Refs</em>'.
-	 * @see org.eclipse.jst.javaee.applicationclient.ApplicationClient#getServiceRefs()
-	 * @see #getApplicationClient()
-	 * @generated
-	 */
-	EReference getApplicationClient_ServiceRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getResourceRefs <em>Resource Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Resource Refs</em>'.
-	 * @see org.eclipse.jst.javaee.applicationclient.ApplicationClient#getResourceRefs()
-	 * @see #getApplicationClient()
-	 * @generated
-	 */
-	EReference getApplicationClient_ResourceRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getResourceEnvRefs <em>Resource Env Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Resource Env Refs</em>'.
-	 * @see org.eclipse.jst.javaee.applicationclient.ApplicationClient#getResourceEnvRefs()
-	 * @see #getApplicationClient()
-	 * @generated
-	 */
-	EReference getApplicationClient_ResourceEnvRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getMessageDestinationRefs <em>Message Destination Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Message Destination Refs</em>'.
-	 * @see org.eclipse.jst.javaee.applicationclient.ApplicationClient#getMessageDestinationRefs()
-	 * @see #getApplicationClient()
-	 * @generated
-	 */
-	EReference getApplicationClient_MessageDestinationRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getPersistenceUnitRefs <em>Persistence Unit Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Persistence Unit Refs</em>'.
-	 * @see org.eclipse.jst.javaee.applicationclient.ApplicationClient#getPersistenceUnitRefs()
-	 * @see #getApplicationClient()
-	 * @generated
-	 */
-	EReference getApplicationClient_PersistenceUnitRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getPostConstructs <em>Post Constructs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Post Constructs</em>'.
-	 * @see org.eclipse.jst.javaee.applicationclient.ApplicationClient#getPostConstructs()
-	 * @see #getApplicationClient()
-	 * @generated
-	 */
-	EReference getApplicationClient_PostConstructs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getPreDestroys <em>Pre Destroys</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Pre Destroys</em>'.
-	 * @see org.eclipse.jst.javaee.applicationclient.ApplicationClient#getPreDestroys()
-	 * @see #getApplicationClient()
-	 * @generated
-	 */
-	EReference getApplicationClient_PreDestroys();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getCallbackHandler <em>Callback Handler</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Callback Handler</em>'.
-	 * @see org.eclipse.jst.javaee.applicationclient.ApplicationClient#getCallbackHandler()
-	 * @see #getApplicationClient()
-	 * @generated
-	 */
-	EAttribute getApplicationClient_CallbackHandler();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getMessageDestinations <em>Message Destinations</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Message Destinations</em>'.
-	 * @see org.eclipse.jst.javaee.applicationclient.ApplicationClient#getMessageDestinations()
-	 * @see #getApplicationClient()
-	 * @generated
-	 */
-	EReference getApplicationClient_MessageDestinations();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.applicationclient.ApplicationClient#getId()
-	 * @see #getApplicationClient()
-	 * @generated
-	 */
-	EAttribute getApplicationClient_Id();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#isMetadataComplete <em>Metadata Complete</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Metadata Complete</em>'.
-	 * @see org.eclipse.jst.javaee.applicationclient.ApplicationClient#isMetadataComplete()
-	 * @see #getApplicationClient()
-	 * @generated
-	 */
-	EAttribute getApplicationClient_MetadataComplete();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getVersion <em>Version</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Version</em>'.
-	 * @see org.eclipse.jst.javaee.applicationclient.ApplicationClient#getVersion()
-	 * @see #getApplicationClient()
-	 * @generated
-	 */
-	EAttribute getApplicationClient_Version();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.applicationclient.ApplicationClientDeploymentDescriptor <em>Application Client Deployment Descriptor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Application Client Deployment Descriptor</em>'.
-	 * @see org.eclipse.jst.javaee.applicationclient.ApplicationClientDeploymentDescriptor
-	 * @generated
-	 */
-	EClass getApplicationClientDeploymentDescriptor();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.applicationclient.ApplicationClientDeploymentDescriptor#getMixed <em>Mixed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Mixed</em>'.
-	 * @see org.eclipse.jst.javaee.applicationclient.ApplicationClientDeploymentDescriptor#getMixed()
-	 * @see #getApplicationClientDeploymentDescriptor()
-	 * @generated
-	 */
-	EAttribute getApplicationClientDeploymentDescriptor_Mixed();
-
-	/**
-	 * Returns the meta object for the map '{@link org.eclipse.jst.javaee.applicationclient.ApplicationClientDeploymentDescriptor#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the map '<em>XMLNS Prefix Map</em>'.
-	 * @see org.eclipse.jst.javaee.applicationclient.ApplicationClientDeploymentDescriptor#getXMLNSPrefixMap()
-	 * @see #getApplicationClientDeploymentDescriptor()
-	 * @generated
-	 */
-	EReference getApplicationClientDeploymentDescriptor_XMLNSPrefixMap();
-
-	/**
-	 * Returns the meta object for the map '{@link org.eclipse.jst.javaee.applicationclient.ApplicationClientDeploymentDescriptor#getXSISchemaLocation <em>XSI Schema Location</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the map '<em>XSI Schema Location</em>'.
-	 * @see org.eclipse.jst.javaee.applicationclient.ApplicationClientDeploymentDescriptor#getXSISchemaLocation()
-	 * @see #getApplicationClientDeploymentDescriptor()
-	 * @generated
-	 */
-	EReference getApplicationClientDeploymentDescriptor_XSISchemaLocation();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.applicationclient.ApplicationClientDeploymentDescriptor#getApplicationClient <em>Application Client</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Application Client</em>'.
-	 * @see org.eclipse.jst.javaee.applicationclient.ApplicationClientDeploymentDescriptor#getApplicationClient()
-	 * @see #getApplicationClientDeploymentDescriptor()
-	 * @generated
-	 */
-	EReference getApplicationClientDeploymentDescriptor_ApplicationClient();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	ApplicationclientFactory getApplicationclientFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * 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>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals  {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientImpl <em>Application Client</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientImpl
-		 * @see org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationclientPackageImpl#getApplicationClient()
-		 * @generated
-		 */
-		EClass APPLICATION_CLIENT = eINSTANCE.getApplicationClient();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference APPLICATION_CLIENT__DESCRIPTIONS = eINSTANCE.getApplicationClient_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Display Names</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference APPLICATION_CLIENT__DISPLAY_NAMES = eINSTANCE.getApplicationClient_DisplayNames();
-
-		/**
-		 * The meta object literal for the '<em><b>Icons</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference APPLICATION_CLIENT__ICONS = eINSTANCE.getApplicationClient_Icons();
-
-		/**
-		 * The meta object literal for the '<em><b>Env Entries</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference APPLICATION_CLIENT__ENV_ENTRIES = eINSTANCE.getApplicationClient_EnvEntries();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference APPLICATION_CLIENT__EJB_REFS = eINSTANCE.getApplicationClient_EjbRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Service Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference APPLICATION_CLIENT__SERVICE_REFS = eINSTANCE.getApplicationClient_ServiceRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Resource Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference APPLICATION_CLIENT__RESOURCE_REFS = eINSTANCE.getApplicationClient_ResourceRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Resource Env Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference APPLICATION_CLIENT__RESOURCE_ENV_REFS = eINSTANCE.getApplicationClient_ResourceEnvRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Message Destination Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference APPLICATION_CLIENT__MESSAGE_DESTINATION_REFS = eINSTANCE.getApplicationClient_MessageDestinationRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Persistence Unit Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference APPLICATION_CLIENT__PERSISTENCE_UNIT_REFS = eINSTANCE.getApplicationClient_PersistenceUnitRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Post Constructs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference APPLICATION_CLIENT__POST_CONSTRUCTS = eINSTANCE.getApplicationClient_PostConstructs();
-
-		/**
-		 * The meta object literal for the '<em><b>Pre Destroys</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference APPLICATION_CLIENT__PRE_DESTROYS = eINSTANCE.getApplicationClient_PreDestroys();
-
-		/**
-		 * The meta object literal for the '<em><b>Callback Handler</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute APPLICATION_CLIENT__CALLBACK_HANDLER = eINSTANCE.getApplicationClient_CallbackHandler();
-
-		/**
-		 * The meta object literal for the '<em><b>Message Destinations</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference APPLICATION_CLIENT__MESSAGE_DESTINATIONS = eINSTANCE.getApplicationClient_MessageDestinations();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute APPLICATION_CLIENT__ID = eINSTANCE.getApplicationClient_Id();
-
-		/**
-		 * The meta object literal for the '<em><b>Metadata Complete</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute APPLICATION_CLIENT__METADATA_COMPLETE = eINSTANCE.getApplicationClient_MetadataComplete();
-
-		/**
-		 * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute APPLICATION_CLIENT__VERSION = eINSTANCE.getApplicationClient_Version();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientDeploymentDescriptorImpl <em>Application Client Deployment Descriptor</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientDeploymentDescriptorImpl
-		 * @see org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationclientPackageImpl#getApplicationClientDeploymentDescriptor()
-		 * @generated
-		 */
-		EClass APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR = eINSTANCE.getApplicationClientDeploymentDescriptor();
-
-		/**
-		 * The meta object literal for the '<em><b>Mixed</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__MIXED = eINSTANCE.getApplicationClientDeploymentDescriptor_Mixed();
-
-		/**
-		 * The meta object literal for the '<em><b>XMLNS Prefix Map</b></em>' map feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP = eINSTANCE.getApplicationClientDeploymentDescriptor_XMLNSPrefixMap();
-
-		/**
-		 * The meta object literal for the '<em><b>XSI Schema Location</b></em>' map feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION = eINSTANCE.getApplicationClientDeploymentDescriptor_XSISchemaLocation();
-
-		/**
-		 * The meta object literal for the '<em><b>Application Client</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__APPLICATION_CLIENT = eINSTANCE.getApplicationClientDeploymentDescriptor_ApplicationClient();
-
-	}
-
-} //ApplicationclientPackage
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/util/AppClientXMLHelperImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/util/AppClientXMLHelperImpl.java
deleted file mode 100644
index 2671c3e22..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/util/AppClientXMLHelperImpl.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.applicationclient.internal.util;
-
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage;
-import org.eclipse.jst.javaee.core.internal.util.JEEXMLHelperImpl;
-
-public class AppClientXMLHelperImpl extends JEEXMLHelperImpl {
-
-	public AppClientXMLHelperImpl(XMLResource resource) {
-		super(resource);
-		// TODO Auto-generated constructor stub
-	}
-
-	
-	public String getURI(String prefix) {
-		if (prefix != null && prefix.equals(""))
-			return ApplicationclientPackage.eNS_URI;
-		else
-			return super.getURI(prefix);
-	}
-	protected String getQName(EPackage ePackage, String name, boolean mustHavePrefix)
-	  {
-	   String nsPrefix = getPrefix(ePackage, mustHavePrefix);
-	   // Not using EE5 package namespace - default jee5 namespace is used
-	   if (nsPrefix.equals(ApplicationclientPackage.eNS_PREFIX)) 
-	    {
-	    	return name;
-	    }
-	    else return super.getQName(ePackage, name, mustHavePrefix);
-	  }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/util/ApplicationclientAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/util/ApplicationclientAdapterFactory.java
deleted file mode 100644
index b43df42f1..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/util/ApplicationclientAdapterFactory.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.applicationclient.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.applicationclient.*;
-
-import org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage
- * @generated
- */
-public class ApplicationclientAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static ApplicationclientPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ApplicationclientAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = ApplicationclientPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ApplicationclientSwitch modelSwitch =
-		new ApplicationclientSwitch() {
-			public Object caseApplicationClient(ApplicationClient object) {
-				return createApplicationClientAdapter();
-			}
-			public Object caseApplicationClientDeploymentDescriptor(ApplicationClientDeploymentDescriptor object) {
-				return createApplicationClientDeploymentDescriptorAdapter();
-			}
-			public Object defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	public Adapter createAdapter(Notifier target) {
-		return (Adapter)modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient <em>Application Client</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.applicationclient.ApplicationClient
-	 * @generated
-	 */
-	public Adapter createApplicationClientAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.applicationclient.ApplicationClientDeploymentDescriptor <em>Application Client Deployment Descriptor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.applicationclient.ApplicationClientDeploymentDescriptor
-	 * @generated
-	 */
-	public Adapter createApplicationClientDeploymentDescriptorAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //ApplicationclientAdapterFactory
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/util/ApplicationclientResourceFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/util/ApplicationclientResourceFactoryImpl.java
deleted file mode 100644
index 2d3646357..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/util/ApplicationclientResourceFactoryImpl.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.applicationclient.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.XMLOptions;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.ecore.xmi.impl.XMLOptionsImpl;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource Factory</b> associated with the package.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.javaee.applicationclient.internal.util.ApplicationclientResourceImpl
- * @generated
- */
-public class ApplicationclientResourceFactoryImpl extends ResourceFactoryImpl {
-	/**
-	 * Creates an instance of the resource factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ApplicationclientResourceFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public Resource createResource(URI uri) {
-		XMLResource result = new ApplicationclientResourceImpl(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);
-		XMLOptions xmlOptions = new XMLOptionsImpl();
-
-		xmlOptions.setProcessSchemaLocations(true);
-		    
-		result.getDefaultLoadOptions().put(XMLResource.OPTION_XML_OPTIONS, xmlOptions);
-		return result;
-	}
-
-} //ApplicationclientResourceFactoryImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/util/ApplicationclientResourceImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/util/ApplicationclientResourceImpl.java
deleted file mode 100644
index cacf4e862..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/util/ApplicationclientResourceImpl.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.applicationclient.internal.util;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.xmi.XMLHelper;
-import org.eclipse.emf.ecore.xmi.XMLLoad;
-import org.eclipse.jst.javaee.applicationclient.ApplicationClient;
-import org.eclipse.jst.javaee.applicationclient.ApplicationClientDeploymentDescriptor;
-import org.eclipse.jst.javaee.applicationclient.IApplicationClientResource;
-import org.eclipse.jst.javaee.core.JEEXMLLoadImpl;
-import org.eclipse.jst.javaee.core.internal.util.JavaeeResourceImpl;
-import org.eclipse.wst.common.internal.emf.resource.IRootObjectResource;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource </b> associated with the package.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.javaee.applicationclient.internal.util.ApplicationclientResourceFactoryImpl
- * @generated
- */
-public class ApplicationclientResourceImpl extends JavaeeResourceImpl implements IRootObjectResource, IApplicationClientResource{
-	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param uri the URI of the new resource.
-	 * @generated
-	 */
-	public ApplicationclientResourceImpl(URI uri) {
-		super(uri);
-	}
-	
-	protected XMLLoad createXMLLoad() {
-		 return new JEEXMLLoadImpl(createXMLHelper());
-	}
-
-	
-	protected XMLHelper createXMLHelper() {
-		
-		return new AppClientXMLHelperImpl(this);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.javaee.applicationclient.internal.util.IApplicationClientResource#getRootObject()
-	 */
-	public EObject getRootObject() {
-		if (contents == null || contents.isEmpty())
-			return null;
-		Object root = getContents().get(0);
-		if(root == null){
-			return null;
-		}
-		return (EObject)((ApplicationClientDeploymentDescriptor)root).getApplicationClient();
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.javaee.applicationclient.internal.util.IApplicationClientResource#getApplicationClient()
-	 */
-	public ApplicationClient getApplicationClient() {
-		return (ApplicationClient)getRootObject();
-		
-	}
-
-} //ApplicationclientResourceImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/util/ApplicationclientSwitch.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/util/ApplicationclientSwitch.java
deleted file mode 100644
index dfef4ca46..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/util/ApplicationclientSwitch.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.applicationclient.internal.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.jst.javaee.applicationclient.*;
-
-import org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> 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.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage
- * @generated
- */
-public class ApplicationclientSwitch {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static ApplicationclientPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ApplicationclientSwitch() {
-		if (modelPackage == null) {
-			modelPackage = ApplicationclientPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	public Object 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.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage) {
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
-			List eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch((EClass)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.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case ApplicationclientPackage.APPLICATION_CLIENT: {
-				ApplicationClient applicationClient = (ApplicationClient)theEObject;
-				Object result = caseApplicationClient(applicationClient);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ApplicationclientPackage.APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR: {
-				ApplicationClientDeploymentDescriptor applicationClientDeploymentDescriptor = (ApplicationClientDeploymentDescriptor)theEObject;
-				Object result = caseApplicationClientDeploymentDescriptor(applicationClientDeploymentDescriptor);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Application Client</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Application Client</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseApplicationClient(ApplicationClient object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Application Client Deployment Descriptor</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Application Client Deployment Descriptor</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseApplicationClientDeploymentDescriptor(ApplicationClientDeploymentDescriptor object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	public Object defaultCase(EObject object) {
-		return null;
-	}
-
-} //ApplicationclientSwitch
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/util/ApplicationclientXMLProcessor.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/util/ApplicationclientXMLProcessor.java
deleted file mode 100644
index 7a841b082..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/util/ApplicationclientXMLProcessor.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.applicationclient.internal.util;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
-import org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage;
-
-/**
- * This class contains helper methods to serialize and deserialize XML documents
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ApplicationclientXMLProcessor extends XMLProcessor {
-	/**
-	 * Public constructor to instantiate the helper.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ApplicationclientXMLProcessor() {
-		super((EPackage.Registry.INSTANCE));
-		ApplicationclientPackage.eINSTANCE.eClass();
-	}
-	
-	/**
-	 * Register for "*" and "xml" file extensions the ApplicationclientResourceFactoryImpl factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Map getRegistrations() {
-		if (registrations == null) {
-			super.getRegistrations();
-			registrations.put(XML_EXTENSION, new ApplicationclientResourceFactoryImpl());
-			registrations.put(STAR_EXTENSION, new ApplicationclientResourceFactoryImpl());
-		}
-		return registrations;
-	}
-
-} //ApplicationclientXMLProcessor
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/Description.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/Description.java
deleted file mode 100644
index 9c6c2f13d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/Description.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Description</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The description type is used by a description element to
- * 	provide text describing the parent element.  The elements
- * 	that use this type should include any information that the
- * 	Deployment Component's Deployment File file producer wants
- * 	to provide to the consumer of the Deployment Component's
- * 	Deployment File (i.e., to the Deployer). Typically, the
- * 	tools used by such a Deployment File consumer will display
- * 	the description when processing the parent element that
- * 	contains the description.
- * 
- * 	The lang attribute defines the language that the
- * 	description is provided in. The default value is "en" (English).
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.Description#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.Description#getLang <em>Lang</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getDescription()
- * @extends JavaEEObject
- * @generated
- */
-public interface Description extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getDescription_Value()
-	 * @generated
-	 */
-	String getValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.Description#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Attempting to install the relevant ISO 2- and 3-letter
-	 *          codes as the enumerated possible values is probably never
-	 *          going to be a realistic possibility.  See
-	 *          RFC 3066 at http://www.ietf.org/rfc/rfc3066.txt and the IANA registry
-	 *          at http://www.iana.org/assignments/lang-tag-apps.htm for
-	 *          further information.
-	 * 
-	 *          The union allows for the 'un-declaration' of xml:lang with
-	 *          the empty string.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Lang</em>' attribute.
-	 * @see #setLang(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getDescription_Lang()
-	 * @generated
-	 */
-	String getLang();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.Description#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
-	 * @see #getLang()
-	 * @generated
-	 */
-	void setLang(String value);
-
-} // Description
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/DisplayName.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/DisplayName.java
deleted file mode 100644
index 222961a96..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/DisplayName.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Display Name</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 	
- * 
- * 	  The display-name type contains a short name that is intended
- * 	  to be displayed by tools. It is used by display-name
- * 	  elements.  The display name need not be unique.
- * 
- * 	  Example:
- * 
- * 	  ...
- * 	     &lt;display-name xml:lang="en"&gt;
- * 	       Employee Self Service
- * 	     &lt;/display-name&gt;
- * 
- * 	  The value of the xml:lang attribute is "en" (English) by default.
- * 
- * 	  
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.DisplayName#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.DisplayName#getLang <em>Lang</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getDisplayName()
- * @extends JavaEEObject
- * @generated
- */
-public interface DisplayName extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getDisplayName_Value()
-	 * @generated
-	 */
-	String getValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.DisplayName#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Attempting to install the relevant ISO 2- and 3-letter
-	 *          codes as the enumerated possible values is probably never
-	 *          going to be a realistic possibility.  See
-	 *          RFC 3066 at http://www.ietf.org/rfc/rfc3066.txt and the IANA registry
-	 *          at http://www.iana.org/assignments/lang-tag-apps.htm for
-	 *          further information.
-	 * 
-	 *          The union allows for the 'un-declaration' of xml:lang with
-	 *          the empty string.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Lang</em>' attribute.
-	 * @see #setLang(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getDisplayName_Lang()
-	 * @generated
-	 */
-	String getLang();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.DisplayName#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
-	 * @see #getLang()
-	 * @generated
-	 */
-	void setLang(String value);
-
-} // DisplayName
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/EjbLocalRef.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/EjbLocalRef.java
deleted file mode 100644
index bafbf5df7..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/EjbLocalRef.java
+++ /dev/null
@@ -1,321 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Ejb Local Ref</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The ejb-local-refType is used by ejb-local-ref elements for
- * 	the declaration of a reference to an enterprise bean's local
- * 	home or to the local business interface of a 3.0 bean.
- *         The declaration consists of:
- * 
- * 	    - an optional description
- * 	    - the EJB reference name used in the code of the Deployment
- * 	      Component that's referencing the enterprise bean.
- * 	    - the optional expected type of the referenced enterprise bean
- * 	    - the optional expected local interface of the referenced
- *               enterprise bean or the local business interface of the
- *               referenced enterprise bean.
- * 	    - the optional expected local home interface of the referenced
- *               enterprise bean. Not applicable if this ejb-local-ref refers
- *               to the local business interface of a 3.0 bean.
- * 	    - optional ejb-link information, used to specify the
- * 	      referenced enterprise bean
- *             - optional elements to define injection of the named enterprise
- *               bean into a component field or property.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.EjbLocalRef#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.EjbLocalRef#getEjbRefName <em>Ejb Ref Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.EjbLocalRef#getEjbRefType <em>Ejb Ref Type</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.EjbLocalRef#getLocalHome <em>Local Home</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.EjbLocalRef#getLocal <em>Local</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.EjbLocalRef#getEjbLink <em>Ejb Link</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.EjbLocalRef#getMappedName <em>Mapped Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.EjbLocalRef#getInjectionTargets <em>Injection Targets</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.EjbLocalRef#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getEjbLocalRef()
- * @extends JavaEEObject
- * @generated
- */
-public interface EjbLocalRef extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getEjbLocalRef_Descriptions()
-	 * @generated
-	 */
-	List getDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>Ejb Ref Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ejb Ref Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ejb Ref Name</em>' attribute.
-	 * @see #setEjbRefName(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getEjbLocalRef_EjbRefName()
-	 * @generated
-	 */
-	String getEjbRefName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.EjbLocalRef#getEjbRefName <em>Ejb Ref Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Ejb Ref Name</em>' attribute.
-	 * @see #getEjbRefName()
-	 * @generated
-	 */
-	void setEjbRefName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Ejb Ref Type</b></em>' attribute.
-	 * The default value is <code>"Entity"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.core.EjbRefType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ejb Ref Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ejb Ref Type</em>' attribute.
-	 * @see org.eclipse.jst.javaee.core.EjbRefType
-	 * @see #isSetEjbRefType()
-	 * @see #unsetEjbRefType()
-	 * @see #setEjbRefType(EjbRefType)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getEjbLocalRef_EjbRefType()
-	 * @generated
-	 */
-	EjbRefType getEjbRefType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.EjbLocalRef#getEjbRefType <em>Ejb Ref Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Ejb Ref Type</em>' attribute.
-	 * @see org.eclipse.jst.javaee.core.EjbRefType
-	 * @see #isSetEjbRefType()
-	 * @see #unsetEjbRefType()
-	 * @see #getEjbRefType()
-	 * @generated
-	 */
-	void setEjbRefType(EjbRefType value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.javaee.core.EjbLocalRef#getEjbRefType <em>Ejb Ref Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetEjbRefType()
-	 * @see #getEjbRefType()
-	 * @see #setEjbRefType(EjbRefType)
-	 * @generated
-	 */
-	void unsetEjbRefType();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.core.EjbLocalRef#getEjbRefType <em>Ejb Ref Type</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Ejb Ref Type</em>' attribute is set.
-	 * @see #unsetEjbRefType()
-	 * @see #getEjbRefType()
-	 * @see #setEjbRefType(EjbRefType)
-	 * @generated
-	 */
-	boolean isSetEjbRefType();
-
-	/**
-	 * Returns the value of the '<em><b>Local Home</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Local Home</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Local Home</em>' attribute.
-	 * @see #setLocalHome(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getEjbLocalRef_LocalHome()
-	 * @generated
-	 */
-	String getLocalHome();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.EjbLocalRef#getLocalHome <em>Local Home</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Local Home</em>' attribute.
-	 * @see #getLocalHome()
-	 * @generated
-	 */
-	void setLocalHome(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Local</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Local</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Local</em>' attribute.
-	 * @see #setLocal(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getEjbLocalRef_Local()
-	 * @generated
-	 */
-	String getLocal();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.EjbLocalRef#getLocal <em>Local</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Local</em>' attribute.
-	 * @see #getLocal()
-	 * @generated
-	 */
-	void setLocal(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Ejb Link</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ejb Link</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ejb Link</em>' attribute.
-	 * @see #setEjbLink(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getEjbLocalRef_EjbLink()
-	 * @generated
-	 */
-	String getEjbLink();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.EjbLocalRef#getEjbLink <em>Ejb Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Ejb Link</em>' attribute.
-	 * @see #getEjbLink()
-	 * @generated
-	 */
-	void setEjbLink(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Mapped Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 	    
-	 * 
-	 * 	      A product specific name that this resource should be
-	 * 	      mapped to.  The name of this resource, as defined by the
-	 * 	      resource's name element or defaulted, is a name that is
-	 * 	      local to the application component using the resource.
-	 * 	      (It's a name in the JNDI java:comp/env namespace.)  Many
-	 * 	      application servers provide a way to map these local
-	 * 	      names to names of resources known to the application
-	 * 	      server.  This mapped name is often a global JNDI name,
-	 * 	      but may be a name of any form.
-	 * 
-	 * 	      Application servers are not required to support any
-	 * 	      particular form or type of mapped name, nor the ability
-	 * 	      to use mapped names.  The mapped name is
-	 * 	      product-dependent and often installation-dependent.  No
-	 * 	      use of a mapped name is portable.
-	 * 
-	 * 	      
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Mapped Name</em>' attribute.
-	 * @see #setMappedName(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getEjbLocalRef_MappedName()
-	 * @generated
-	 */
-	String getMappedName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.EjbLocalRef#getMappedName <em>Mapped Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Mapped Name</em>' attribute.
-	 * @see #getMappedName()
-	 * @generated
-	 */
-	void setMappedName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Injection Targets</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.InjectionTarget}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Injection Targets</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Injection Targets</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getEjbLocalRef_InjectionTargets()
-	 * @generated
-	 */
-	List getInjectionTargets();
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getEjbLocalRef_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.EjbLocalRef#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // EjbLocalRef
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/EjbRef.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/EjbRef.java
deleted file mode 100644
index 9413d8eb8..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/EjbRef.java
+++ /dev/null
@@ -1,322 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Ejb Ref</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The ejb-refType is used by ejb-ref elements for the
- * 	declaration of a reference to an enterprise bean's home or
- *         to the remote business interface of a 3.0 bean.
- * 	The declaration consists of:
- * 
- * 	    - an optional description
- * 	    - the EJB reference name used in the code of
- * 	      the Deployment Component that's referencing the enterprise
- * 	      bean.
- * 	    - the optional expected type of the referenced enterprise bean
- *             - the optional remote interface of the referenced enterprise bean
- *               or the remote business interface of the referenced enterprise
- *               bean
- * 	    - the optional expected home interface of the referenced
- *               enterprise bean.  Not applicable if this ejb-ref
- *               refers to the remote business interface of a 3.0 bean.
- * 	    - optional ejb-link information, used to specify the
- * 	      referenced enterprise bean
- *             - optional elements to define injection of the named enterprise
- *               bean into a component field or property
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.EjbRef#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.EjbRef#getEjbRefName <em>Ejb Ref Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.EjbRef#getEjbRefType <em>Ejb Ref Type</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.EjbRef#getHome <em>Home</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.EjbRef#getRemote <em>Remote</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.EjbRef#getEjbLink <em>Ejb Link</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.EjbRef#getMappedName <em>Mapped Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.EjbRef#getInjectionTargets <em>Injection Targets</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.EjbRef#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getEjbRef()
- * @extends JavaEEObject
- * @generated
- */
-public interface EjbRef extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getEjbRef_Descriptions()
-	 * @generated
-	 */
-	List getDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>Ejb Ref Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ejb Ref Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ejb Ref Name</em>' attribute.
-	 * @see #setEjbRefName(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getEjbRef_EjbRefName()
-	 * @generated
-	 */
-	String getEjbRefName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.EjbRef#getEjbRefName <em>Ejb Ref Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Ejb Ref Name</em>' attribute.
-	 * @see #getEjbRefName()
-	 * @generated
-	 */
-	void setEjbRefName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Ejb Ref Type</b></em>' attribute.
-	 * The default value is <code>"Entity"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.core.EjbRefType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ejb Ref Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ejb Ref Type</em>' attribute.
-	 * @see org.eclipse.jst.javaee.core.EjbRefType
-	 * @see #isSetEjbRefType()
-	 * @see #unsetEjbRefType()
-	 * @see #setEjbRefType(EjbRefType)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getEjbRef_EjbRefType()
-	 * @generated
-	 */
-	EjbRefType getEjbRefType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.EjbRef#getEjbRefType <em>Ejb Ref Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Ejb Ref Type</em>' attribute.
-	 * @see org.eclipse.jst.javaee.core.EjbRefType
-	 * @see #isSetEjbRefType()
-	 * @see #unsetEjbRefType()
-	 * @see #getEjbRefType()
-	 * @generated
-	 */
-	void setEjbRefType(EjbRefType value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.javaee.core.EjbRef#getEjbRefType <em>Ejb Ref Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetEjbRefType()
-	 * @see #getEjbRefType()
-	 * @see #setEjbRefType(EjbRefType)
-	 * @generated
-	 */
-	void unsetEjbRefType();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.core.EjbRef#getEjbRefType <em>Ejb Ref Type</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Ejb Ref Type</em>' attribute is set.
-	 * @see #unsetEjbRefType()
-	 * @see #getEjbRefType()
-	 * @see #setEjbRefType(EjbRefType)
-	 * @generated
-	 */
-	boolean isSetEjbRefType();
-
-	/**
-	 * Returns the value of the '<em><b>Home</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Home</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Home</em>' attribute.
-	 * @see #setHome(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getEjbRef_Home()
-	 * @generated
-	 */
-	String getHome();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.EjbRef#getHome <em>Home</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Home</em>' attribute.
-	 * @see #getHome()
-	 * @generated
-	 */
-	void setHome(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Remote</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Remote</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Remote</em>' attribute.
-	 * @see #setRemote(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getEjbRef_Remote()
-	 * @generated
-	 */
-	String getRemote();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.EjbRef#getRemote <em>Remote</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Remote</em>' attribute.
-	 * @see #getRemote()
-	 * @generated
-	 */
-	void setRemote(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Ejb Link</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ejb Link</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ejb Link</em>' attribute.
-	 * @see #setEjbLink(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getEjbRef_EjbLink()
-	 * @generated
-	 */
-	String getEjbLink();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.EjbRef#getEjbLink <em>Ejb Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Ejb Link</em>' attribute.
-	 * @see #getEjbLink()
-	 * @generated
-	 */
-	void setEjbLink(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Mapped Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 	    
-	 * 
-	 * 	      A product specific name that this resource should be
-	 * 	      mapped to.  The name of this resource, as defined by the
-	 * 	      resource's name element or defaulted, is a name that is
-	 * 	      local to the application component using the resource.
-	 * 	      (It's a name in the JNDI java:comp/env namespace.)  Many
-	 * 	      application servers provide a way to map these local
-	 * 	      names to names of resources known to the application
-	 * 	      server.  This mapped name is often a global JNDI name,
-	 * 	      but may be a name of any form.
-	 * 
-	 * 	      Application servers are not required to support any
-	 * 	      particular form or type of mapped name, nor the ability
-	 * 	      to use mapped names.  The mapped name is
-	 * 	      product-dependent and often installation-dependent.  No
-	 * 	      use of a mapped name is portable.
-	 * 
-	 * 	      
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Mapped Name</em>' attribute.
-	 * @see #setMappedName(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getEjbRef_MappedName()
-	 * @generated
-	 */
-	String getMappedName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.EjbRef#getMappedName <em>Mapped Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Mapped Name</em>' attribute.
-	 * @see #getMappedName()
-	 * @generated
-	 */
-	void setMappedName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Injection Targets</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.InjectionTarget}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Injection Targets</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Injection Targets</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getEjbRef_InjectionTargets()
-	 * @generated
-	 */
-	List getInjectionTargets();
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getEjbRef_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.EjbRef#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // EjbRef
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/EjbRefType.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/EjbRefType.java
deleted file mode 100644
index d607e8505..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/EjbRefType.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Ejb Ref Type</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The ejb-ref-typeType contains the expected type of the
- * 	referenced enterprise bean.
- * 
- * 	The ejb-ref-type designates a value
- * 	that must be one of the following:
- * 
- * 	    Entity
- * 	    Session
- * 
- *       
- * <!-- end-model-doc -->
- * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getEjbRefType()
- * @generated
- */
-public final class EjbRefType extends AbstractEnumerator {
-	/**
-	 * The '<em><b>Entity</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Entity</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #ENTITY_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ENTITY = 0;
-
-	/**
-	 * The '<em><b>Session</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Session</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SESSION_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SESSION = 1;
-
-	/**
-	 * The '<em><b>Entity</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #ENTITY
-	 * @generated
-	 * @ordered
-	 */
-	public static final EjbRefType ENTITY_LITERAL = new EjbRefType(ENTITY, "Entity", "Entity"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Session</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #SESSION
-	 * @generated
-	 * @ordered
-	 */
-	public static final EjbRefType SESSION_LITERAL = new EjbRefType(SESSION, "Session", "Session"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * An array of all the '<em><b>Ejb Ref Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final EjbRefType[] VALUES_ARRAY =
-		new EjbRefType[] {
-			ENTITY_LITERAL,
-			SESSION_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Ejb Ref Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Ejb Ref Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static EjbRefType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			EjbRefType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Ejb Ref Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static EjbRefType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			EjbRefType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Ejb Ref Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static EjbRefType get(int value) {
-		switch (value) {
-			case ENTITY: return ENTITY_LITERAL;
-			case SESSION: return SESSION_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EjbRefType(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //EjbRefType
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/EmptyType.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/EmptyType.java
deleted file mode 100644
index 0617267c2..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/EmptyType.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Empty Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	This type is used to designate an empty
- * 	element when used.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.EmptyType#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getEmptyType()
- * @extends JavaEEObject
- * @generated
- */
-public interface EmptyType extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getEmptyType_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.EmptyType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // EmptyType
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/EnvEntry.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/EnvEntry.java
deleted file mode 100644
index bd1568590..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/EnvEntry.java
+++ /dev/null
@@ -1,312 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Env Entry</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The env-entryType is used to declare an application's
- * 	environment entry. The declaration consists of an optional
- * 	description, the name of the environment entry, a type
- * 	(optional if the value is injected, otherwise required), and
- * 	an optional value.
- * 
- * 	It also includes optional elements to define injection of
- * 	the named resource into fields or JavaBeans properties.
- * 
- * 	If a value is not specified and injection is requested,
- * 	no injection will occur and no entry of the specified name
- * 	will be created.  This allows an initial value to be
- * 	specified in the source code without being incorrectly
- * 	changed when no override has been specified.
- * 
- * 	If a value is not specified and no injection is requested,
- * 	a value must be supplied during deployment.
- * 
- * 	This type is used by env-entry elements.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.EnvEntry#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.EnvEntry#getEnvEntryName <em>Env Entry Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.EnvEntry#getEnvEntryType <em>Env Entry Type</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.EnvEntry#getEnvEntryValue <em>Env Entry Value</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.EnvEntry#getMappedName <em>Mapped Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.EnvEntry#getInjectionTargets <em>Injection Targets</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.EnvEntry#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getEnvEntry()
- * @extends JavaEEObject
- * @generated
- */
-public interface EnvEntry extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getEnvEntry_Descriptions()
-	 * @generated
-	 */
-	List getDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>Env Entry Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 	    
-	 * 
-	 * 	      The env-entry-name element contains the name of a
-	 * 	      Deployment Component's environment entry.  The name
-	 * 	      is a JNDI name relative to the java:comp/env
-	 * 	      context.  The name must be unique within a
-	 * 	      Deployment Component. The uniqueness
-	 * 	      constraints must be defined within the declared
-	 * 	      context.
-	 * 
-	 * 	      Example:
-	 * 
-	 * 	      &lt;env-entry-name&gt;minAmount&lt;/env-entry-name&gt;
-	 * 
-	 * 	      
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Env Entry Name</em>' attribute.
-	 * @see #setEnvEntryName(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getEnvEntry_EnvEntryName()
-	 * @generated
-	 */
-	String getEnvEntryName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.EnvEntry#getEnvEntryName <em>Env Entry Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Env Entry Name</em>' attribute.
-	 * @see #getEnvEntryName()
-	 * @generated
-	 */
-	void setEnvEntryName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Env Entry Type</b></em>' attribute.
-	 * The default value is <code>"java.lang.Boolean"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.core.EnvEntryType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 	    
-	 * 
-	 * 	      The env-entry-type element contains the Java language
-	 * 	      type of the environment entry.  If an injection target
-	 * 	      is specified for the environment entry, the type may
-	 * 	      be omitted, or must match the type of the injection
-	 * 	      target.  If no injection target is specified, the type
-	 * 	      is required.
-	 * 
-	 * 	      Example:
-	 * 
-	 * 	      &lt;env-entry-type&gt;java.lang.Integer&lt;/env-entry-type&gt;
-	 * 
-	 * 	      
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Env Entry Type</em>' attribute.
-	 * @see org.eclipse.jst.javaee.core.EnvEntryType
-	 * @see #isSetEnvEntryType()
-	 * @see #unsetEnvEntryType()
-	 * @see #setEnvEntryType(EnvEntryType)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getEnvEntry_EnvEntryType()
-	 * @generated
-	 */
-	EnvEntryType getEnvEntryType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.EnvEntry#getEnvEntryType <em>Env Entry Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Env Entry Type</em>' attribute.
-	 * @see org.eclipse.jst.javaee.core.EnvEntryType
-	 * @see #isSetEnvEntryType()
-	 * @see #unsetEnvEntryType()
-	 * @see #getEnvEntryType()
-	 * @generated
-	 */
-	void setEnvEntryType(EnvEntryType value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.javaee.core.EnvEntry#getEnvEntryType <em>Env Entry Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetEnvEntryType()
-	 * @see #getEnvEntryType()
-	 * @see #setEnvEntryType(EnvEntryType)
-	 * @generated
-	 */
-	void unsetEnvEntryType();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.core.EnvEntry#getEnvEntryType <em>Env Entry Type</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Env Entry Type</em>' attribute is set.
-	 * @see #unsetEnvEntryType()
-	 * @see #getEnvEntryType()
-	 * @see #setEnvEntryType(EnvEntryType)
-	 * @generated
-	 */
-	boolean isSetEnvEntryType();
-
-	/**
-	 * Returns the value of the '<em><b>Env Entry Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 	    
-	 * 
-	 * 	      The env-entry-value designates the value of a
-	 * 	      Deployment Component's environment entry. The value
-	 * 	      must be a String that is valid for the
-	 * 	      constructor of the specified type that takes a
-	 * 	      single String parameter, or for java.lang.Character,
-	 * 	      a single character.
-	 * 
-	 * 	      Example:
-	 * 
-	 * 	      &lt;env-entry-value&gt;100.00&lt;/env-entry-value&gt;
-	 * 
-	 * 	      
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Env Entry Value</em>' attribute.
-	 * @see #setEnvEntryValue(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getEnvEntry_EnvEntryValue()
-	 * @generated
-	 */
-	String getEnvEntryValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.EnvEntry#getEnvEntryValue <em>Env Entry Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Env Entry Value</em>' attribute.
-	 * @see #getEnvEntryValue()
-	 * @generated
-	 */
-	void setEnvEntryValue(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Mapped Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 	    
-	 * 
-	 * 	      A product specific name that this resource should be
-	 * 	      mapped to.  The name of this resource, as defined by the
-	 * 	      resource's name element or defaulted, is a name that is
-	 * 	      local to the application component using the resource.
-	 * 	      (It's a name in the JNDI java:comp/env namespace.)  Many
-	 * 	      application servers provide a way to map these local
-	 * 	      names to names of resources known to the application
-	 * 	      server.  This mapped name is often a global JNDI name,
-	 * 	      but may be a name of any form.
-	 * 
-	 * 	      Application servers are not required to support any
-	 * 	      particular form or type of mapped name, nor the ability
-	 * 	      to use mapped names.  The mapped name is
-	 * 	      product-dependent and often installation-dependent.  No
-	 * 	      use of a mapped name is portable.
-	 * 
-	 * 	      
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Mapped Name</em>' attribute.
-	 * @see #setMappedName(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getEnvEntry_MappedName()
-	 * @generated
-	 */
-	String getMappedName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.EnvEntry#getMappedName <em>Mapped Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Mapped Name</em>' attribute.
-	 * @see #getMappedName()
-	 * @generated
-	 */
-	void setMappedName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Injection Targets</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.InjectionTarget}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Injection Targets</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Injection Targets</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getEnvEntry_InjectionTargets()
-	 * @generated
-	 */
-	List getInjectionTargets();
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getEnvEntry_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.EnvEntry#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // EnvEntry
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/EnvEntryType.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/EnvEntryType.java
deleted file mode 100644
index 929f25358..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/EnvEntryType.java
+++ /dev/null
@@ -1,361 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Env Entry Type</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * 
- * 	
- * 
- * 	  This type contains the fully-qualified Java type of the
- * 	  environment entry value that is expected by the
- * 	  application's code.
- * 
- * 	  The following are the legal values of env-entry-type-valuesType:
- * 
- * 	      java.lang.Boolean
- * 	      java.lang.Byte
- * 	      java.lang.Character
- * 	      java.lang.String
- * 	      java.lang.Short
- * 	      java.lang.Integer
- * 	      java.lang.Long
- * 	      java.lang.Float
- * 	      java.lang.Double
- * 
- * 	  Example:
- * 
- * 	  &lt;env-entry-type&gt;java.lang.Boolean&lt;/env-entry-type&gt;
- * 
- * 	  
- *       
- * <!-- end-model-doc -->
- * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getEnvEntryType()
- * @generated
- */
-public final class EnvEntryType extends AbstractEnumerator {
-	/**
-	 * The '<em><b>Java Lang Boolean</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Java Lang Boolean</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #JAVA_LANG_BOOLEAN_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int JAVA_LANG_BOOLEAN = 0;
-
-	/**
-	 * The '<em><b>Java Lang Byte</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Java Lang Byte</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #JAVA_LANG_BYTE_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int JAVA_LANG_BYTE = 1;
-
-	/**
-	 * The '<em><b>Java Lang Character</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Java Lang Character</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #JAVA_LANG_CHARACTER_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int JAVA_LANG_CHARACTER = 2;
-
-	/**
-	 * The '<em><b>Java Lang String</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Java Lang String</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #JAVA_LANG_STRING_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int JAVA_LANG_STRING = 3;
-
-	/**
-	 * The '<em><b>Java Lang Short</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Java Lang Short</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #JAVA_LANG_SHORT_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int JAVA_LANG_SHORT = 4;
-
-	/**
-	 * The '<em><b>Java Lang Integer</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Java Lang Integer</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #JAVA_LANG_INTEGER_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int JAVA_LANG_INTEGER = 5;
-
-	/**
-	 * The '<em><b>Java Lang Long</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Java Lang Long</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #JAVA_LANG_LONG_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int JAVA_LANG_LONG = 6;
-
-	/**
-	 * The '<em><b>Java Lang Float</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Java Lang Float</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #JAVA_LANG_FLOAT_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int JAVA_LANG_FLOAT = 7;
-
-	/**
-	 * The '<em><b>Java Lang Double</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Java Lang Double</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #JAVA_LANG_DOUBLE_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int JAVA_LANG_DOUBLE = 8;
-
-	/**
-	 * The '<em><b>Java Lang Boolean</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #JAVA_LANG_BOOLEAN
-	 * @generated
-	 * @ordered
-	 */
-	public static final EnvEntryType JAVA_LANG_BOOLEAN_LITERAL = new EnvEntryType(JAVA_LANG_BOOLEAN, "javaLangBoolean", "java.lang.Boolean"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Java Lang Byte</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #JAVA_LANG_BYTE
-	 * @generated
-	 * @ordered
-	 */
-	public static final EnvEntryType JAVA_LANG_BYTE_LITERAL = new EnvEntryType(JAVA_LANG_BYTE, "javaLangByte", "java.lang.Byte"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Java Lang Character</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #JAVA_LANG_CHARACTER
-	 * @generated
-	 * @ordered
-	 */
-	public static final EnvEntryType JAVA_LANG_CHARACTER_LITERAL = new EnvEntryType(JAVA_LANG_CHARACTER, "javaLangCharacter", "java.lang.Character"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Java Lang String</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #JAVA_LANG_STRING
-	 * @generated
-	 * @ordered
-	 */
-	public static final EnvEntryType JAVA_LANG_STRING_LITERAL = new EnvEntryType(JAVA_LANG_STRING, "javaLangString", "java.lang.String"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Java Lang Short</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #JAVA_LANG_SHORT
-	 * @generated
-	 * @ordered
-	 */
-	public static final EnvEntryType JAVA_LANG_SHORT_LITERAL = new EnvEntryType(JAVA_LANG_SHORT, "javaLangShort", "java.lang.Short"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Java Lang Integer</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #JAVA_LANG_INTEGER
-	 * @generated
-	 * @ordered
-	 */
-	public static final EnvEntryType JAVA_LANG_INTEGER_LITERAL = new EnvEntryType(JAVA_LANG_INTEGER, "javaLangInteger", "java.lang.Integer"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Java Lang Long</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #JAVA_LANG_LONG
-	 * @generated
-	 * @ordered
-	 */
-	public static final EnvEntryType JAVA_LANG_LONG_LITERAL = new EnvEntryType(JAVA_LANG_LONG, "javaLangLong", "java.lang.Long"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Java Lang Float</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #JAVA_LANG_FLOAT
-	 * @generated
-	 * @ordered
-	 */
-	public static final EnvEntryType JAVA_LANG_FLOAT_LITERAL = new EnvEntryType(JAVA_LANG_FLOAT, "javaLangFloat", "java.lang.Float"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Java Lang Double</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #JAVA_LANG_DOUBLE
-	 * @generated
-	 * @ordered
-	 */
-	public static final EnvEntryType JAVA_LANG_DOUBLE_LITERAL = new EnvEntryType(JAVA_LANG_DOUBLE, "javaLangDouble", "java.lang.Double"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * An array of all the '<em><b>Env Entry Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final EnvEntryType[] VALUES_ARRAY =
-		new EnvEntryType[] {
-			JAVA_LANG_BOOLEAN_LITERAL,
-			JAVA_LANG_BYTE_LITERAL,
-			JAVA_LANG_CHARACTER_LITERAL,
-			JAVA_LANG_STRING_LITERAL,
-			JAVA_LANG_SHORT_LITERAL,
-			JAVA_LANG_INTEGER_LITERAL,
-			JAVA_LANG_LONG_LITERAL,
-			JAVA_LANG_FLOAT_LITERAL,
-			JAVA_LANG_DOUBLE_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Env Entry Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Env Entry Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static EnvEntryType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			EnvEntryType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Env Entry Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static EnvEntryType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			EnvEntryType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Env Entry Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static EnvEntryType get(int value) {
-		switch (value) {
-			case JAVA_LANG_BOOLEAN: return JAVA_LANG_BOOLEAN_LITERAL;
-			case JAVA_LANG_BYTE: return JAVA_LANG_BYTE_LITERAL;
-			case JAVA_LANG_CHARACTER: return JAVA_LANG_CHARACTER_LITERAL;
-			case JAVA_LANG_STRING: return JAVA_LANG_STRING_LITERAL;
-			case JAVA_LANG_SHORT: return JAVA_LANG_SHORT_LITERAL;
-			case JAVA_LANG_INTEGER: return JAVA_LANG_INTEGER_LITERAL;
-			case JAVA_LANG_LONG: return JAVA_LANG_LONG_LITERAL;
-			case JAVA_LANG_FLOAT: return JAVA_LANG_FLOAT_LITERAL;
-			case JAVA_LANG_DOUBLE: return JAVA_LANG_DOUBLE_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EnvEntryType(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //EnvEntryType
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/Icon.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/Icon.java
deleted file mode 100644
index 55d9fdd83..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/Icon.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Icon</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The icon type contains small-icon and large-icon elements
- * 	that specify the file names for small and large GIF, JPEG,
- * 	or PNG icon images used to represent the parent element in a
- * 	GUI tool.
- * 
- * 	The xml:lang attribute defines the language that the
- * 	icon file names are provided in. Its value is "en" (English)
- * 	by default.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.Icon#getSmallIcon <em>Small Icon</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.Icon#getLargeIcon <em>Large Icon</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.Icon#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.Icon#getLang <em>Lang</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getIcon()
- * @extends JavaEEObject
- * @generated
- */
-public interface Icon extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Small Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 	    
-	 * 
-	 * 	      The small-icon element contains the name of a file
-	 * 	      containing a small (16 x 16) icon image. The file
-	 * 	      name is a relative path within the Deployment
-	 * 	      Component's Deployment File.
-	 * 
-	 * 	      The image may be in the GIF, JPEG, or PNG format.
-	 * 	      The icon can be used by tools.
-	 * 
-	 * 	      Example:
-	 * 
-	 * 	      &lt;small-icon&gt;employee-service-icon16x16.jpg&lt;/small-icon&gt;
-	 * 
-	 * 	      
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Small Icon</em>' attribute.
-	 * @see #setSmallIcon(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getIcon_SmallIcon()
-	 * @generated
-	 */
-	String getSmallIcon();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.Icon#getSmallIcon <em>Small Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Small Icon</em>' attribute.
-	 * @see #getSmallIcon()
-	 * @generated
-	 */
-	void setSmallIcon(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Large Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 	    
-	 * 
-	 * 	      The large-icon element contains the name of a file
-	 * 	      containing a large
-	 * 	      (32 x 32) icon image. The file name is a relative
-	 * 	      path within the Deployment Component's Deployment
-	 * 	      File.
-	 * 
-	 * 	      The image may be in the GIF, JPEG, or PNG format.
-	 * 	      The icon can be used by tools.
-	 * 
-	 * 	      Example:
-	 * 
-	 * 	      &lt;large-icon&gt;employee-service-icon32x32.jpg&lt;/large-icon&gt;
-	 * 
-	 * 	      
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Large Icon</em>' attribute.
-	 * @see #setLargeIcon(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getIcon_LargeIcon()
-	 * @generated
-	 */
-	String getLargeIcon();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.Icon#getLargeIcon <em>Large Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Large Icon</em>' attribute.
-	 * @see #getLargeIcon()
-	 * @generated
-	 */
-	void setLargeIcon(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getIcon_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.Icon#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Attempting to install the relevant ISO 2- and 3-letter
-	 *          codes as the enumerated possible values is probably never
-	 *          going to be a realistic possibility.  See
-	 *          RFC 3066 at http://www.ietf.org/rfc/rfc3066.txt and the IANA registry
-	 *          at http://www.iana.org/assignments/lang-tag-apps.htm for
-	 *          further information.
-	 * 
-	 *          The union allows for the 'un-declaration' of xml:lang with
-	 *          the empty string.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Lang</em>' attribute.
-	 * @see #setLang(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getIcon_Lang()
-	 * @generated
-	 */
-	String getLang();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.Icon#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
-	 * @see #getLang()
-	 * @generated
-	 */
-	void setLang(String value);
-
-} // Icon
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/InjectionTarget.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/InjectionTarget.java
deleted file mode 100644
index a3dec499f..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/InjectionTarget.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Injection Target</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	An injection target specifies a class and a name within
- * 	that class into which a resource should be injected.
- * 
- * 	The injection target class specifies the fully qualified
- * 	class name that is the target of the injection.  The
- * 	Java EE specifications describe which classes can be an
- * 	injection target.
- * 
- * 	The injection target name specifies the target within
- * 	the specified class.  The target is first looked for as a
- * 	JavaBeans property name.  If not found, the target is
- * 	looked for as a field name.
- * 
- * 	The specified resource will be injected into the target
- * 	during initialization of the class by either calling the
- * 	set method for the target property or by setting a value
- * 	into the named field.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.InjectionTarget#getInjectionTargetClass <em>Injection Target Class</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.InjectionTarget#getInjectionTargetName <em>Injection Target Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getInjectionTarget()
- * @extends JavaEEObject
- * @generated
- */
-public interface InjectionTarget extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Injection Target Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Injection Target Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Injection Target Class</em>' attribute.
-	 * @see #setInjectionTargetClass(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getInjectionTarget_InjectionTargetClass()
-	 * @generated
-	 */
-	String getInjectionTargetClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.InjectionTarget#getInjectionTargetClass <em>Injection Target Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Injection Target Class</em>' attribute.
-	 * @see #getInjectionTargetClass()
-	 * @generated
-	 */
-	void setInjectionTargetClass(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Injection Target Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Injection Target Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Injection Target Name</em>' attribute.
-	 * @see #setInjectionTargetName(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getInjectionTarget_InjectionTargetName()
-	 * @generated
-	 */
-	String getInjectionTargetName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.InjectionTarget#getInjectionTargetName <em>Injection Target Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Injection Target Name</em>' attribute.
-	 * @see #getInjectionTargetName()
-	 * @generated
-	 */
-	void setInjectionTargetName(String value);
-
-} // InjectionTarget
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/JEESAXXMLHandler.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/JEESAXXMLHandler.java
deleted file mode 100644
index 3271d4578..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/JEESAXXMLHandler.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core;
-
-import java.util.Map;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.xmi.XMLHelper;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.ecore.xmi.impl.SAXXMIHandler;
-
-public class JEESAXXMLHandler extends SAXXMIHandler {
-
-	public JEESAXXMLHandler(XMLResource xmiResource, XMLHelper helper,
-			Map<?, ?> options) {
-		super(xmiResource, helper, options);
-		// TODO Auto-generated constructor stub
-	}
-
-	protected EPackage getPackageForURI(String uriString) {
-		EPackage defPackage;
-		// Grab the schema location because all JEE DD files share a common namespace
-		if (urisToLocations == null) {//uriMap not initialized yet
-			defPackage = super.getPackageForURI(uriString);
-			if (urisToLocations == null)// if still not initialized.. then just return defPackage
-				return defPackage;
-		}
-		URI uri = urisToLocations.get(uriString);
-		String locString = (uri == null) ? uriString : uri.toString();
-		EPackage ePackage = packageRegistry.getEPackage(locString);
-		if (ePackage == null)
-			return super.getPackageForURI(locString);
-		else return ePackage;
-		
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/JEEXMLLoadImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/JEEXMLLoadImpl.java
deleted file mode 100644
index 14f0b7654..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/JEEXMLLoadImpl.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core;
-
-import org.eclipse.emf.ecore.xmi.XMLHelper;
-import org.eclipse.emf.ecore.xmi.impl.XMLLoadImpl;
-import org.xml.sax.helpers.DefaultHandler;
-
-public class JEEXMLLoadImpl extends XMLLoadImpl {
-
-	protected DefaultHandler makeDefaultHandler() {
-		
-		 return new JEESAXXMLHandler(resource, helper, options);
-	}
-
-	public JEEXMLLoadImpl(XMLHelper helper) {
-		super(helper);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/JavaEEObject.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/JavaEEObject.java
deleted file mode 100644
index 1200c7cfa..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/JavaEEObject.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core;
-
-public interface JavaEEObject {
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/JavaeeFactory.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/JavaeeFactory.java
deleted file mode 100644
index 238d2c1f8..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/JavaeeFactory.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core;
-
-import org.eclipse.emf.ecore.EFactory;
-
-import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage
- * @generated
- */
-public interface JavaeeFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	JavaeeFactory eINSTANCE = org.eclipse.jst.javaee.core.internal.impl.JavaeeFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Description</em>'.
-	 * @generated
-	 */
-	Description createDescription();
-
-	/**
-	 * Returns a new object of class '<em>Display Name</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Display Name</em>'.
-	 * @generated
-	 */
-	DisplayName createDisplayName();
-
-	/**
-	 * Returns a new object of class '<em>Ejb Local Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Ejb Local Ref</em>'.
-	 * @generated
-	 */
-	EjbLocalRef createEjbLocalRef();
-
-	/**
-	 * Returns a new object of class '<em>Ejb Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Ejb Ref</em>'.
-	 * @generated
-	 */
-	EjbRef createEjbRef();
-
-	/**
-	 * Returns a new object of class '<em>Empty Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Empty Type</em>'.
-	 * @generated
-	 */
-	EmptyType createEmptyType();
-
-	/**
-	 * Returns a new object of class '<em>Env Entry</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Env Entry</em>'.
-	 * @generated
-	 */
-	EnvEntry createEnvEntry();
-
-	/**
-	 * Returns a new object of class '<em>Icon</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Icon</em>'.
-	 * @generated
-	 */
-	Icon createIcon();
-
-	/**
-	 * Returns a new object of class '<em>Injection Target</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Injection Target</em>'.
-	 * @generated
-	 */
-	InjectionTarget createInjectionTarget();
-
-	/**
-	 * Returns a new object of class '<em>Lifecycle Callback</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Lifecycle Callback</em>'.
-	 * @generated
-	 */
-	LifecycleCallback createLifecycleCallback();
-
-	/**
-	 * Returns a new object of class '<em>Listener</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Listener</em>'.
-	 * @generated
-	 */
-	Listener createListener();
-
-	/**
-	 * Returns a new object of class '<em>Message Destination</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Message Destination</em>'.
-	 * @generated
-	 */
-	MessageDestination createMessageDestination();
-
-	/**
-	 * Returns a new object of class '<em>Message Destination Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Message Destination Ref</em>'.
-	 * @generated
-	 */
-	MessageDestinationRef createMessageDestinationRef();
-
-	/**
-	 * Returns a new object of class '<em>Param Value</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Param Value</em>'.
-	 * @generated
-	 */
-	ParamValue createParamValue();
-
-	/**
-	 * Returns a new object of class '<em>Persistence Context Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Persistence Context Ref</em>'.
-	 * @generated
-	 */
-	PersistenceContextRef createPersistenceContextRef();
-
-	/**
-	 * Returns a new object of class '<em>Persistence Unit Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Persistence Unit Ref</em>'.
-	 * @generated
-	 */
-	PersistenceUnitRef createPersistenceUnitRef();
-
-	/**
-	 * Returns a new object of class '<em>Port Component Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Port Component Ref</em>'.
-	 * @generated
-	 */
-	PortComponentRef createPortComponentRef();
-
-	/**
-	 * Returns a new object of class '<em>Property Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Property Type</em>'.
-	 * @generated
-	 */
-	PropertyType createPropertyType();
-
-	/**
-	 * Returns a new object of class '<em>Resource Env Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Resource Env Ref</em>'.
-	 * @generated
-	 */
-	ResourceEnvRef createResourceEnvRef();
-
-	/**
-	 * Returns a new object of class '<em>Resource Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Resource Ref</em>'.
-	 * @generated
-	 */
-	ResourceRef createResourceRef();
-
-	/**
-	 * Returns a new object of class '<em>Run As</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Run As</em>'.
-	 * @generated
-	 */
-	RunAs createRunAs();
-
-	/**
-	 * Returns a new object of class '<em>Security Role</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Security Role</em>'.
-	 * @generated
-	 */
-	SecurityRole createSecurityRole();
-
-	/**
-	 * Returns a new object of class '<em>Security Role Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Security Role Ref</em>'.
-	 * @generated
-	 */
-	SecurityRoleRef createSecurityRoleRef();
-
-	/**
-	 * Returns a new object of class '<em>Service Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Service Ref</em>'.
-	 * @generated
-	 */
-	ServiceRef createServiceRef();
-
-	/**
-	 * Returns a new object of class '<em>Service Ref Handler</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Service Ref Handler</em>'.
-	 * @generated
-	 */
-	ServiceRefHandler createServiceRefHandler();
-
-	/**
-	 * Returns a new object of class '<em>Service Ref Handler Chain</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Service Ref Handler Chain</em>'.
-	 * @generated
-	 */
-	ServiceRefHandlerChain createServiceRefHandlerChain();
-
-	/**
-	 * Returns a new object of class '<em>Service Ref Handler Chains</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Service Ref Handler Chains</em>'.
-	 * @generated
-	 */
-	ServiceRefHandlerChains createServiceRefHandlerChains();
-
-	/**
-	 * Returns a new object of class '<em>Url Pattern Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Url Pattern Type</em>'.
-	 * @generated
-	 */
-	UrlPatternType createUrlPatternType();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	JavaeePackage getJavaeePackage();
-
-} //JavaeeFactory
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/LifecycleCallback.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/LifecycleCallback.java
deleted file mode 100644
index ed84fed9d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/LifecycleCallback.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Lifecycle Callback</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The lifecycle-callback type specifies a method on a
- * 	class to be called when a lifecycle event occurs.
- * 	Note that each class may have only one lifecycle callback
- *         method for any given event and that the method may not
- * 	be overloaded.
- * 
- *         If the lifefycle-callback-class element is missing then
- *         the class defining the callback is assumed to be the
- *         component class in scope at the place in the descriptor
- *         in which the callback definition appears.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.LifecycleCallback#getLifecycleCallbackClass <em>Lifecycle Callback Class</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.LifecycleCallback#getLifecycleCallbackMethod <em>Lifecycle Callback Method</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getLifecycleCallback()
- * @extends JavaEEObject
- * @generated
- */
-public interface LifecycleCallback extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Lifecycle Callback Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Lifecycle Callback Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Lifecycle Callback Class</em>' attribute.
-	 * @see #setLifecycleCallbackClass(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getLifecycleCallback_LifecycleCallbackClass()
-	 * @generated
-	 */
-	String getLifecycleCallbackClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.LifecycleCallback#getLifecycleCallbackClass <em>Lifecycle Callback Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lifecycle Callback Class</em>' attribute.
-	 * @see #getLifecycleCallbackClass()
-	 * @generated
-	 */
-	void setLifecycleCallbackClass(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Lifecycle Callback Method</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Lifecycle Callback Method</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Lifecycle Callback Method</em>' attribute.
-	 * @see #setLifecycleCallbackMethod(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getLifecycleCallback_LifecycleCallbackMethod()
-	 * @generated
-	 */
-	String getLifecycleCallbackMethod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.LifecycleCallback#getLifecycleCallbackMethod <em>Lifecycle Callback Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lifecycle Callback Method</em>' attribute.
-	 * @see #getLifecycleCallbackMethod()
-	 * @generated
-	 */
-	void setLifecycleCallbackMethod(String value);
-
-} // LifecycleCallback
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/Listener.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/Listener.java
deleted file mode 100644
index 21b35f3d9..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/Listener.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Listener</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The listenerType indicates the deployment properties for a web
- * 	application listener bean.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.Listener#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.Listener#getDisplayNames <em>Display Names</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.Listener#getIcons <em>Icons</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.Listener#getListenerClass <em>Listener Class</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.Listener#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getListener()
- * @extends JavaEEObject
- * @generated
- */
-public interface Listener extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getListener_Descriptions()
-	 * @generated
-	 */
-	List getDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>Display Names</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.DisplayName}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Names</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Names</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getListener_DisplayNames()
-	 * @generated
-	 */
-	List getDisplayNames();
-
-	/**
-	 * Returns the value of the '<em><b>Icons</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Icon}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Icons</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Icons</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getListener_Icons()
-	 * @generated
-	 */
-	List getIcons();
-
-	/**
-	 * Returns the value of the '<em><b>Listener Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The listener-class element declares a class in the
-	 * 	    application must be registered as a web
-	 * 	    application listener bean. The value is the fully
-	 * 	    qualified classname of the listener class.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Listener Class</em>' attribute.
-	 * @see #setListenerClass(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getListener_ListenerClass()
-	 * @generated
-	 */
-	String getListenerClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.Listener#getListenerClass <em>Listener Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Listener Class</em>' attribute.
-	 * @see #getListenerClass()
-	 * @generated
-	 */
-	void setListenerClass(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getListener_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.Listener#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // Listener
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/MessageDestination.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/MessageDestination.java
deleted file mode 100644
index de5709127..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/MessageDestination.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Message Destination</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 	
- * 
- * 	  The message-destinationType specifies a message
- * 	  destination. The logical destination described by this
- * 	  element is mapped to a physical destination by the Deployer.
- * 
- * 	  The message destination element contains:
- * 
- * 		  - an optional description
- * 		  - an optional display-name
- * 		  - an optional icon
- * 		  - a message destination name which must be unique
- * 		    among message destination names within the same
- * 		    Deployment File.
- * 		  - an optional mapped name
- * 
- * 	  Example:
- * 
- * 	  &lt;message-destination&gt;
- * 		  &lt;message-destination-name&gt;CorporateStocks
- * 		  &lt;/message-destination-name&gt;
- * 	  &lt;/message-destination&gt;
- * 
- * 	  
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.MessageDestination#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.MessageDestination#getDisplayNames <em>Display Names</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.MessageDestination#getIcons <em>Icons</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.MessageDestination#getMessageDestinationName <em>Message Destination Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.MessageDestination#getMappedName <em>Mapped Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.MessageDestination#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getMessageDestination()
- * @extends JavaEEObject
- * @generated
- */
-public interface MessageDestination extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getMessageDestination_Descriptions()
-	 * @generated
-	 */
-	List getDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>Display Names</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.DisplayName}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Names</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Names</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getMessageDestination_DisplayNames()
-	 * @generated
-	 */
-	List getDisplayNames();
-
-	/**
-	 * Returns the value of the '<em><b>Icons</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Icon}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Icons</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Icons</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getMessageDestination_Icons()
-	 * @generated
-	 */
-	List getIcons();
-
-	/**
-	 * Returns the value of the '<em><b>Message Destination Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The message-destination-name element specifies a
-	 * 	    name for a message destination.  This name must be
-	 * 	    unique among the names of message destinations
-	 * 	    within the Deployment File.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Message Destination Name</em>' attribute.
-	 * @see #setMessageDestinationName(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getMessageDestination_MessageDestinationName()
-	 * @generated
-	 */
-	String getMessageDestinationName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.MessageDestination#getMessageDestinationName <em>Message Destination Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Message Destination Name</em>' attribute.
-	 * @see #getMessageDestinationName()
-	 * @generated
-	 */
-	void setMessageDestinationName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Mapped Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 	    
-	 * 
-	 * 	      A product specific name that this message destination
-	 * 	      should be mapped to.  Each message-destination-ref
-	 * 	      element that references this message destination will
-	 * 	      define a name in the namespace of the referencing
-	 * 	      component.  (It's a name in the JNDI java:comp/env
-	 * 	      namespace.)  Many application servers provide a way to
-	 * 	      map these local names to names of resources known to the
-	 * 	      application server.  This mapped name is often a global
-	 * 	      JNDI name, but may be a name of any form.  Each of the
-	 * 	      local names should be mapped to this same global name.
-	 * 
-	 * 	      Application servers are not required to support any
-	 * 	      particular form or type of mapped name, nor the ability
-	 * 	      to use mapped names.  The mapped name is
-	 * 	      product-dependent and often installation-dependent.  No
-	 * 	      use of a mapped name is portable.
-	 * 
-	 * 	      
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Mapped Name</em>' attribute.
-	 * @see #setMappedName(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getMessageDestination_MappedName()
-	 * @generated
-	 */
-	String getMappedName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.MessageDestination#getMappedName <em>Mapped Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Mapped Name</em>' attribute.
-	 * @see #getMappedName()
-	 * @generated
-	 */
-	void setMappedName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getMessageDestination_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.MessageDestination#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // MessageDestination
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/MessageDestinationRef.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/MessageDestinationRef.java
deleted file mode 100644
index bab0f6e65..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/MessageDestinationRef.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Message Destination Ref</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 	
- * 
- * 	  The message-destination-ref element contains a declaration
- * 	  of Deployment Component's reference to a message destination
- * 	  associated with a resource in Deployment Component's
- * 	  environment. It consists of:
- * 
- * 		  - an optional description
- * 		  - the message destination reference name
- * 		  - an optional message destination type
- * 		  - an optional specification as to whether
- * 		    the destination is used for
- * 		    consuming or producing messages, or both.
- * 		    if not specified, "both" is assumed.
- * 		  - an optional link to the message destination
- * 		  - optional injection targets
- * 
- * 	  The message destination type must be supplied unless an
- * 	  injection target is specified, in which case the type
- * 	  of the target is used.  If both are specified, the type
- * 	  must be assignment compatible with the type of the injection
- * 	  target.
- * 
- * 	  Examples:
- * 
- * 	  &lt;message-destination-ref&gt;
- * 		  &lt;message-destination-ref-name&gt;jms/StockQueue
- * 		  &lt;/message-destination-ref-name&gt;
- * 		  &lt;message-destination-type&gt;javax.jms.Queue
- * 		  &lt;/message-destination-type&gt;
- * 		  &lt;message-destination-usage&gt;Consumes
- * 		  &lt;/message-destination-usage&gt;
- * 		  &lt;message-destination-link&gt;CorporateStocks
- * 		  &lt;/message-destination-link&gt;
- * 	  &lt;/message-destination-ref&gt;
- * 
- * 	  
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.MessageDestinationRef#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.MessageDestinationRef#getMessageDestinationRefName <em>Message Destination Ref Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.MessageDestinationRef#getMessageDestinationType <em>Message Destination Type</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.MessageDestinationRef#getMessageDestinationUsage <em>Message Destination Usage</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.MessageDestinationRef#getMessageDestinationLink <em>Message Destination Link</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.MessageDestinationRef#getMappedName <em>Mapped Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.MessageDestinationRef#getInjectionTargets <em>Injection Targets</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.MessageDestinationRef#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getMessageDestinationRef()
- * @extends JavaEEObject
- * @generated
- */
-public interface MessageDestinationRef extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getMessageDestinationRef_Descriptions()
-	 * @generated
-	 */
-	List getDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>Message Destination Ref Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The message-destination-ref-name element specifies
-	 * 	    the name of a message destination reference; its
-	 * 	    value is the environment entry name used in
-	 * 	    Deployment Component code.  The name is a JNDI name
-	 * 	    relative to the java:comp/env context and must be
-	 * 	    unique within an ejb-jar (for enterprise beans) or a
-	 * 	    Deployment File (for others).
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Message Destination Ref Name</em>' attribute.
-	 * @see #setMessageDestinationRefName(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getMessageDestinationRef_MessageDestinationRefName()
-	 * @generated
-	 */
-	String getMessageDestinationRefName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.MessageDestinationRef#getMessageDestinationRefName <em>Message Destination Ref Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Message Destination Ref Name</em>' attribute.
-	 * @see #getMessageDestinationRefName()
-	 * @generated
-	 */
-	void setMessageDestinationRefName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Message Destination Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Message Destination Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Message Destination Type</em>' attribute.
-	 * @see #setMessageDestinationType(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getMessageDestinationRef_MessageDestinationType()
-	 * @generated
-	 */
-	String getMessageDestinationType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.MessageDestinationRef#getMessageDestinationType <em>Message Destination Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Message Destination Type</em>' attribute.
-	 * @see #getMessageDestinationType()
-	 * @generated
-	 */
-	void setMessageDestinationType(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Message Destination Usage</b></em>' attribute.
-	 * The default value is <code>"Consumes"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.core.MessageDestinationUsageType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Message Destination Usage</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Message Destination Usage</em>' attribute.
-	 * @see org.eclipse.jst.javaee.core.MessageDestinationUsageType
-	 * @see #isSetMessageDestinationUsage()
-	 * @see #unsetMessageDestinationUsage()
-	 * @see #setMessageDestinationUsage(MessageDestinationUsageType)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getMessageDestinationRef_MessageDestinationUsage()
-	 * @generated
-	 */
-	MessageDestinationUsageType getMessageDestinationUsage();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.MessageDestinationRef#getMessageDestinationUsage <em>Message Destination Usage</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Message Destination Usage</em>' attribute.
-	 * @see org.eclipse.jst.javaee.core.MessageDestinationUsageType
-	 * @see #isSetMessageDestinationUsage()
-	 * @see #unsetMessageDestinationUsage()
-	 * @see #getMessageDestinationUsage()
-	 * @generated
-	 */
-	void setMessageDestinationUsage(MessageDestinationUsageType value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.javaee.core.MessageDestinationRef#getMessageDestinationUsage <em>Message Destination Usage</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetMessageDestinationUsage()
-	 * @see #getMessageDestinationUsage()
-	 * @see #setMessageDestinationUsage(MessageDestinationUsageType)
-	 * @generated
-	 */
-	void unsetMessageDestinationUsage();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.core.MessageDestinationRef#getMessageDestinationUsage <em>Message Destination Usage</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Message Destination Usage</em>' attribute is set.
-	 * @see #unsetMessageDestinationUsage()
-	 * @see #getMessageDestinationUsage()
-	 * @see #setMessageDestinationUsage(MessageDestinationUsageType)
-	 * @generated
-	 */
-	boolean isSetMessageDestinationUsage();
-
-	/**
-	 * Returns the value of the '<em><b>Message Destination Link</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Message Destination Link</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Message Destination Link</em>' attribute.
-	 * @see #setMessageDestinationLink(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getMessageDestinationRef_MessageDestinationLink()
-	 * @generated
-	 */
-	String getMessageDestinationLink();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.MessageDestinationRef#getMessageDestinationLink <em>Message Destination Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Message Destination Link</em>' attribute.
-	 * @see #getMessageDestinationLink()
-	 * @generated
-	 */
-	void setMessageDestinationLink(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Mapped Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 	    
-	 * 
-	 * 	      A product specific name that this resource should be
-	 * 	      mapped to.  The name of this resource, as defined by the
-	 * 	      resource's name element or defaulted, is a name that is
-	 * 	      local to the application component using the resource.
-	 * 	      (It's a name in the JNDI java:comp/env namespace.)  Many
-	 * 	      application servers provide a way to map these local
-	 * 	      names to names of resources known to the application
-	 * 	      server.  This mapped name is often a global JNDI name,
-	 * 	      but may be a name of any form.
-	 * 
-	 * 	      Application servers are not required to support any
-	 * 	      particular form or type of mapped name, nor the ability
-	 * 	      to use mapped names.  The mapped name is
-	 * 	      product-dependent and often installation-dependent.  No
-	 * 	      use of a mapped name is portable.
-	 * 
-	 * 	      
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Mapped Name</em>' attribute.
-	 * @see #setMappedName(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getMessageDestinationRef_MappedName()
-	 * @generated
-	 */
-	String getMappedName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.MessageDestinationRef#getMappedName <em>Mapped Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Mapped Name</em>' attribute.
-	 * @see #getMappedName()
-	 * @generated
-	 */
-	void setMappedName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Injection Targets</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.InjectionTarget}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Injection Targets</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Injection Targets</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getMessageDestinationRef_InjectionTargets()
-	 * @generated
-	 */
-	List getInjectionTargets();
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getMessageDestinationRef_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.MessageDestinationRef#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // MessageDestinationRef
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/MessageDestinationUsageType.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/MessageDestinationUsageType.java
deleted file mode 100644
index 3dc063bc7..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/MessageDestinationUsageType.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Message Destination Usage Type</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The message-destination-usageType specifies the use of the
- * 	message destination indicated by the reference.  The value
- * 	indicates whether messages are consumed from the message
- * 	destination, produced for the destination, or both.  The
- * 	Assembler makes use of this information in linking producers
- * 	of a destination with its consumers.
- * 
- * 	The value of the message-destination-usage element must be
- * 	one of the following:
- * 	    Consumes
- * 	    Produces
- * 	    ConsumesProduces
- * 
- *       
- * <!-- end-model-doc -->
- * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getMessageDestinationUsageType()
- * @generated
- */
-public final class MessageDestinationUsageType extends AbstractEnumerator {
-	/**
-	 * The '<em><b>Consumes</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Consumes</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #CONSUMES_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CONSUMES = 0;
-
-	/**
-	 * The '<em><b>Produces</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Produces</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #PRODUCES_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int PRODUCES = 1;
-
-	/**
-	 * The '<em><b>Consumes Produces</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Consumes Produces</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #CONSUMES_PRODUCES_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CONSUMES_PRODUCES = 2;
-
-	/**
-	 * The '<em><b>Consumes</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #CONSUMES
-	 * @generated
-	 * @ordered
-	 */
-	public static final MessageDestinationUsageType CONSUMES_LITERAL = new MessageDestinationUsageType(CONSUMES, "Consumes", "Consumes"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Produces</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #PRODUCES
-	 * @generated
-	 * @ordered
-	 */
-	public static final MessageDestinationUsageType PRODUCES_LITERAL = new MessageDestinationUsageType(PRODUCES, "Produces", "Produces"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Consumes Produces</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #CONSUMES_PRODUCES
-	 * @generated
-	 * @ordered
-	 */
-	public static final MessageDestinationUsageType CONSUMES_PRODUCES_LITERAL = new MessageDestinationUsageType(CONSUMES_PRODUCES, "ConsumesProduces", "ConsumesProduces"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * An array of all the '<em><b>Message Destination Usage Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final MessageDestinationUsageType[] VALUES_ARRAY =
-		new MessageDestinationUsageType[] {
-			CONSUMES_LITERAL,
-			PRODUCES_LITERAL,
-			CONSUMES_PRODUCES_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Message Destination Usage Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Message Destination Usage Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static MessageDestinationUsageType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			MessageDestinationUsageType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Message Destination Usage Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static MessageDestinationUsageType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			MessageDestinationUsageType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Message Destination Usage Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static MessageDestinationUsageType get(int value) {
-		switch (value) {
-			case CONSUMES: return CONSUMES_LITERAL;
-			case PRODUCES: return PRODUCES_LITERAL;
-			case CONSUMES_PRODUCES: return CONSUMES_PRODUCES_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private MessageDestinationUsageType(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //MessageDestinationUsageType
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/ParamValue.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/ParamValue.java
deleted file mode 100644
index 0f08a458c..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/ParamValue.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Param Value</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	This type is a general type that can be used to declare
- * 	parameter/value lists.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.ParamValue#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.ParamValue#getParamName <em>Param Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.ParamValue#getParamValue <em>Param Value</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.ParamValue#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getParamValue()
- * @extends JavaEEObject
- * @generated
- */
-public interface ParamValue extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getParamValue_Descriptions()
-	 * @generated
-	 */
-	List getDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>Param Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The param-name element contains the name of a
-	 * 	    parameter.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Param Name</em>' attribute.
-	 * @see #setParamName(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getParamValue_ParamName()
-	 * @generated
-	 */
-	String getParamName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.ParamValue#getParamName <em>Param Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Param Name</em>' attribute.
-	 * @see #getParamName()
-	 * @generated
-	 */
-	void setParamName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Param Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The param-value element contains the value of a
-	 * 	    parameter.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Param Value</em>' attribute.
-	 * @see #setParamValue(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getParamValue_ParamValue()
-	 * @generated
-	 */
-	String getParamValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.ParamValue#getParamValue <em>Param Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Param Value</em>' attribute.
-	 * @see #getParamValue()
-	 * @generated
-	 */
-	void setParamValue(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getParamValue_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.ParamValue#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // ParamValue
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/PersistenceContextRef.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/PersistenceContextRef.java
deleted file mode 100644
index 6cf820c06..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/PersistenceContextRef.java
+++ /dev/null
@@ -1,327 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Persistence Context Ref</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 	
- * 
- * 	  The persistence-context-ref element contains a declaration
- * 	  of Deployment Component's reference to a persistence context
- * 	  associated within a Deployment Component's
- * 	  environment. It consists of:
- * 
- * 		  - an optional description
- * 		  - the persistence context reference name
- * 		  - an optional persistence unit name.  If not specified,
- *                     the default persistence unit is assumed.
- * 		  - an optional specification as to whether
- * 		    the persistence context type is Transaction or
- * 		    Extended.  If not specified, Transaction is assumed.
- *                   - an optional list of persistence properties
- * 		  - optional injection targets
- * 
- * 	  Examples:
- * 
- *             &lt;persistence-context-ref&gt;
- *               &lt;persistence-context-ref-name&gt;myPersistenceContext
- *               &lt;/persistence-context-ref-name&gt;
- *             &lt;/persistence-context-ref&gt;
- * 
- *             &lt;persistence-context-ref&gt;
- *               &lt;persistence-context-ref-name&gt;myPersistenceContext
- *                 &lt;/persistence-context-ref-name&gt;
- *               &lt;persistence-unit-name&gt;PersistenceUnit1
- *                 &lt;/persistence-unit-name&gt;
- *               &lt;persistence-context-type&gt;Extended&lt;/persistence-context-type&gt;
- *             &lt;/persistence-context-ref&gt;
- * 
- * 	  
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getPersistenceContextRefName <em>Persistence Context Ref Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getPersistenceUnitName <em>Persistence Unit Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getPersistenceContextType <em>Persistence Context Type</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getPersistenceProperties <em>Persistence Properties</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getMappedName <em>Mapped Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getInjectionTargets <em>Injection Targets</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getPersistenceContextRef()
- * @extends JavaEEObject
- * @generated
- */
-public interface PersistenceContextRef extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getPersistenceContextRef_Descriptions()
-	 * @generated
-	 */
-	List getDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>Persistence Context Ref Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The persistence-context-ref-name element specifies
-	 * 	    the name of a persistence context reference; its
-	 * 	    value is the environment entry name used in
-	 * 	    Deployment Component code.  The name is a JNDI name
-	 * 	    relative to the java:comp/env context.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Persistence Context Ref Name</em>' attribute.
-	 * @see #setPersistenceContextRefName(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getPersistenceContextRef_PersistenceContextRefName()
-	 * @generated
-	 */
-	String getPersistenceContextRefName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getPersistenceContextRefName <em>Persistence Context Ref Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Persistence Context Ref Name</em>' attribute.
-	 * @see #getPersistenceContextRefName()
-	 * @generated
-	 */
-	void setPersistenceContextRefName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Persistence Unit Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 *             The Application Assembler(or BeanProvider) may use the
-	 *             following syntax to avoid the need to rename persistence
-	 *             units to have unique names within a Java EE application.
-	 * 
-	 *             The Application Assembler specifies the pathname of the
-	 *             root of the persistence.xml file for the referenced
-	 *             persistence unit and appends the name of the persistence
-	 *             unit separated from the pathname by #. The pathname is
-	 *             relative to the referencing application component jar file.
-	 *             In this manner, multiple persistence units with the same
-	 *             persistence unit name may be uniquely identified when the
-	 *             Application Assembler cannot change persistence unit names.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Persistence Unit Name</em>' attribute.
-	 * @see #setPersistenceUnitName(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getPersistenceContextRef_PersistenceUnitName()
-	 * @generated
-	 */
-	String getPersistenceUnitName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getPersistenceUnitName <em>Persistence Unit Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Persistence Unit Name</em>' attribute.
-	 * @see #getPersistenceUnitName()
-	 * @generated
-	 */
-	void setPersistenceUnitName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Persistence Context Type</b></em>' attribute.
-	 * The default value is <code>"Transaction"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.core.PersistenceContextType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Persistence Context Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Persistence Context Type</em>' attribute.
-	 * @see org.eclipse.jst.javaee.core.PersistenceContextType
-	 * @see #isSetPersistenceContextType()
-	 * @see #unsetPersistenceContextType()
-	 * @see #setPersistenceContextType(PersistenceContextType)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getPersistenceContextRef_PersistenceContextType()
-	 * @generated
-	 */
-	PersistenceContextType getPersistenceContextType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getPersistenceContextType <em>Persistence Context Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Persistence Context Type</em>' attribute.
-	 * @see org.eclipse.jst.javaee.core.PersistenceContextType
-	 * @see #isSetPersistenceContextType()
-	 * @see #unsetPersistenceContextType()
-	 * @see #getPersistenceContextType()
-	 * @generated
-	 */
-	void setPersistenceContextType(PersistenceContextType value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getPersistenceContextType <em>Persistence Context Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetPersistenceContextType()
-	 * @see #getPersistenceContextType()
-	 * @see #setPersistenceContextType(PersistenceContextType)
-	 * @generated
-	 */
-	void unsetPersistenceContextType();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getPersistenceContextType <em>Persistence Context Type</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Persistence Context Type</em>' attribute is set.
-	 * @see #unsetPersistenceContextType()
-	 * @see #getPersistenceContextType()
-	 * @see #setPersistenceContextType(PersistenceContextType)
-	 * @generated
-	 */
-	boolean isSetPersistenceContextType();
-
-	/**
-	 * Returns the value of the '<em><b>Persistence Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.PropertyType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 *             Used to specify properties for the container or persistence
-	 *             provider.  Vendor-specific properties may be included in
-	 *             the set of properties.  Properties that are not recognized
-	 *             by a vendor must be ignored.  Entries that make use of the
-	 *             namespace javax.persistence and its subnamespaces must not
-	 *             be used for vendor-specific properties.  The namespace
-	 *             javax.persistence is reserved for use by the specification.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Persistence Properties</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getPersistenceContextRef_PersistenceProperties()
-	 * @generated
-	 */
-	List getPersistenceProperties();
-
-	/**
-	 * Returns the value of the '<em><b>Mapped Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 	    
-	 * 
-	 * 	      A product specific name that this resource should be
-	 * 	      mapped to.  The name of this resource, as defined by the
-	 * 	      resource's name element or defaulted, is a name that is
-	 * 	      local to the application component using the resource.
-	 * 	      (It's a name in the JNDI java:comp/env namespace.)  Many
-	 * 	      application servers provide a way to map these local
-	 * 	      names to names of resources known to the application
-	 * 	      server.  This mapped name is often a global JNDI name,
-	 * 	      but may be a name of any form.
-	 * 
-	 * 	      Application servers are not required to support any
-	 * 	      particular form or type of mapped name, nor the ability
-	 * 	      to use mapped names.  The mapped name is
-	 * 	      product-dependent and often installation-dependent.  No
-	 * 	      use of a mapped name is portable.
-	 * 
-	 * 	      
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Mapped Name</em>' attribute.
-	 * @see #setMappedName(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getPersistenceContextRef_MappedName()
-	 * @generated
-	 */
-	String getMappedName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getMappedName <em>Mapped Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Mapped Name</em>' attribute.
-	 * @see #getMappedName()
-	 * @generated
-	 */
-	void setMappedName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Injection Targets</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.InjectionTarget}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Injection Targets</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Injection Targets</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getPersistenceContextRef_InjectionTargets()
-	 * @generated
-	 */
-	List getInjectionTargets();
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getPersistenceContextRef_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // PersistenceContextRef
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/PersistenceContextType.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/PersistenceContextType.java
deleted file mode 100644
index e7a380d7b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/PersistenceContextType.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Persistence Context Type</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The persistence-context-typeType specifies the transactional
- * 	nature of a persistence context reference.
- * 
- * 	The value of the persistence-context-type element must be
- * 	one of the following:
- * 	    Transaction
- *             Extended
- * 
- *       
- * <!-- end-model-doc -->
- * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getPersistenceContextType()
- * @generated
- */
-public final class PersistenceContextType extends AbstractEnumerator {
-	/**
-	 * The '<em><b>Transaction</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Transaction</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #TRANSACTION_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int TRANSACTION = 0;
-
-	/**
-	 * The '<em><b>Extended</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Extended</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #EXTENDED_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int EXTENDED = 1;
-
-	/**
-	 * The '<em><b>Transaction</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #TRANSACTION
-	 * @generated
-	 * @ordered
-	 */
-	public static final PersistenceContextType TRANSACTION_LITERAL = new PersistenceContextType(TRANSACTION, "Transaction", "Transaction"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Extended</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #EXTENDED
-	 * @generated
-	 * @ordered
-	 */
-	public static final PersistenceContextType EXTENDED_LITERAL = new PersistenceContextType(EXTENDED, "Extended", "Extended"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * An array of all the '<em><b>Persistence Context Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final PersistenceContextType[] VALUES_ARRAY =
-		new PersistenceContextType[] {
-			TRANSACTION_LITERAL,
-			EXTENDED_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Persistence Context Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Persistence Context Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static PersistenceContextType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			PersistenceContextType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Persistence Context Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static PersistenceContextType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			PersistenceContextType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Persistence Context Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static PersistenceContextType get(int value) {
-		switch (value) {
-			case TRANSACTION: return TRANSACTION_LITERAL;
-			case EXTENDED: return EXTENDED_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private PersistenceContextType(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //PersistenceContextType
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/PersistenceUnitRef.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/PersistenceUnitRef.java
deleted file mode 100644
index 0057d7536..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/PersistenceUnitRef.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Persistence Unit Ref</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 	
- * 
- * 	  The persistence-unit-ref element contains a declaration
- * 	  of Deployment Component's reference to a persistence unit
- * 	  associated within a Deployment Component's
- * 	  environment. It consists of:
- * 
- * 		  - an optional description
- * 		  - the persistence unit reference name
- * 		  - an optional persistence unit name.  If not specified,
- *                     the default persistence unit is assumed.
- * 		  - optional injection targets
- * 
- * 	  Examples:
- * 
- *             &lt;persistence-unit-ref&gt;
- *               &lt;persistence-unit-ref-name&gt;myPersistenceUnit
- *               &lt;/persistence-unit-ref-name&gt;
- *             &lt;/persistence-unit-ref&gt;
- * 
- *             &lt;persistence-unit-ref&gt;
- *               &lt;persistence-unit-ref-name&gt;myPersistenceUnit
- *                 &lt;/persistence-unit-ref-name&gt;
- *               &lt;persistence-unit-name&gt;PersistenceUnit1
- *                 &lt;/persistence-unit-name&gt;
- *             &lt;/persistence-unit-ref&gt;
- * 
- * 	  
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getPersistenceUnitRefName <em>Persistence Unit Ref Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getPersistenceUnitName <em>Persistence Unit Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getMappedName <em>Mapped Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getInjectionTargets <em>Injection Targets</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getPersistenceUnitRef()
- * @extends JavaEEObject
- * @generated
- */
-public interface PersistenceUnitRef extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getPersistenceUnitRef_Descriptions()
-	 * @generated
-	 */
-	List getDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>Persistence Unit Ref Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The persistence-unit-ref-name element specifies
-	 * 	    the name of a persistence unit reference; its
-	 * 	    value is the environment entry name used in
-	 * 	    Deployment Component code.  The name is a JNDI name
-	 * 	    relative to the java:comp/env context.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Persistence Unit Ref Name</em>' attribute.
-	 * @see #setPersistenceUnitRefName(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getPersistenceUnitRef_PersistenceUnitRefName()
-	 * @generated
-	 */
-	String getPersistenceUnitRefName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getPersistenceUnitRefName <em>Persistence Unit Ref Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Persistence Unit Ref Name</em>' attribute.
-	 * @see #getPersistenceUnitRefName()
-	 * @generated
-	 */
-	void setPersistenceUnitRefName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Persistence Unit Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 *             The Application Assembler(or BeanProvider) may use the
-	 *             following syntax to avoid the need to rename persistence
-	 *             units to have unique names within a Java EE application.
-	 * 
-	 *             The Application Assembler specifies the pathname of the
-	 *             root of the persistence.xml file for the referenced
-	 *             persistence unit and appends the name of the persistence
-	 *             unit separated from the pathname by #. The pathname is
-	 *             relative to the referencing application component jar file.
-	 *             In this manner, multiple persistence units with the same
-	 *             persistence unit name may be uniquely identified when the
-	 *             Application Assembler cannot change persistence unit names.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Persistence Unit Name</em>' attribute.
-	 * @see #setPersistenceUnitName(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getPersistenceUnitRef_PersistenceUnitName()
-	 * @generated
-	 */
-	String getPersistenceUnitName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getPersistenceUnitName <em>Persistence Unit Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Persistence Unit Name</em>' attribute.
-	 * @see #getPersistenceUnitName()
-	 * @generated
-	 */
-	void setPersistenceUnitName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Mapped Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 	    
-	 * 
-	 * 	      A product specific name that this resource should be
-	 * 	      mapped to.  The name of this resource, as defined by the
-	 * 	      resource's name element or defaulted, is a name that is
-	 * 	      local to the application component using the resource.
-	 * 	      (It's a name in the JNDI java:comp/env namespace.)  Many
-	 * 	      application servers provide a way to map these local
-	 * 	      names to names of resources known to the application
-	 * 	      server.  This mapped name is often a global JNDI name,
-	 * 	      but may be a name of any form.
-	 * 
-	 * 	      Application servers are not required to support any
-	 * 	      particular form or type of mapped name, nor the ability
-	 * 	      to use mapped names.  The mapped name is
-	 * 	      product-dependent and often installation-dependent.  No
-	 * 	      use of a mapped name is portable.
-	 * 
-	 * 	      
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Mapped Name</em>' attribute.
-	 * @see #setMappedName(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getPersistenceUnitRef_MappedName()
-	 * @generated
-	 */
-	String getMappedName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getMappedName <em>Mapped Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Mapped Name</em>' attribute.
-	 * @see #getMappedName()
-	 * @generated
-	 */
-	void setMappedName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Injection Targets</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.InjectionTarget}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Injection Targets</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Injection Targets</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getPersistenceUnitRef_InjectionTargets()
-	 * @generated
-	 */
-	List getInjectionTargets();
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getPersistenceUnitRef_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // PersistenceUnitRef
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/PortComponentRef.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/PortComponentRef.java
deleted file mode 100644
index 34ada17ce..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/PortComponentRef.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Port Component Ref</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The port-component-ref element declares a client dependency
- * 	on the container for resolving a Service Endpoint Interface
- * 	to a WSDL port. It optionally associates the Service Endpoint
- * 	Interface with a particular port-component. This is only used
- * 	by the container for a Service.getPort(Class) method call.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.PortComponentRef#getServiceEndpointInterface <em>Service Endpoint Interface</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.PortComponentRef#isEnableMtom <em>Enable Mtom</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.PortComponentRef#getPortComponentLink <em>Port Component Link</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.PortComponentRef#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getPortComponentRef()
- * @extends JavaEEObject
- * @generated
- */
-public interface PortComponentRef extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Service Endpoint Interface</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The service-endpoint-interface element defines a fully qualified
-	 * 	    Java class that represents the Service Endpoint Interface of a
-	 * 	    WSDL port.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Service Endpoint Interface</em>' attribute.
-	 * @see #setServiceEndpointInterface(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getPortComponentRef_ServiceEndpointInterface()
-	 * @generated
-	 */
-	String getServiceEndpointInterface();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.PortComponentRef#getServiceEndpointInterface <em>Service Endpoint Interface</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Service Endpoint Interface</em>' attribute.
-	 * @see #getServiceEndpointInterface()
-	 * @generated
-	 */
-	void setServiceEndpointInterface(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Enable Mtom</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 *             Used to enable or disable SOAP MTOM/XOP mechanism on the client
-	 * 	    side for a port-component.
-	 * 
-	 * 	    Not to be specified for JAX-RPC runtime
-	 *           
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Enable Mtom</em>' attribute.
-	 * @see #isSetEnableMtom()
-	 * @see #unsetEnableMtom()
-	 * @see #setEnableMtom(boolean)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getPortComponentRef_EnableMtom()
-	 * @generated
-	 */
-	boolean isEnableMtom();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.PortComponentRef#isEnableMtom <em>Enable Mtom</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Enable Mtom</em>' attribute.
-	 * @see #isSetEnableMtom()
-	 * @see #unsetEnableMtom()
-	 * @see #isEnableMtom()
-	 * @generated
-	 */
-	void setEnableMtom(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.javaee.core.PortComponentRef#isEnableMtom <em>Enable Mtom</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetEnableMtom()
-	 * @see #isEnableMtom()
-	 * @see #setEnableMtom(boolean)
-	 * @generated
-	 */
-	void unsetEnableMtom();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.core.PortComponentRef#isEnableMtom <em>Enable Mtom</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Enable Mtom</em>' attribute is set.
-	 * @see #unsetEnableMtom()
-	 * @see #isEnableMtom()
-	 * @see #setEnableMtom(boolean)
-	 * @generated
-	 */
-	boolean isSetEnableMtom();
-
-	/**
-	 * Returns the value of the '<em><b>Port Component Link</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The port-component-link element links a port-component-ref
-	 * 	    to a specific port-component required to be made available
-	 * 	    by a service reference.
-	 * 
-	 * 	    The value of a port-component-link must be the
-	 * 	    port-component-name of a port-component in the same module
-	 * 	    or another module in the same application unit. The syntax
-	 * 	    for specification follows the syntax defined for ejb-link
-	 * 	    in the EJB 2.0 specification.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Port Component Link</em>' attribute.
-	 * @see #setPortComponentLink(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getPortComponentRef_PortComponentLink()
-	 * @generated
-	 */
-	String getPortComponentLink();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.PortComponentRef#getPortComponentLink <em>Port Component Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Port Component Link</em>' attribute.
-	 * @see #getPortComponentLink()
-	 * @generated
-	 */
-	void setPortComponentLink(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getPortComponentRef_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.PortComponentRef#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // PortComponentRef
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/PropertyType.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/PropertyType.java
deleted file mode 100644
index d758b3a68..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/PropertyType.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Property Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	Specifies a name/value pair.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.PropertyType#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.PropertyType#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.PropertyType#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getPropertyType()
- * @extends JavaEEObject
- * @generated
- */
-public interface PropertyType extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getPropertyType_Name()
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.PropertyType#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getPropertyType_Value()
-	 * @generated
-	 */
-	String getValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.PropertyType#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getPropertyType_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.PropertyType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // PropertyType
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/ResAuthType.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/ResAuthType.java
deleted file mode 100644
index 44a7f0a48..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/ResAuthType.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Res Auth Type</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The res-authType specifies whether the Deployment Component
- * 	code signs on programmatically to the resource manager, or
- * 	whether the Container will sign on to the resource manager
- * 	on behalf of the Deployment Component. In the latter case,
- * 	the Container uses information that is supplied by the
- * 	Deployer.
- * 
- * 	The value must be one of the two following:
- * 
- * 	    Application
- * 	    Container
- * 
- *       
- * <!-- end-model-doc -->
- * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getResAuthType()
- * @generated
- */
-public final class ResAuthType extends AbstractEnumerator {
-	/**
-	 * The '<em><b>Application</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Application</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #APPLICATION_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int APPLICATION = 0;
-
-	/**
-	 * The '<em><b>Container</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Container</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #CONTAINER_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CONTAINER = 1;
-
-	/**
-	 * The '<em><b>Application</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #APPLICATION
-	 * @generated
-	 * @ordered
-	 */
-	public static final ResAuthType APPLICATION_LITERAL = new ResAuthType(APPLICATION, "Application", "Application"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Container</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #CONTAINER
-	 * @generated
-	 * @ordered
-	 */
-	public static final ResAuthType CONTAINER_LITERAL = new ResAuthType(CONTAINER, "Container", "Container"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * An array of all the '<em><b>Res Auth Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final ResAuthType[] VALUES_ARRAY =
-		new ResAuthType[] {
-			APPLICATION_LITERAL,
-			CONTAINER_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Res Auth Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Res Auth Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ResAuthType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ResAuthType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Res Auth Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ResAuthType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ResAuthType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Res Auth Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ResAuthType get(int value) {
-		switch (value) {
-			case APPLICATION: return APPLICATION_LITERAL;
-			case CONTAINER: return CONTAINER_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private ResAuthType(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //ResAuthType
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/ResSharingScopeType.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/ResSharingScopeType.java
deleted file mode 100644
index 72319ef8a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/ResSharingScopeType.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Res Sharing Scope Type</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The res-sharing-scope type specifies whether connections
- * 	obtained through the given resource manager connection
- * 	factory reference can be shared. The value, if specified,
- * 	must be one of the two following:
- * 
- * 	    Shareable
- * 	    Unshareable
- * 
- * 	The default value is Shareable.
- * 
- *       
- * <!-- end-model-doc -->
- * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getResSharingScopeType()
- * @generated
- */
-public final class ResSharingScopeType extends AbstractEnumerator {
-	/**
-	 * The '<em><b>Shareable</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Shareable</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SHAREABLE_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SHAREABLE = 0;
-
-	/**
-	 * The '<em><b>Unshareable</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Unshareable</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #UNSHAREABLE_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int UNSHAREABLE = 1;
-
-	/**
-	 * The '<em><b>Shareable</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #SHAREABLE
-	 * @generated
-	 * @ordered
-	 */
-	public static final ResSharingScopeType SHAREABLE_LITERAL = new ResSharingScopeType(SHAREABLE, "Shareable", "Shareable"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Unshareable</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #UNSHAREABLE
-	 * @generated
-	 * @ordered
-	 */
-	public static final ResSharingScopeType UNSHAREABLE_LITERAL = new ResSharingScopeType(UNSHAREABLE, "Unshareable", "Unshareable"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * An array of all the '<em><b>Res Sharing Scope Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final ResSharingScopeType[] VALUES_ARRAY =
-		new ResSharingScopeType[] {
-			SHAREABLE_LITERAL,
-			UNSHAREABLE_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Res Sharing Scope Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Res Sharing Scope Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ResSharingScopeType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ResSharingScopeType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Res Sharing Scope Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ResSharingScopeType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ResSharingScopeType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Res Sharing Scope Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ResSharingScopeType get(int value) {
-		switch (value) {
-			case SHAREABLE: return SHAREABLE_LITERAL;
-			case UNSHAREABLE: return UNSHAREABLE_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private ResSharingScopeType(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //ResSharingScopeType
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/ResourceEnvRef.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/ResourceEnvRef.java
deleted file mode 100644
index c4313c9c3..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/ResourceEnvRef.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Resource Env Ref</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 	
- * 
- * 	  The resource-env-refType is used to define
- * 	  resource-env-type elements.  It contains a declaration of a
- * 	  Deployment Component's reference to an administered object
- * 	  associated with a resource in the Deployment Component's
- * 	  environment.  It consists of an optional description, the
- * 	  resource environment reference name, and an optional
- * 	  indication of the resource environment reference type
- * 	  expected by the Deployment Component code.
- * 
- * 	  It also includes optional elements to define injection of
- * 	  the named resource into fields or JavaBeans properties.
- * 
- * 	  The resource environment type must be supplied unless an
- * 	  injection target is specified, in which case the type
- * 	  of the target is used.  If both are specified, the type
- * 	  must be assignment compatible with the type of the injection
- * 	  target.
- * 
- * 	  Example:
- * 
- * 	  &lt;resource-env-ref&gt;
- * 	      &lt;resource-env-ref-name&gt;jms/StockQueue
- * 	      &lt;/resource-env-ref-name&gt;
- * 	      &lt;resource-env-ref-type&gt;javax.jms.Queue
- * 	      &lt;/resource-env-ref-type&gt;
- * 	  &lt;/resource-env-ref&gt;
- * 
- * 	  
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.ResourceEnvRef#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.ResourceEnvRef#getResourceEnvRefName <em>Resource Env Ref Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.ResourceEnvRef#getResourceEnvRefType <em>Resource Env Ref Type</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.ResourceEnvRef#getMappedName <em>Mapped Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.ResourceEnvRef#getInjectionTargets <em>Injection Targets</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.ResourceEnvRef#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getResourceEnvRef()
- * @extends JavaEEObject
- * @generated
- */
-public interface ResourceEnvRef extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getResourceEnvRef_Descriptions()
-	 * @generated
-	 */
-	List getDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>Resource Env Ref Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The resource-env-ref-name element specifies the name
-	 * 	    of a resource environment reference; its value is
-	 * 	    the environment entry name used in
-	 * 	    the Deployment Component code.  The name is a JNDI
-	 * 	    name relative to the java:comp/env context and must
-	 * 	    be unique within a Deployment Component.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Resource Env Ref Name</em>' attribute.
-	 * @see #setResourceEnvRefName(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getResourceEnvRef_ResourceEnvRefName()
-	 * @generated
-	 */
-	String getResourceEnvRefName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.ResourceEnvRef#getResourceEnvRefName <em>Resource Env Ref Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Resource Env Ref Name</em>' attribute.
-	 * @see #getResourceEnvRefName()
-	 * @generated
-	 */
-	void setResourceEnvRefName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Resource Env Ref Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The resource-env-ref-type element specifies the type
-	 * 	    of a resource environment reference.  It is the
-	 * 	    fully qualified name of a Java language class or
-	 * 	    interface.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Resource Env Ref Type</em>' attribute.
-	 * @see #setResourceEnvRefType(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getResourceEnvRef_ResourceEnvRefType()
-	 * @generated
-	 */
-	String getResourceEnvRefType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.ResourceEnvRef#getResourceEnvRefType <em>Resource Env Ref Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Resource Env Ref Type</em>' attribute.
-	 * @see #getResourceEnvRefType()
-	 * @generated
-	 */
-	void setResourceEnvRefType(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Mapped Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 	    
-	 * 
-	 * 	      A product specific name that this resource should be
-	 * 	      mapped to.  The name of this resource, as defined by the
-	 * 	      resource's name element or defaulted, is a name that is
-	 * 	      local to the application component using the resource.
-	 * 	      (It's a name in the JNDI java:comp/env namespace.)  Many
-	 * 	      application servers provide a way to map these local
-	 * 	      names to names of resources known to the application
-	 * 	      server.  This mapped name is often a global JNDI name,
-	 * 	      but may be a name of any form.
-	 * 
-	 * 	      Application servers are not required to support any
-	 * 	      particular form or type of mapped name, nor the ability
-	 * 	      to use mapped names.  The mapped name is
-	 * 	      product-dependent and often installation-dependent.  No
-	 * 	      use of a mapped name is portable.
-	 * 
-	 * 	      
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Mapped Name</em>' attribute.
-	 * @see #setMappedName(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getResourceEnvRef_MappedName()
-	 * @generated
-	 */
-	String getMappedName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.ResourceEnvRef#getMappedName <em>Mapped Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Mapped Name</em>' attribute.
-	 * @see #getMappedName()
-	 * @generated
-	 */
-	void setMappedName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Injection Targets</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.InjectionTarget}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Injection Targets</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Injection Targets</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getResourceEnvRef_InjectionTargets()
-	 * @generated
-	 */
-	List getInjectionTargets();
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getResourceEnvRef_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.ResourceEnvRef#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // ResourceEnvRef
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/ResourceRef.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/ResourceRef.java
deleted file mode 100644
index 83ef21789..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/ResourceRef.java
+++ /dev/null
@@ -1,349 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Resource Ref</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 	
- * 
- * 	  The resource-refType contains a declaration of a
- * 	  Deployment Component's reference to an external resource. It
- * 	  consists of an optional description, the resource manager
- * 	  connection factory reference name, an optional indication of
- * 	  the resource manager connection factory type expected by the
- * 	  Deployment Component code, an optional type of authentication
- * 	  (Application or Container), and an optional specification of
- * 	  the shareability of connections obtained from the resource
- * 	  (Shareable or Unshareable).
- * 
- * 	  It also includes optional elements to define injection of
- * 	  the named resource into fields or JavaBeans properties.
- * 
- * 	  The connection factory type must be supplied unless an
- * 	  injection target is specified, in which case the type
- * 	  of the target is used.  If both are specified, the type
- * 	  must be assignment compatible with the type of the injection
- * 	  target.
- * 
- * 	  Example:
- * 
- * 	  &lt;resource-ref&gt;
- * 	      &lt;res-ref-name&gt;jdbc/EmployeeAppDB&lt;/res-ref-name&gt;
- * 	      &lt;res-type&gt;javax.sql.DataSource&lt;/res-type&gt;
- * 	      &lt;res-auth&gt;Container&lt;/res-auth&gt;
- * 	      &lt;res-sharing-scope&gt;Shareable&lt;/res-sharing-scope&gt;
- * 	  &lt;/resource-ref&gt;
- * 
- * 	  
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.ResourceRef#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.ResourceRef#getResRefName <em>Res Ref Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.ResourceRef#getResType <em>Res Type</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.ResourceRef#getResAuth <em>Res Auth</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.ResourceRef#getResSharingScope <em>Res Sharing Scope</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.ResourceRef#getMappedName <em>Mapped Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.ResourceRef#getInjectionTargets <em>Injection Targets</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.ResourceRef#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getResourceRef()
- * @extends JavaEEObject
- * @generated
- */
-public interface ResourceRef extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getResourceRef_Descriptions()
-	 * @generated
-	 */
-	List getDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>Res Ref Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The res-ref-name element specifies the name of a
-	 * 	    resource manager connection factory reference.
-	 * 	    The name is a JNDI name relative to the
-	 * 	    java:comp/env context.
-	 * 	    The name must be unique within a Deployment File.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Res Ref Name</em>' attribute.
-	 * @see #setResRefName(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getResourceRef_ResRefName()
-	 * @generated
-	 */
-	String getResRefName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.ResourceRef#getResRefName <em>Res Ref Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Res Ref Name</em>' attribute.
-	 * @see #getResRefName()
-	 * @generated
-	 */
-	void setResRefName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Res Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The res-type element specifies the type of the data
-	 * 	    source. The type is specified by the fully qualified
-	 * 	    Java language class or interface
-	 * 	    expected to be implemented by the data source.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Res Type</em>' attribute.
-	 * @see #setResType(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getResourceRef_ResType()
-	 * @generated
-	 */
-	String getResType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.ResourceRef#getResType <em>Res Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Res Type</em>' attribute.
-	 * @see #getResType()
-	 * @generated
-	 */
-	void setResType(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Res Auth</b></em>' attribute.
-	 * The default value is <code>"Application"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.core.ResAuthType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Res Auth</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Res Auth</em>' attribute.
-	 * @see org.eclipse.jst.javaee.core.ResAuthType
-	 * @see #isSetResAuth()
-	 * @see #unsetResAuth()
-	 * @see #setResAuth(ResAuthType)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getResourceRef_ResAuth()
-	 * @generated
-	 */
-	ResAuthType getResAuth();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.ResourceRef#getResAuth <em>Res Auth</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Res Auth</em>' attribute.
-	 * @see org.eclipse.jst.javaee.core.ResAuthType
-	 * @see #isSetResAuth()
-	 * @see #unsetResAuth()
-	 * @see #getResAuth()
-	 * @generated
-	 */
-	void setResAuth(ResAuthType value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.javaee.core.ResourceRef#getResAuth <em>Res Auth</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetResAuth()
-	 * @see #getResAuth()
-	 * @see #setResAuth(ResAuthType)
-	 * @generated
-	 */
-	void unsetResAuth();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.core.ResourceRef#getResAuth <em>Res Auth</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Res Auth</em>' attribute is set.
-	 * @see #unsetResAuth()
-	 * @see #getResAuth()
-	 * @see #setResAuth(ResAuthType)
-	 * @generated
-	 */
-	boolean isSetResAuth();
-
-	/**
-	 * Returns the value of the '<em><b>Res Sharing Scope</b></em>' attribute.
-	 * The default value is <code>"Shareable"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.core.ResSharingScopeType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Res Sharing Scope</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Res Sharing Scope</em>' attribute.
-	 * @see org.eclipse.jst.javaee.core.ResSharingScopeType
-	 * @see #isSetResSharingScope()
-	 * @see #unsetResSharingScope()
-	 * @see #setResSharingScope(ResSharingScopeType)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getResourceRef_ResSharingScope()
-	 * @generated
-	 */
-	ResSharingScopeType getResSharingScope();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.ResourceRef#getResSharingScope <em>Res Sharing Scope</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Res Sharing Scope</em>' attribute.
-	 * @see org.eclipse.jst.javaee.core.ResSharingScopeType
-	 * @see #isSetResSharingScope()
-	 * @see #unsetResSharingScope()
-	 * @see #getResSharingScope()
-	 * @generated
-	 */
-	void setResSharingScope(ResSharingScopeType value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.javaee.core.ResourceRef#getResSharingScope <em>Res Sharing Scope</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetResSharingScope()
-	 * @see #getResSharingScope()
-	 * @see #setResSharingScope(ResSharingScopeType)
-	 * @generated
-	 */
-	void unsetResSharingScope();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.core.ResourceRef#getResSharingScope <em>Res Sharing Scope</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Res Sharing Scope</em>' attribute is set.
-	 * @see #unsetResSharingScope()
-	 * @see #getResSharingScope()
-	 * @see #setResSharingScope(ResSharingScopeType)
-	 * @generated
-	 */
-	boolean isSetResSharingScope();
-
-	/**
-	 * Returns the value of the '<em><b>Mapped Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 	    
-	 * 
-	 * 	      A product specific name that this resource should be
-	 * 	      mapped to.  The name of this resource, as defined by the
-	 * 	      resource's name element or defaulted, is a name that is
-	 * 	      local to the application component using the resource.
-	 * 	      (It's a name in the JNDI java:comp/env namespace.)  Many
-	 * 	      application servers provide a way to map these local
-	 * 	      names to names of resources known to the application
-	 * 	      server.  This mapped name is often a global JNDI name,
-	 * 	      but may be a name of any form.
-	 * 
-	 * 	      Application servers are not required to support any
-	 * 	      particular form or type of mapped name, nor the ability
-	 * 	      to use mapped names.  The mapped name is
-	 * 	      product-dependent and often installation-dependent.  No
-	 * 	      use of a mapped name is portable.
-	 * 
-	 * 	      
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Mapped Name</em>' attribute.
-	 * @see #setMappedName(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getResourceRef_MappedName()
-	 * @generated
-	 */
-	String getMappedName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.ResourceRef#getMappedName <em>Mapped Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Mapped Name</em>' attribute.
-	 * @see #getMappedName()
-	 * @generated
-	 */
-	void setMappedName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Injection Targets</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.InjectionTarget}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Injection Targets</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Injection Targets</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getResourceRef_InjectionTargets()
-	 * @generated
-	 */
-	List getInjectionTargets();
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getResourceRef_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.ResourceRef#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // ResourceRef
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/RunAs.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/RunAs.java
deleted file mode 100644
index 92f231e60..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/RunAs.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Run As</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The run-asType specifies the run-as identity to be
- * 	used for the execution of a component. It contains an
- * 	optional description, and the name of a security role.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.RunAs#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.RunAs#getRoleName <em>Role Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.RunAs#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getRunAs()
- * @extends JavaEEObject
- * @generated
- */
-public interface RunAs extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getRunAs_Descriptions()
-	 * @generated
-	 */
-	List getDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>Role Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Role Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Role Name</em>' attribute.
-	 * @see #setRoleName(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getRunAs_RoleName()
-	 * @generated
-	 */
-	String getRoleName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.RunAs#getRoleName <em>Role Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Role Name</em>' attribute.
-	 * @see #getRoleName()
-	 * @generated
-	 */
-	void setRoleName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getRunAs_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.RunAs#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // RunAs
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/SecurityRole.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/SecurityRole.java
deleted file mode 100644
index 2f1ac206c..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/SecurityRole.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Security Role</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 	
- * 
- * 	  The security-roleType contains the definition of a security
- * 	  role. The definition consists of an optional description of
- * 	  the security role, and the security role name.
- * 
- * 	  Example:
- * 
- * 	      &lt;security-role&gt;
- * 	      &lt;description&gt;
- * 		  This role includes all employees who are authorized
- * 		  to access the employee service application.
- * 	      &lt;/description&gt;
- * 	      &lt;role-name&gt;employee&lt;/role-name&gt;
- * 	      &lt;/security-role&gt;
- * 
- * 	  
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.SecurityRole#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.SecurityRole#getRoleName <em>Role Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.SecurityRole#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getSecurityRole()
- * @extends JavaEEObject
- * @generated
- */
-public interface SecurityRole extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getSecurityRole_Descriptions()
-	 * @generated
-	 */
-	List getDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>Role Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Role Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Role Name</em>' attribute.
-	 * @see #setRoleName(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getSecurityRole_RoleName()
-	 * @generated
-	 */
-	String getRoleName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.SecurityRole#getRoleName <em>Role Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Role Name</em>' attribute.
-	 * @see #getRoleName()
-	 * @generated
-	 */
-	void setRoleName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getSecurityRole_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.SecurityRole#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // SecurityRole
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/SecurityRoleRef.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/SecurityRoleRef.java
deleted file mode 100644
index 36b1d7e3d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/SecurityRoleRef.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Security Role Ref</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The security-role-refType contains the declaration of a
- * 	security role reference in a component's or a
- * 	Deployment Component's code. The declaration consists of an
- * 	optional description, the security role name used in the
- * 	code, and an optional link to a security role. If the
- * 	security role is not specified, the Deployer must choose an
- * 	appropriate security role.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.SecurityRoleRef#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.SecurityRoleRef#getRoleName <em>Role Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.SecurityRoleRef#getRoleLink <em>Role Link</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.SecurityRoleRef#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getSecurityRoleRef()
- * @extends JavaEEObject
- * @generated
- */
-public interface SecurityRoleRef extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getSecurityRoleRef_Descriptions()
-	 * @generated
-	 */
-	List getDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>Role Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The value of the role-name element must be the String used
-	 * 	    as the parameter to the
-	 * 	    EJBContext.isCallerInRole(String roleName) method or the
-	 * 	    HttpServletRequest.isUserInRole(String role) method.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Role Name</em>' attribute.
-	 * @see #setRoleName(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getSecurityRoleRef_RoleName()
-	 * @generated
-	 */
-	String getRoleName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.SecurityRoleRef#getRoleName <em>Role Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Role Name</em>' attribute.
-	 * @see #getRoleName()
-	 * @generated
-	 */
-	void setRoleName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Role Link</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The role-link element is a reference to a defined
-	 * 	    security role. The role-link element must contain
-	 * 	    the name of one of the security roles defined in the
-	 * 	    security-role elements.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Role Link</em>' attribute.
-	 * @see #setRoleLink(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getSecurityRoleRef_RoleLink()
-	 * @generated
-	 */
-	String getRoleLink();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.SecurityRoleRef#getRoleLink <em>Role Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Role Link</em>' attribute.
-	 * @see #getRoleLink()
-	 * @generated
-	 */
-	void setRoleLink(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getSecurityRoleRef_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.SecurityRoleRef#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // SecurityRoleRef
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/ServiceRef.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/ServiceRef.java
deleted file mode 100644
index 62e04e67d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/ServiceRef.java
+++ /dev/null
@@ -1,452 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Service Ref</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The service-ref element declares a reference to a Web
- * 	service. It contains optional description, display name and
- * 	icons, a declaration of the required Service interface,
- * 	an optional WSDL document location, an optional set
- * 	of JAX-RPC mappings, an optional QName for the service element,
- * 	an optional set of Service Endpoint Interfaces to be resolved
- * 	by the container to a WSDL port, and an optional set of handlers.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.ServiceRef#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.ServiceRef#getDisplayNames <em>Display Names</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.ServiceRef#getIcons <em>Icons</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.ServiceRef#getServiceRefName <em>Service Ref Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.ServiceRef#getServiceInterface <em>Service Interface</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.ServiceRef#getServiceRefType <em>Service Ref Type</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.ServiceRef#getWsdlFile <em>Wsdl File</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.ServiceRef#getJaxrpcMappingFile <em>Jaxrpc Mapping File</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.ServiceRef#getServiceQname <em>Service Qname</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.ServiceRef#getPortComponentRefs <em>Port Component Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.ServiceRef#getHandlers <em>Handlers</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.ServiceRef#getHandlerChains <em>Handler Chains</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.ServiceRef#getMappedName <em>Mapped Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.ServiceRef#getInjectionTargets <em>Injection Targets</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.ServiceRef#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRef()
- * @extends JavaEEObject
- * @generated
- */
-public interface ServiceRef extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRef_Descriptions()
-	 * @generated
-	 */
-	List getDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>Display Names</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.DisplayName}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Names</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Names</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRef_DisplayNames()
-	 * @generated
-	 */
-	List getDisplayNames();
-
-	/**
-	 * Returns the value of the '<em><b>Icons</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Icon}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Icons</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Icons</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRef_Icons()
-	 * @generated
-	 */
-	List getIcons();
-
-	/**
-	 * Returns the value of the '<em><b>Service Ref Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The service-ref-name element declares logical name that the
-	 * 	    components in the module use to look up the Web service. It
-	 * 	    is recommended that all service reference names start with
-	 * 	    "service/".
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Service Ref Name</em>' attribute.
-	 * @see #setServiceRefName(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRef_ServiceRefName()
-	 * @generated
-	 */
-	String getServiceRefName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.ServiceRef#getServiceRefName <em>Service Ref Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Service Ref Name</em>' attribute.
-	 * @see #getServiceRefName()
-	 * @generated
-	 */
-	void setServiceRefName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Service Interface</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The service-interface element declares the fully qualified class
-	 * 	    name of the JAX-RPC Service interface the client depends on.
-	 * 	    In most cases the value will be javax.xml.rpc.Service.  A JAX-RPC
-	 * 	    generated Service Interface class may also be specified.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Service Interface</em>' attribute.
-	 * @see #setServiceInterface(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRef_ServiceInterface()
-	 * @generated
-	 */
-	String getServiceInterface();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.ServiceRef#getServiceInterface <em>Service Interface</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Service Interface</em>' attribute.
-	 * @see #getServiceInterface()
-	 * @generated
-	 */
-	void setServiceInterface(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Service Ref Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The service-ref-type element declares the type of the service-ref
-	 * 	    element that is injected or returned when a JNDI lookup is done.
-	 * 	    This must be either a fully qualified name of Service class or
-	 * 	    the fully qualified name of service endpoint interface class.
-	 * 	    This is only used with JAX-WS runtime where the corresponding
-	 * 	    @WebServiceRef annotation can be used to denote both a Service
-	 * 	    or a Port.
-	 * 
-	 * 	    If this is not specified, then the type of service-ref element
-	 * 	    that is injected or returned when a JNDI lookup is done is
-	 * 	    always a Service interface/class.
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Service Ref Type</em>' attribute.
-	 * @see #setServiceRefType(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRef_ServiceRefType()
-	 * @generated
-	 */
-	String getServiceRefType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.ServiceRef#getServiceRefType <em>Service Ref Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Service Ref Type</em>' attribute.
-	 * @see #getServiceRefType()
-	 * @generated
-	 */
-	void setServiceRefType(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Wsdl File</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The wsdl-file element contains the URI location of a WSDL
-	 * 	    file. The location is relative to the root of the module.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Wsdl File</em>' attribute.
-	 * @see #setWsdlFile(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRef_WsdlFile()
-	 * @generated
-	 */
-	String getWsdlFile();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.ServiceRef#getWsdlFile <em>Wsdl File</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Wsdl File</em>' attribute.
-	 * @see #getWsdlFile()
-	 * @generated
-	 */
-	void setWsdlFile(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Jaxrpc Mapping File</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The jaxrpc-mapping-file element contains the name of a file that
-	 * 	    describes the JAX-RPC mapping between the Java interaces used by
-	 * 	    the application and the WSDL description in the wsdl-file.  The
-	 * 	    file name is a relative path within the module file.
-	 * 
-	 * 	    This is not required when JAX-WS based runtime is used.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Jaxrpc Mapping File</em>' attribute.
-	 * @see #setJaxrpcMappingFile(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRef_JaxrpcMappingFile()
-	 * @generated
-	 */
-	String getJaxrpcMappingFile();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.ServiceRef#getJaxrpcMappingFile <em>Jaxrpc Mapping File</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Jaxrpc Mapping File</em>' attribute.
-	 * @see #getJaxrpcMappingFile()
-	 * @generated
-	 */
-	void setJaxrpcMappingFile(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Service Qname</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The service-qname element declares the specific WSDL service
-	 * 	    element that is being refered to.  It is not specified if no
-	 * 	    wsdl-file is declared.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Service Qname</em>' attribute.
-	 * @see #setServiceQname(Object)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRef_ServiceQname()
-	 * @generated
-	 */
-	Object getServiceQname();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.ServiceRef#getServiceQname <em>Service Qname</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Service Qname</em>' attribute.
-	 * @see #getServiceQname()
-	 * @generated
-	 */
-	void setServiceQname(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Port Component Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.PortComponentRef}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The port-component-ref element declares a client dependency
-	 * 	    on the container for resolving a Service Endpoint Interface
-	 * 	    to a WSDL port. It optionally associates the Service Endpoint
-	 * 	    Interface with a particular port-component. This is only used
-	 * 	    by the container for a Service.getPort(Class) method call.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Port Component Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRef_PortComponentRefs()
-	 * @generated
-	 */
-	List getPortComponentRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Handlers</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.ServiceRefHandler}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 		Declares the handler for a port-component. Handlers can
-	 * 		access the init-param name/value pairs using the
-	 * 		HandlerInfo interface. If port-name is not specified, the
-	 * 		handler is assumed to be associated with all ports of the
-	 * 		service.
-	 * 
-	 * 		To be used with JAX-RPC based runtime only.
-	 * 
-	 * 	      
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Handlers</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRef_Handlers()
-	 * @generated
-	 */
-	List getHandlers();
-
-	/**
-	 * Returns the value of the '<em><b>Handler Chains</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 		 To be used with JAX-WS based runtime only.
-	 * 	      
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Handler Chains</em>' containment reference.
-	 * @see #setHandlerChains(ServiceRefHandlerChains)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRef_HandlerChains()
-	 * @generated
-	 */
-	ServiceRefHandlerChains getHandlerChains();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.ServiceRef#getHandlerChains <em>Handler Chains</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Handler Chains</em>' containment reference.
-	 * @see #getHandlerChains()
-	 * @generated
-	 */
-	void setHandlerChains(ServiceRefHandlerChains value);
-
-	/**
-	 * Returns the value of the '<em><b>Mapped Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 	    
-	 * 
-	 * 	      A product specific name that this resource should be
-	 * 	      mapped to.  The name of this resource, as defined by the
-	 * 	      resource's name element or defaulted, is a name that is
-	 * 	      local to the application component using the resource.
-	 * 	      (It's a name in the JNDI java:comp/env namespace.)  Many
-	 * 	      application servers provide a way to map these local
-	 * 	      names to names of resources known to the application
-	 * 	      server.  This mapped name is often a global JNDI name,
-	 * 	      but may be a name of any form.
-	 * 
-	 * 	      Application servers are not required to support any
-	 * 	      particular form or type of mapped name, nor the ability
-	 * 	      to use mapped names.  The mapped name is
-	 * 	      product-dependent and often installation-dependent.  No
-	 * 	      use of a mapped name is portable.
-	 * 
-	 * 	      
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Mapped Name</em>' attribute.
-	 * @see #setMappedName(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRef_MappedName()
-	 * @generated
-	 */
-	String getMappedName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.ServiceRef#getMappedName <em>Mapped Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Mapped Name</em>' attribute.
-	 * @see #getMappedName()
-	 * @generated
-	 */
-	void setMappedName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Injection Targets</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.InjectionTarget}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Injection Targets</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Injection Targets</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRef_InjectionTargets()
-	 * @generated
-	 */
-	List getInjectionTargets();
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRef_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.ServiceRef#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // ServiceRef
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/ServiceRefHandler.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/ServiceRefHandler.java
deleted file mode 100644
index e17c9ce7a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/ServiceRefHandler.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Service Ref Handler</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	Declares the handler for a port-component. Handlers can access the
- * 	init-param name/value pairs using the HandlerInfo interface. If
- * 	port-name is not specified, the handler is assumed to be associated
- * 	with all ports of the service.
- * 
- * 	Used in: service-ref
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.ServiceRefHandler#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.ServiceRefHandler#getDisplayNames <em>Display Names</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.ServiceRefHandler#getIcons <em>Icons</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.ServiceRefHandler#getHandlerName <em>Handler Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.ServiceRefHandler#getHandlerClass <em>Handler Class</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.ServiceRefHandler#getInitParams <em>Init Params</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.ServiceRefHandler#getSoapHeaders <em>Soap Headers</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.ServiceRefHandler#getSoapRoles <em>Soap Roles</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.ServiceRefHandler#getPortNames <em>Port Names</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.ServiceRefHandler#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRefHandler()
- * @extends JavaEEObject
- * @generated
- */
-public interface ServiceRefHandler extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRefHandler_Descriptions()
-	 * @generated
-	 */
-	List getDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>Display Names</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.DisplayName}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Names</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Names</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRefHandler_DisplayNames()
-	 * @generated
-	 */
-	List getDisplayNames();
-
-	/**
-	 * Returns the value of the '<em><b>Icons</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Icon}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Icons</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Icons</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRefHandler_Icons()
-	 * @generated
-	 */
-	List getIcons();
-
-	/**
-	 * Returns the value of the '<em><b>Handler Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    Defines the name of the handler. The name must be unique
-	 * 	    within the module.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Handler Name</em>' attribute.
-	 * @see #setHandlerName(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRefHandler_HandlerName()
-	 * @generated
-	 */
-	String getHandlerName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.ServiceRefHandler#getHandlerName <em>Handler Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Handler Name</em>' attribute.
-	 * @see #getHandlerName()
-	 * @generated
-	 */
-	void setHandlerName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Handler Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    Defines a fully qualified class name for the handler
-	 * 	    implementation.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Handler Class</em>' attribute.
-	 * @see #setHandlerClass(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRefHandler_HandlerClass()
-	 * @generated
-	 */
-	String getHandlerClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.ServiceRefHandler#getHandlerClass <em>Handler Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Handler Class</em>' attribute.
-	 * @see #getHandlerClass()
-	 * @generated
-	 */
-	void setHandlerClass(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Init Params</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.ParamValue}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Init Params</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Init Params</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRefHandler_InitParams()
-	 * @generated
-	 */
-	List getInitParams();
-
-	/**
-	 * Returns the value of the '<em><b>Soap Headers</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.Object}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    Defines the QName of a SOAP header that will be processed
-	 * 	    by the handler.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Soap Headers</em>' attribute list.
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRefHandler_SoapHeaders()
-	 * @generated
-	 */
-	List getSoapHeaders();
-
-	/**
-	 * Returns the value of the '<em><b>Soap Roles</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The soap-role element contains a SOAP actor definition that
-	 * 	    the Handler will play as a role.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Soap Roles</em>' attribute list.
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRefHandler_SoapRoles()
-	 * @generated
-	 */
-	List getSoapRoles();
-
-	/**
-	 * Returns the value of the '<em><b>Port Names</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The port-name element defines the WSDL port-name that a
-	 * 	    handler should be associated with.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Port Names</em>' attribute list.
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRefHandler_PortNames()
-	 * @generated
-	 */
-	List getPortNames();
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRefHandler_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.ServiceRefHandler#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // ServiceRefHandler
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/ServiceRefHandlerChain.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/ServiceRefHandlerChain.java
deleted file mode 100644
index a30b883ec..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/ServiceRefHandlerChain.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Service Ref Handler Chain</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- *       The handler-chain element defines the handlerchain.
- *       Handlerchain can be defined such that the handlers in the
- *       handlerchain operate,all ports of a service, on a specific
- *       port or on a list of protocol-bindings. The choice of elements
- *       service-name-pattern, port-name-pattern and protocol-bindings
- *       are used to specify whether the handlers in handler-chain are
- *       for a service, port or protocol binding. If none of these
- *       choices are specified with the handler-chain element then the
- *       handlers specified in the handler-chain will be applied on
- *       everything.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.ServiceRefHandlerChain#getServiceNamePattern <em>Service Name Pattern</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.ServiceRefHandlerChain#getPortNamePattern <em>Port Name Pattern</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.ServiceRefHandlerChain#getProtocolBindings <em>Protocol Bindings</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.ServiceRefHandlerChain#getHandlers <em>Handlers</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.ServiceRefHandlerChain#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRefHandlerChain()
- * @extends JavaEEObject
- * @generated
- */
-public interface ServiceRefHandlerChain extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Service Name Pattern</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Service Name Pattern</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Service Name Pattern</em>' attribute.
-	 * @see #setServiceNamePattern(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRefHandlerChain_ServiceNamePattern()
-	 * @generated
-	 */
-	String getServiceNamePattern();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.ServiceRefHandlerChain#getServiceNamePattern <em>Service Name Pattern</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Service Name Pattern</em>' attribute.
-	 * @see #getServiceNamePattern()
-	 * @generated
-	 */
-	void setServiceNamePattern(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Port Name Pattern</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Port Name Pattern</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Port Name Pattern</em>' attribute.
-	 * @see #setPortNamePattern(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRefHandlerChain_PortNamePattern()
-	 * @generated
-	 */
-	String getPortNamePattern();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.ServiceRefHandlerChain#getPortNamePattern <em>Port Name Pattern</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Port Name Pattern</em>' attribute.
-	 * @see #getPortNamePattern()
-	 * @generated
-	 */
-	void setPortNamePattern(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Protocol Bindings</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Protocol Bindings</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Protocol Bindings</em>' attribute.
-	 * @see #setProtocolBindings(List)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRefHandlerChain_ProtocolBindings()
-	 * @generated
-	 */
-	List getProtocolBindings();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.ServiceRefHandlerChain#getProtocolBindings <em>Protocol Bindings</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Protocol Bindings</em>' attribute.
-	 * @see #getProtocolBindings()
-	 * @generated
-	 */
-	void setProtocolBindings(List value);
-
-	/**
-	 * Returns the value of the '<em><b>Handlers</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.ServiceRefHandler}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Handlers</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Handlers</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRefHandlerChain_Handlers()
-	 * @generated
-	 */
-	List getHandlers();
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRefHandlerChain_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.ServiceRefHandlerChain#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // ServiceRefHandlerChain
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/ServiceRefHandlerChains.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/ServiceRefHandlerChains.java
deleted file mode 100644
index a4ca7b251..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/ServiceRefHandlerChains.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Service Ref Handler Chains</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- *       The handler-chains element defines the handlerchains associated with this
- *       service or service endpoint.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.ServiceRefHandlerChains#getHandlerChains <em>Handler Chains</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.ServiceRefHandlerChains#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRefHandlerChains()
- * @extends JavaEEObject
- * @generated
- */
-public interface ServiceRefHandlerChains extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Handler Chains</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.ServiceRefHandlerChain}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Handler Chains</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Handler Chains</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRefHandlerChains_HandlerChains()
-	 * @generated
-	 */
-	List getHandlerChains();
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRefHandlerChains_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.ServiceRefHandlerChains#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // ServiceRefHandlerChains
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/UrlPatternType.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/UrlPatternType.java
deleted file mode 100644
index c96691e3d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/UrlPatternType.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Url Pattern Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The url-patternType contains the url pattern of the mapping.
- * 	It must follow the rules specified in Section 11.2 of the
- * 	Servlet API Specification. This pattern is assumed to be in
- * 	URL-decoded form and must not contain CR(#xD) or LF(#xA).
- * 	If it contains those characters, the container must inform
- * 	the developer with a descriptive error message.
- * 	The container must preserve all characters including whitespaces.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.UrlPatternType#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getUrlPatternType()
- * @extends JavaEEObject
- * @generated
- */
-public interface UrlPatternType extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getUrlPatternType_Value()
-	 * @generated
-	 */
-	String getValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.UrlPatternType#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(String value);
-
-} // UrlPatternType
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/DescriptionImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/DescriptionImpl.java
deleted file mode 100644
index e78056e61..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/DescriptionImpl.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core.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.core.Description;
-
-import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Description</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.DescriptionImpl#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.DescriptionImpl#getLang <em>Lang</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DescriptionImpl extends EObjectImpl implements Description {
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String value = VALUE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLang()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LANG_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLang()
-	 * @generated
-	 * @ordered
-	 */
-	protected String lang = LANG_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DescriptionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JavaeePackage.Literals.DESCRIPTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(String newValue) {
-		String oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.DESCRIPTION__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLang() {
-		return lang;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLang(String newLang) {
-		String oldLang = lang;
-		lang = newLang;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.DESCRIPTION__LANG, oldLang, lang));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JavaeePackage.DESCRIPTION__VALUE:
-				return getValue();
-			case JavaeePackage.DESCRIPTION__LANG:
-				return getLang();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JavaeePackage.DESCRIPTION__VALUE:
-				setValue((String)newValue);
-				return;
-			case JavaeePackage.DESCRIPTION__LANG:
-				setLang((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.DESCRIPTION__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-			case JavaeePackage.DESCRIPTION__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.DESCRIPTION__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-			case JavaeePackage.DESCRIPTION__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	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(", lang: "); //$NON-NLS-1$
-		result.append(lang);
-		result.append(')');
-		return result.toString();
-	}
-
-} //DescriptionImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/DisplayNameImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/DisplayNameImpl.java
deleted file mode 100644
index 60c0eb3d2..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/DisplayNameImpl.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core.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.core.DisplayName;
-
-import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Display Name</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.DisplayNameImpl#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.DisplayNameImpl#getLang <em>Lang</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DisplayNameImpl extends EObjectImpl implements DisplayName {
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String value = VALUE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLang()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LANG_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLang()
-	 * @generated
-	 * @ordered
-	 */
-	protected String lang = LANG_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DisplayNameImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JavaeePackage.Literals.DISPLAY_NAME;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(String newValue) {
-		String oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.DISPLAY_NAME__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLang() {
-		return lang;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLang(String newLang) {
-		String oldLang = lang;
-		lang = newLang;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.DISPLAY_NAME__LANG, oldLang, lang));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JavaeePackage.DISPLAY_NAME__VALUE:
-				return getValue();
-			case JavaeePackage.DISPLAY_NAME__LANG:
-				return getLang();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JavaeePackage.DISPLAY_NAME__VALUE:
-				setValue((String)newValue);
-				return;
-			case JavaeePackage.DISPLAY_NAME__LANG:
-				setLang((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.DISPLAY_NAME__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-			case JavaeePackage.DISPLAY_NAME__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.DISPLAY_NAME__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-			case JavaeePackage.DISPLAY_NAME__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	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(", lang: "); //$NON-NLS-1$
-		result.append(lang);
-		result.append(')');
-		return result.toString();
-	}
-
-} //DisplayNameImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/EjbLocalRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/EjbLocalRefImpl.java
deleted file mode 100644
index 68fc4800d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/EjbLocalRefImpl.java
+++ /dev/null
@@ -1,620 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core.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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jst.javaee.core.Description;
-import org.eclipse.jst.javaee.core.EjbLocalRef;
-import org.eclipse.jst.javaee.core.EjbRefType;
-import org.eclipse.jst.javaee.core.InjectionTarget;
-
-import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Ejb Local Ref</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.EjbLocalRefImpl#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.EjbLocalRefImpl#getEjbRefName <em>Ejb Ref Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.EjbLocalRefImpl#getEjbRefType <em>Ejb Ref Type</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.EjbLocalRefImpl#getLocalHome <em>Local Home</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.EjbLocalRefImpl#getLocal <em>Local</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.EjbLocalRefImpl#getEjbLink <em>Ejb Link</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.EjbLocalRefImpl#getMappedName <em>Mapped Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.EjbLocalRefImpl#getInjectionTargets <em>Injection Targets</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.EjbLocalRefImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class EjbLocalRefImpl extends EObjectImpl implements EjbLocalRef {
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The default value of the '{@link #getEjbRefName() <em>Ejb Ref Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbRefName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EJB_REF_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getEjbRefName() <em>Ejb Ref Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbRefName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String ejbRefName = EJB_REF_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getEjbRefType() <em>Ejb Ref Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbRefType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final EjbRefType EJB_REF_TYPE_EDEFAULT = EjbRefType.ENTITY_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getEjbRefType() <em>Ejb Ref Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbRefType()
-	 * @generated
-	 * @ordered
-	 */
-	protected EjbRefType ejbRefType = EJB_REF_TYPE_EDEFAULT;
-
-	/**
-	 * This is true if the Ejb Ref Type attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean ejbRefTypeESet = false;
-
-	/**
-	 * The default value of the '{@link #getLocalHome() <em>Local Home</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocalHome()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LOCAL_HOME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLocalHome() <em>Local Home</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocalHome()
-	 * @generated
-	 * @ordered
-	 */
-	protected String localHome = LOCAL_HOME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLocal() <em>Local</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocal()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LOCAL_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLocal() <em>Local</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocal()
-	 * @generated
-	 * @ordered
-	 */
-	protected String local = LOCAL_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getEjbLink() <em>Ejb Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbLink()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EJB_LINK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getEjbLink() <em>Ejb Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbLink()
-	 * @generated
-	 * @ordered
-	 */
-	protected String ejbLink = EJB_LINK_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getMappedName() <em>Mapped Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMappedName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MAPPED_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMappedName() <em>Mapped Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMappedName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String mappedName = MAPPED_NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getInjectionTargets() <em>Injection Targets</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInjectionTargets()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList injectionTargets = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EjbLocalRefImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JavaeePackage.Literals.EJB_LOCAL_REF;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, JavaeePackage.EJB_LOCAL_REF__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getEjbRefName() {
-		return ejbRefName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEjbRefName(String newEjbRefName) {
-		String oldEjbRefName = ejbRefName;
-		ejbRefName = newEjbRefName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.EJB_LOCAL_REF__EJB_REF_NAME, oldEjbRefName, ejbRefName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EjbRefType getEjbRefType() {
-		return ejbRefType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEjbRefType(EjbRefType newEjbRefType) {
-		EjbRefType oldEjbRefType = ejbRefType;
-		ejbRefType = newEjbRefType == null ? EJB_REF_TYPE_EDEFAULT : newEjbRefType;
-		boolean oldEjbRefTypeESet = ejbRefTypeESet;
-		ejbRefTypeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.EJB_LOCAL_REF__EJB_REF_TYPE, oldEjbRefType, ejbRefType, !oldEjbRefTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetEjbRefType() {
-		EjbRefType oldEjbRefType = ejbRefType;
-		boolean oldEjbRefTypeESet = ejbRefTypeESet;
-		ejbRefType = EJB_REF_TYPE_EDEFAULT;
-		ejbRefTypeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, JavaeePackage.EJB_LOCAL_REF__EJB_REF_TYPE, oldEjbRefType, EJB_REF_TYPE_EDEFAULT, oldEjbRefTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetEjbRefType() {
-		return ejbRefTypeESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLocalHome() {
-		return localHome;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLocalHome(String newLocalHome) {
-		String oldLocalHome = localHome;
-		localHome = newLocalHome;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.EJB_LOCAL_REF__LOCAL_HOME, oldLocalHome, localHome));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLocal() {
-		return local;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLocal(String newLocal) {
-		String oldLocal = local;
-		local = newLocal;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.EJB_LOCAL_REF__LOCAL, oldLocal, local));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getEjbLink() {
-		return ejbLink;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEjbLink(String newEjbLink) {
-		String oldEjbLink = ejbLink;
-		ejbLink = newEjbLink;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.EJB_LOCAL_REF__EJB_LINK, oldEjbLink, ejbLink));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getMappedName() {
-		return mappedName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMappedName(String newMappedName) {
-		String oldMappedName = mappedName;
-		mappedName = newMappedName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.EJB_LOCAL_REF__MAPPED_NAME, oldMappedName, mappedName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getInjectionTargets() {
-		if (injectionTargets == null) {
-			injectionTargets = new EObjectContainmentEList(InjectionTarget.class, this, JavaeePackage.EJB_LOCAL_REF__INJECTION_TARGETS);
-		}
-		return injectionTargets;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.EJB_LOCAL_REF__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JavaeePackage.EJB_LOCAL_REF__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-			case JavaeePackage.EJB_LOCAL_REF__INJECTION_TARGETS:
-				return ((InternalEList)getInjectionTargets()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JavaeePackage.EJB_LOCAL_REF__DESCRIPTIONS:
-				return getDescriptions();
-			case JavaeePackage.EJB_LOCAL_REF__EJB_REF_NAME:
-				return getEjbRefName();
-			case JavaeePackage.EJB_LOCAL_REF__EJB_REF_TYPE:
-				return getEjbRefType();
-			case JavaeePackage.EJB_LOCAL_REF__LOCAL_HOME:
-				return getLocalHome();
-			case JavaeePackage.EJB_LOCAL_REF__LOCAL:
-				return getLocal();
-			case JavaeePackage.EJB_LOCAL_REF__EJB_LINK:
-				return getEjbLink();
-			case JavaeePackage.EJB_LOCAL_REF__MAPPED_NAME:
-				return getMappedName();
-			case JavaeePackage.EJB_LOCAL_REF__INJECTION_TARGETS:
-				return getInjectionTargets();
-			case JavaeePackage.EJB_LOCAL_REF__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JavaeePackage.EJB_LOCAL_REF__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case JavaeePackage.EJB_LOCAL_REF__EJB_REF_NAME:
-				setEjbRefName((String)newValue);
-				return;
-			case JavaeePackage.EJB_LOCAL_REF__EJB_REF_TYPE:
-				setEjbRefType((EjbRefType)newValue);
-				return;
-			case JavaeePackage.EJB_LOCAL_REF__LOCAL_HOME:
-				setLocalHome((String)newValue);
-				return;
-			case JavaeePackage.EJB_LOCAL_REF__LOCAL:
-				setLocal((String)newValue);
-				return;
-			case JavaeePackage.EJB_LOCAL_REF__EJB_LINK:
-				setEjbLink((String)newValue);
-				return;
-			case JavaeePackage.EJB_LOCAL_REF__MAPPED_NAME:
-				setMappedName((String)newValue);
-				return;
-			case JavaeePackage.EJB_LOCAL_REF__INJECTION_TARGETS:
-				getInjectionTargets().clear();
-				getInjectionTargets().addAll((Collection)newValue);
-				return;
-			case JavaeePackage.EJB_LOCAL_REF__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.EJB_LOCAL_REF__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case JavaeePackage.EJB_LOCAL_REF__EJB_REF_NAME:
-				setEjbRefName(EJB_REF_NAME_EDEFAULT);
-				return;
-			case JavaeePackage.EJB_LOCAL_REF__EJB_REF_TYPE:
-				unsetEjbRefType();
-				return;
-			case JavaeePackage.EJB_LOCAL_REF__LOCAL_HOME:
-				setLocalHome(LOCAL_HOME_EDEFAULT);
-				return;
-			case JavaeePackage.EJB_LOCAL_REF__LOCAL:
-				setLocal(LOCAL_EDEFAULT);
-				return;
-			case JavaeePackage.EJB_LOCAL_REF__EJB_LINK:
-				setEjbLink(EJB_LINK_EDEFAULT);
-				return;
-			case JavaeePackage.EJB_LOCAL_REF__MAPPED_NAME:
-				setMappedName(MAPPED_NAME_EDEFAULT);
-				return;
-			case JavaeePackage.EJB_LOCAL_REF__INJECTION_TARGETS:
-				getInjectionTargets().clear();
-				return;
-			case JavaeePackage.EJB_LOCAL_REF__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.EJB_LOCAL_REF__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case JavaeePackage.EJB_LOCAL_REF__EJB_REF_NAME:
-				return EJB_REF_NAME_EDEFAULT == null ? ejbRefName != null : !EJB_REF_NAME_EDEFAULT.equals(ejbRefName);
-			case JavaeePackage.EJB_LOCAL_REF__EJB_REF_TYPE:
-				return isSetEjbRefType();
-			case JavaeePackage.EJB_LOCAL_REF__LOCAL_HOME:
-				return LOCAL_HOME_EDEFAULT == null ? localHome != null : !LOCAL_HOME_EDEFAULT.equals(localHome);
-			case JavaeePackage.EJB_LOCAL_REF__LOCAL:
-				return LOCAL_EDEFAULT == null ? local != null : !LOCAL_EDEFAULT.equals(local);
-			case JavaeePackage.EJB_LOCAL_REF__EJB_LINK:
-				return EJB_LINK_EDEFAULT == null ? ejbLink != null : !EJB_LINK_EDEFAULT.equals(ejbLink);
-			case JavaeePackage.EJB_LOCAL_REF__MAPPED_NAME:
-				return MAPPED_NAME_EDEFAULT == null ? mappedName != null : !MAPPED_NAME_EDEFAULT.equals(mappedName);
-			case JavaeePackage.EJB_LOCAL_REF__INJECTION_TARGETS:
-				return injectionTargets != null && !injectionTargets.isEmpty();
-			case JavaeePackage.EJB_LOCAL_REF__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (ejbRefName: "); //$NON-NLS-1$
-		result.append(ejbRefName);
-		result.append(", ejbRefType: "); //$NON-NLS-1$
-		if (ejbRefTypeESet) result.append(ejbRefType); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(", localHome: "); //$NON-NLS-1$
-		result.append(localHome);
-		result.append(", local: "); //$NON-NLS-1$
-		result.append(local);
-		result.append(", ejbLink: "); //$NON-NLS-1$
-		result.append(ejbLink);
-		result.append(", mappedName: "); //$NON-NLS-1$
-		result.append(mappedName);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //EjbLocalRefImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/EjbRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/EjbRefImpl.java
deleted file mode 100644
index e908e93ed..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/EjbRefImpl.java
+++ /dev/null
@@ -1,620 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core.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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jst.javaee.core.Description;
-import org.eclipse.jst.javaee.core.EjbRef;
-import org.eclipse.jst.javaee.core.EjbRefType;
-import org.eclipse.jst.javaee.core.InjectionTarget;
-
-import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Ejb Ref</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.EjbRefImpl#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.EjbRefImpl#getEjbRefName <em>Ejb Ref Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.EjbRefImpl#getEjbRefType <em>Ejb Ref Type</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.EjbRefImpl#getHome <em>Home</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.EjbRefImpl#getRemote <em>Remote</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.EjbRefImpl#getEjbLink <em>Ejb Link</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.EjbRefImpl#getMappedName <em>Mapped Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.EjbRefImpl#getInjectionTargets <em>Injection Targets</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.EjbRefImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class EjbRefImpl extends EObjectImpl implements EjbRef {
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The default value of the '{@link #getEjbRefName() <em>Ejb Ref Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbRefName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EJB_REF_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getEjbRefName() <em>Ejb Ref Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbRefName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String ejbRefName = EJB_REF_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getEjbRefType() <em>Ejb Ref Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbRefType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final EjbRefType EJB_REF_TYPE_EDEFAULT = EjbRefType.ENTITY_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getEjbRefType() <em>Ejb Ref Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbRefType()
-	 * @generated
-	 * @ordered
-	 */
-	protected EjbRefType ejbRefType = EJB_REF_TYPE_EDEFAULT;
-
-	/**
-	 * This is true if the Ejb Ref Type attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean ejbRefTypeESet = false;
-
-	/**
-	 * The default value of the '{@link #getHome() <em>Home</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHome()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String HOME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getHome() <em>Home</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHome()
-	 * @generated
-	 * @ordered
-	 */
-	protected String home = HOME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getRemote() <em>Remote</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRemote()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String REMOTE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getRemote() <em>Remote</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRemote()
-	 * @generated
-	 * @ordered
-	 */
-	protected String remote = REMOTE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getEjbLink() <em>Ejb Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbLink()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EJB_LINK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getEjbLink() <em>Ejb Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbLink()
-	 * @generated
-	 * @ordered
-	 */
-	protected String ejbLink = EJB_LINK_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getMappedName() <em>Mapped Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMappedName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MAPPED_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMappedName() <em>Mapped Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMappedName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String mappedName = MAPPED_NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getInjectionTargets() <em>Injection Targets</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInjectionTargets()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList injectionTargets = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EjbRefImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JavaeePackage.Literals.EJB_REF;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, JavaeePackage.EJB_REF__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getEjbRefName() {
-		return ejbRefName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEjbRefName(String newEjbRefName) {
-		String oldEjbRefName = ejbRefName;
-		ejbRefName = newEjbRefName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.EJB_REF__EJB_REF_NAME, oldEjbRefName, ejbRefName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EjbRefType getEjbRefType() {
-		return ejbRefType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEjbRefType(EjbRefType newEjbRefType) {
-		EjbRefType oldEjbRefType = ejbRefType;
-		ejbRefType = newEjbRefType == null ? EJB_REF_TYPE_EDEFAULT : newEjbRefType;
-		boolean oldEjbRefTypeESet = ejbRefTypeESet;
-		ejbRefTypeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.EJB_REF__EJB_REF_TYPE, oldEjbRefType, ejbRefType, !oldEjbRefTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetEjbRefType() {
-		EjbRefType oldEjbRefType = ejbRefType;
-		boolean oldEjbRefTypeESet = ejbRefTypeESet;
-		ejbRefType = EJB_REF_TYPE_EDEFAULT;
-		ejbRefTypeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, JavaeePackage.EJB_REF__EJB_REF_TYPE, oldEjbRefType, EJB_REF_TYPE_EDEFAULT, oldEjbRefTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetEjbRefType() {
-		return ejbRefTypeESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getHome() {
-		return home;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHome(String newHome) {
-		String oldHome = home;
-		home = newHome;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.EJB_REF__HOME, oldHome, home));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getRemote() {
-		return remote;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRemote(String newRemote) {
-		String oldRemote = remote;
-		remote = newRemote;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.EJB_REF__REMOTE, oldRemote, remote));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getEjbLink() {
-		return ejbLink;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEjbLink(String newEjbLink) {
-		String oldEjbLink = ejbLink;
-		ejbLink = newEjbLink;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.EJB_REF__EJB_LINK, oldEjbLink, ejbLink));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getMappedName() {
-		return mappedName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMappedName(String newMappedName) {
-		String oldMappedName = mappedName;
-		mappedName = newMappedName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.EJB_REF__MAPPED_NAME, oldMappedName, mappedName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getInjectionTargets() {
-		if (injectionTargets == null) {
-			injectionTargets = new EObjectContainmentEList(InjectionTarget.class, this, JavaeePackage.EJB_REF__INJECTION_TARGETS);
-		}
-		return injectionTargets;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.EJB_REF__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JavaeePackage.EJB_REF__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-			case JavaeePackage.EJB_REF__INJECTION_TARGETS:
-				return ((InternalEList)getInjectionTargets()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JavaeePackage.EJB_REF__DESCRIPTIONS:
-				return getDescriptions();
-			case JavaeePackage.EJB_REF__EJB_REF_NAME:
-				return getEjbRefName();
-			case JavaeePackage.EJB_REF__EJB_REF_TYPE:
-				return getEjbRefType();
-			case JavaeePackage.EJB_REF__HOME:
-				return getHome();
-			case JavaeePackage.EJB_REF__REMOTE:
-				return getRemote();
-			case JavaeePackage.EJB_REF__EJB_LINK:
-				return getEjbLink();
-			case JavaeePackage.EJB_REF__MAPPED_NAME:
-				return getMappedName();
-			case JavaeePackage.EJB_REF__INJECTION_TARGETS:
-				return getInjectionTargets();
-			case JavaeePackage.EJB_REF__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JavaeePackage.EJB_REF__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case JavaeePackage.EJB_REF__EJB_REF_NAME:
-				setEjbRefName((String)newValue);
-				return;
-			case JavaeePackage.EJB_REF__EJB_REF_TYPE:
-				setEjbRefType((EjbRefType)newValue);
-				return;
-			case JavaeePackage.EJB_REF__HOME:
-				setHome((String)newValue);
-				return;
-			case JavaeePackage.EJB_REF__REMOTE:
-				setRemote((String)newValue);
-				return;
-			case JavaeePackage.EJB_REF__EJB_LINK:
-				setEjbLink((String)newValue);
-				return;
-			case JavaeePackage.EJB_REF__MAPPED_NAME:
-				setMappedName((String)newValue);
-				return;
-			case JavaeePackage.EJB_REF__INJECTION_TARGETS:
-				getInjectionTargets().clear();
-				getInjectionTargets().addAll((Collection)newValue);
-				return;
-			case JavaeePackage.EJB_REF__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.EJB_REF__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case JavaeePackage.EJB_REF__EJB_REF_NAME:
-				setEjbRefName(EJB_REF_NAME_EDEFAULT);
-				return;
-			case JavaeePackage.EJB_REF__EJB_REF_TYPE:
-				unsetEjbRefType();
-				return;
-			case JavaeePackage.EJB_REF__HOME:
-				setHome(HOME_EDEFAULT);
-				return;
-			case JavaeePackage.EJB_REF__REMOTE:
-				setRemote(REMOTE_EDEFAULT);
-				return;
-			case JavaeePackage.EJB_REF__EJB_LINK:
-				setEjbLink(EJB_LINK_EDEFAULT);
-				return;
-			case JavaeePackage.EJB_REF__MAPPED_NAME:
-				setMappedName(MAPPED_NAME_EDEFAULT);
-				return;
-			case JavaeePackage.EJB_REF__INJECTION_TARGETS:
-				getInjectionTargets().clear();
-				return;
-			case JavaeePackage.EJB_REF__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.EJB_REF__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case JavaeePackage.EJB_REF__EJB_REF_NAME:
-				return EJB_REF_NAME_EDEFAULT == null ? ejbRefName != null : !EJB_REF_NAME_EDEFAULT.equals(ejbRefName);
-			case JavaeePackage.EJB_REF__EJB_REF_TYPE:
-				return isSetEjbRefType();
-			case JavaeePackage.EJB_REF__HOME:
-				return HOME_EDEFAULT == null ? home != null : !HOME_EDEFAULT.equals(home);
-			case JavaeePackage.EJB_REF__REMOTE:
-				return REMOTE_EDEFAULT == null ? remote != null : !REMOTE_EDEFAULT.equals(remote);
-			case JavaeePackage.EJB_REF__EJB_LINK:
-				return EJB_LINK_EDEFAULT == null ? ejbLink != null : !EJB_LINK_EDEFAULT.equals(ejbLink);
-			case JavaeePackage.EJB_REF__MAPPED_NAME:
-				return MAPPED_NAME_EDEFAULT == null ? mappedName != null : !MAPPED_NAME_EDEFAULT.equals(mappedName);
-			case JavaeePackage.EJB_REF__INJECTION_TARGETS:
-				return injectionTargets != null && !injectionTargets.isEmpty();
-			case JavaeePackage.EJB_REF__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (ejbRefName: "); //$NON-NLS-1$
-		result.append(ejbRefName);
-		result.append(", ejbRefType: "); //$NON-NLS-1$
-		if (ejbRefTypeESet) result.append(ejbRefType); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(", home: "); //$NON-NLS-1$
-		result.append(home);
-		result.append(", remote: "); //$NON-NLS-1$
-		result.append(remote);
-		result.append(", ejbLink: "); //$NON-NLS-1$
-		result.append(ejbLink);
-		result.append(", mappedName: "); //$NON-NLS-1$
-		result.append(mappedName);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //EjbRefImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/EmptyTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/EmptyTypeImpl.java
deleted file mode 100644
index 794a873ab..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/EmptyTypeImpl.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core.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.core.EmptyType;
-
-import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Empty Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.EmptyTypeImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class EmptyTypeImpl extends EObjectImpl implements EmptyType {
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EmptyTypeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JavaeePackage.Literals.EMPTY_TYPE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.EMPTY_TYPE__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JavaeePackage.EMPTY_TYPE__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JavaeePackage.EMPTY_TYPE__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.EMPTY_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.EMPTY_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	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();
-	}
-
-} //EmptyTypeImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/EnvEntryImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/EnvEntryImpl.java
deleted file mode 100644
index 0b42542a0..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/EnvEntryImpl.java
+++ /dev/null
@@ -1,512 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core.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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jst.javaee.core.Description;
-import org.eclipse.jst.javaee.core.EnvEntry;
-import org.eclipse.jst.javaee.core.EnvEntryType;
-import org.eclipse.jst.javaee.core.InjectionTarget;
-
-import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Env Entry</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.EnvEntryImpl#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.EnvEntryImpl#getEnvEntryName <em>Env Entry Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.EnvEntryImpl#getEnvEntryType <em>Env Entry Type</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.EnvEntryImpl#getEnvEntryValue <em>Env Entry Value</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.EnvEntryImpl#getMappedName <em>Mapped Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.EnvEntryImpl#getInjectionTargets <em>Injection Targets</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.EnvEntryImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class EnvEntryImpl extends EObjectImpl implements EnvEntry {
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The default value of the '{@link #getEnvEntryName() <em>Env Entry Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEnvEntryName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ENV_ENTRY_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getEnvEntryName() <em>Env Entry Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEnvEntryName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String envEntryName = ENV_ENTRY_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getEnvEntryType() <em>Env Entry Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEnvEntryType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final EnvEntryType ENV_ENTRY_TYPE_EDEFAULT = EnvEntryType.JAVA_LANG_BOOLEAN_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getEnvEntryType() <em>Env Entry Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEnvEntryType()
-	 * @generated
-	 * @ordered
-	 */
-	protected EnvEntryType envEntryType = ENV_ENTRY_TYPE_EDEFAULT;
-
-	/**
-	 * This is true if the Env Entry Type attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean envEntryTypeESet = false;
-
-	/**
-	 * The default value of the '{@link #getEnvEntryValue() <em>Env Entry Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEnvEntryValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ENV_ENTRY_VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getEnvEntryValue() <em>Env Entry Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEnvEntryValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String envEntryValue = ENV_ENTRY_VALUE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getMappedName() <em>Mapped Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMappedName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MAPPED_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMappedName() <em>Mapped Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMappedName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String mappedName = MAPPED_NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getInjectionTargets() <em>Injection Targets</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInjectionTargets()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList injectionTargets = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EnvEntryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JavaeePackage.Literals.ENV_ENTRY;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, JavaeePackage.ENV_ENTRY__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getEnvEntryName() {
-		return envEntryName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEnvEntryName(String newEnvEntryName) {
-		String oldEnvEntryName = envEntryName;
-		envEntryName = newEnvEntryName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.ENV_ENTRY__ENV_ENTRY_NAME, oldEnvEntryName, envEntryName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EnvEntryType getEnvEntryType() {
-		return envEntryType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEnvEntryType(EnvEntryType newEnvEntryType) {
-		EnvEntryType oldEnvEntryType = envEntryType;
-		envEntryType = newEnvEntryType == null ? ENV_ENTRY_TYPE_EDEFAULT : newEnvEntryType;
-		boolean oldEnvEntryTypeESet = envEntryTypeESet;
-		envEntryTypeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.ENV_ENTRY__ENV_ENTRY_TYPE, oldEnvEntryType, envEntryType, !oldEnvEntryTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetEnvEntryType() {
-		EnvEntryType oldEnvEntryType = envEntryType;
-		boolean oldEnvEntryTypeESet = envEntryTypeESet;
-		envEntryType = ENV_ENTRY_TYPE_EDEFAULT;
-		envEntryTypeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, JavaeePackage.ENV_ENTRY__ENV_ENTRY_TYPE, oldEnvEntryType, ENV_ENTRY_TYPE_EDEFAULT, oldEnvEntryTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetEnvEntryType() {
-		return envEntryTypeESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getEnvEntryValue() {
-		return envEntryValue;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEnvEntryValue(String newEnvEntryValue) {
-		String oldEnvEntryValue = envEntryValue;
-		envEntryValue = newEnvEntryValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.ENV_ENTRY__ENV_ENTRY_VALUE, oldEnvEntryValue, envEntryValue));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getMappedName() {
-		return mappedName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMappedName(String newMappedName) {
-		String oldMappedName = mappedName;
-		mappedName = newMappedName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.ENV_ENTRY__MAPPED_NAME, oldMappedName, mappedName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getInjectionTargets() {
-		if (injectionTargets == null) {
-			injectionTargets = new EObjectContainmentEList(InjectionTarget.class, this, JavaeePackage.ENV_ENTRY__INJECTION_TARGETS);
-		}
-		return injectionTargets;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.ENV_ENTRY__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JavaeePackage.ENV_ENTRY__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-			case JavaeePackage.ENV_ENTRY__INJECTION_TARGETS:
-				return ((InternalEList)getInjectionTargets()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JavaeePackage.ENV_ENTRY__DESCRIPTIONS:
-				return getDescriptions();
-			case JavaeePackage.ENV_ENTRY__ENV_ENTRY_NAME:
-				return getEnvEntryName();
-			case JavaeePackage.ENV_ENTRY__ENV_ENTRY_TYPE:
-				return getEnvEntryType();
-			case JavaeePackage.ENV_ENTRY__ENV_ENTRY_VALUE:
-				return getEnvEntryValue();
-			case JavaeePackage.ENV_ENTRY__MAPPED_NAME:
-				return getMappedName();
-			case JavaeePackage.ENV_ENTRY__INJECTION_TARGETS:
-				return getInjectionTargets();
-			case JavaeePackage.ENV_ENTRY__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JavaeePackage.ENV_ENTRY__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case JavaeePackage.ENV_ENTRY__ENV_ENTRY_NAME:
-				setEnvEntryName((String)newValue);
-				return;
-			case JavaeePackage.ENV_ENTRY__ENV_ENTRY_TYPE:
-				setEnvEntryType((EnvEntryType)newValue);
-				return;
-			case JavaeePackage.ENV_ENTRY__ENV_ENTRY_VALUE:
-				setEnvEntryValue((String)newValue);
-				return;
-			case JavaeePackage.ENV_ENTRY__MAPPED_NAME:
-				setMappedName((String)newValue);
-				return;
-			case JavaeePackage.ENV_ENTRY__INJECTION_TARGETS:
-				getInjectionTargets().clear();
-				getInjectionTargets().addAll((Collection)newValue);
-				return;
-			case JavaeePackage.ENV_ENTRY__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.ENV_ENTRY__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case JavaeePackage.ENV_ENTRY__ENV_ENTRY_NAME:
-				setEnvEntryName(ENV_ENTRY_NAME_EDEFAULT);
-				return;
-			case JavaeePackage.ENV_ENTRY__ENV_ENTRY_TYPE:
-				unsetEnvEntryType();
-				return;
-			case JavaeePackage.ENV_ENTRY__ENV_ENTRY_VALUE:
-				setEnvEntryValue(ENV_ENTRY_VALUE_EDEFAULT);
-				return;
-			case JavaeePackage.ENV_ENTRY__MAPPED_NAME:
-				setMappedName(MAPPED_NAME_EDEFAULT);
-				return;
-			case JavaeePackage.ENV_ENTRY__INJECTION_TARGETS:
-				getInjectionTargets().clear();
-				return;
-			case JavaeePackage.ENV_ENTRY__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.ENV_ENTRY__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case JavaeePackage.ENV_ENTRY__ENV_ENTRY_NAME:
-				return ENV_ENTRY_NAME_EDEFAULT == null ? envEntryName != null : !ENV_ENTRY_NAME_EDEFAULT.equals(envEntryName);
-			case JavaeePackage.ENV_ENTRY__ENV_ENTRY_TYPE:
-				return isSetEnvEntryType();
-			case JavaeePackage.ENV_ENTRY__ENV_ENTRY_VALUE:
-				return ENV_ENTRY_VALUE_EDEFAULT == null ? envEntryValue != null : !ENV_ENTRY_VALUE_EDEFAULT.equals(envEntryValue);
-			case JavaeePackage.ENV_ENTRY__MAPPED_NAME:
-				return MAPPED_NAME_EDEFAULT == null ? mappedName != null : !MAPPED_NAME_EDEFAULT.equals(mappedName);
-			case JavaeePackage.ENV_ENTRY__INJECTION_TARGETS:
-				return injectionTargets != null && !injectionTargets.isEmpty();
-			case JavaeePackage.ENV_ENTRY__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (envEntryName: "); //$NON-NLS-1$
-		result.append(envEntryName);
-		result.append(", envEntryType: "); //$NON-NLS-1$
-		if (envEntryTypeESet) result.append(envEntryType); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(", envEntryValue: "); //$NON-NLS-1$
-		result.append(envEntryValue);
-		result.append(", mappedName: "); //$NON-NLS-1$
-		result.append(mappedName);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //EnvEntryImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/IconImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/IconImpl.java
deleted file mode 100644
index 0302ead27..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/IconImpl.java
+++ /dev/null
@@ -1,328 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core.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.core.Icon;
-
-import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Icon</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.IconImpl#getSmallIcon <em>Small Icon</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.IconImpl#getLargeIcon <em>Large Icon</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.IconImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.IconImpl#getLang <em>Lang</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class IconImpl extends EObjectImpl implements Icon {
-	/**
-	 * The default value of the '{@link #getSmallIcon() <em>Small Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSmallIcon()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SMALL_ICON_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getSmallIcon() <em>Small Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSmallIcon()
-	 * @generated
-	 * @ordered
-	 */
-	protected String smallIcon = SMALL_ICON_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLargeIcon() <em>Large Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLargeIcon()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LARGE_ICON_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLargeIcon() <em>Large Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLargeIcon()
-	 * @generated
-	 * @ordered
-	 */
-	protected String largeIcon = LARGE_ICON_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLang()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LANG_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLang()
-	 * @generated
-	 * @ordered
-	 */
-	protected String lang = LANG_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IconImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JavaeePackage.Literals.ICON;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getSmallIcon() {
-		return smallIcon;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSmallIcon(String newSmallIcon) {
-		String oldSmallIcon = smallIcon;
-		smallIcon = newSmallIcon;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.ICON__SMALL_ICON, oldSmallIcon, smallIcon));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLargeIcon() {
-		return largeIcon;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLargeIcon(String newLargeIcon) {
-		String oldLargeIcon = largeIcon;
-		largeIcon = newLargeIcon;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.ICON__LARGE_ICON, oldLargeIcon, largeIcon));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.ICON__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLang() {
-		return lang;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLang(String newLang) {
-		String oldLang = lang;
-		lang = newLang;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.ICON__LANG, oldLang, lang));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JavaeePackage.ICON__SMALL_ICON:
-				return getSmallIcon();
-			case JavaeePackage.ICON__LARGE_ICON:
-				return getLargeIcon();
-			case JavaeePackage.ICON__ID:
-				return getId();
-			case JavaeePackage.ICON__LANG:
-				return getLang();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JavaeePackage.ICON__SMALL_ICON:
-				setSmallIcon((String)newValue);
-				return;
-			case JavaeePackage.ICON__LARGE_ICON:
-				setLargeIcon((String)newValue);
-				return;
-			case JavaeePackage.ICON__ID:
-				setId((String)newValue);
-				return;
-			case JavaeePackage.ICON__LANG:
-				setLang((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.ICON__SMALL_ICON:
-				setSmallIcon(SMALL_ICON_EDEFAULT);
-				return;
-			case JavaeePackage.ICON__LARGE_ICON:
-				setLargeIcon(LARGE_ICON_EDEFAULT);
-				return;
-			case JavaeePackage.ICON__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case JavaeePackage.ICON__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.ICON__SMALL_ICON:
-				return SMALL_ICON_EDEFAULT == null ? smallIcon != null : !SMALL_ICON_EDEFAULT.equals(smallIcon);
-			case JavaeePackage.ICON__LARGE_ICON:
-				return LARGE_ICON_EDEFAULT == null ? largeIcon != null : !LARGE_ICON_EDEFAULT.equals(largeIcon);
-			case JavaeePackage.ICON__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case JavaeePackage.ICON__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (smallIcon: "); //$NON-NLS-1$
-		result.append(smallIcon);
-		result.append(", largeIcon: "); //$NON-NLS-1$
-		result.append(largeIcon);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(", lang: "); //$NON-NLS-1$
-		result.append(lang);
-		result.append(')');
-		return result.toString();
-	}
-
-} //IconImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/InjectionTargetImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/InjectionTargetImpl.java
deleted file mode 100644
index 017ff4668..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/InjectionTargetImpl.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core.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.core.InjectionTarget;
-
-import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Injection Target</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.InjectionTargetImpl#getInjectionTargetClass <em>Injection Target Class</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.InjectionTargetImpl#getInjectionTargetName <em>Injection Target Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class InjectionTargetImpl extends EObjectImpl implements InjectionTarget {
-	/**
-	 * The default value of the '{@link #getInjectionTargetClass() <em>Injection Target Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInjectionTargetClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String INJECTION_TARGET_CLASS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getInjectionTargetClass() <em>Injection Target Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInjectionTargetClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected String injectionTargetClass = INJECTION_TARGET_CLASS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getInjectionTargetName() <em>Injection Target Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInjectionTargetName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String INJECTION_TARGET_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getInjectionTargetName() <em>Injection Target Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInjectionTargetName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String injectionTargetName = INJECTION_TARGET_NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected InjectionTargetImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JavaeePackage.Literals.INJECTION_TARGET;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getInjectionTargetClass() {
-		return injectionTargetClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setInjectionTargetClass(String newInjectionTargetClass) {
-		String oldInjectionTargetClass = injectionTargetClass;
-		injectionTargetClass = newInjectionTargetClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.INJECTION_TARGET__INJECTION_TARGET_CLASS, oldInjectionTargetClass, injectionTargetClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getInjectionTargetName() {
-		return injectionTargetName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setInjectionTargetName(String newInjectionTargetName) {
-		String oldInjectionTargetName = injectionTargetName;
-		injectionTargetName = newInjectionTargetName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.INJECTION_TARGET__INJECTION_TARGET_NAME, oldInjectionTargetName, injectionTargetName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JavaeePackage.INJECTION_TARGET__INJECTION_TARGET_CLASS:
-				return getInjectionTargetClass();
-			case JavaeePackage.INJECTION_TARGET__INJECTION_TARGET_NAME:
-				return getInjectionTargetName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JavaeePackage.INJECTION_TARGET__INJECTION_TARGET_CLASS:
-				setInjectionTargetClass((String)newValue);
-				return;
-			case JavaeePackage.INJECTION_TARGET__INJECTION_TARGET_NAME:
-				setInjectionTargetName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.INJECTION_TARGET__INJECTION_TARGET_CLASS:
-				setInjectionTargetClass(INJECTION_TARGET_CLASS_EDEFAULT);
-				return;
-			case JavaeePackage.INJECTION_TARGET__INJECTION_TARGET_NAME:
-				setInjectionTargetName(INJECTION_TARGET_NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.INJECTION_TARGET__INJECTION_TARGET_CLASS:
-				return INJECTION_TARGET_CLASS_EDEFAULT == null ? injectionTargetClass != null : !INJECTION_TARGET_CLASS_EDEFAULT.equals(injectionTargetClass);
-			case JavaeePackage.INJECTION_TARGET__INJECTION_TARGET_NAME:
-				return INJECTION_TARGET_NAME_EDEFAULT == null ? injectionTargetName != null : !INJECTION_TARGET_NAME_EDEFAULT.equals(injectionTargetName);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (injectionTargetClass: "); //$NON-NLS-1$
-		result.append(injectionTargetClass);
-		result.append(", injectionTargetName: "); //$NON-NLS-1$
-		result.append(injectionTargetName);
-		result.append(')');
-		return result.toString();
-	}
-
-} //InjectionTargetImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/JavaeeFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/JavaeeFactoryImpl.java
deleted file mode 100644
index 0d63d3250..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/JavaeeFactoryImpl.java
+++ /dev/null
@@ -1,1216 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core.internal.impl;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-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.emf.ecore.util.Diagnostician;
-
-import org.eclipse.emf.ecore.xml.type.XMLTypeFactory;
-import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-
-import org.eclipse.jst.javaee.core.*;
-
-import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class JavaeeFactoryImpl extends EFactoryImpl implements JavaeeFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static JavaeeFactory init() {
-		try {
-			JavaeeFactory theJavaeeFactory = (JavaeeFactory)EPackage.Registry.INSTANCE.getEFactory("http://java.sun.com/xml/ns/javaee"); //$NON-NLS-1$ 
-			if (theJavaeeFactory != null) {
-				return theJavaeeFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new JavaeeFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaeeFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case JavaeePackage.DESCRIPTION: return (EObject)createDescription();
-			case JavaeePackage.DISPLAY_NAME: return (EObject)createDisplayName();
-			case JavaeePackage.EJB_LOCAL_REF: return (EObject)createEjbLocalRef();
-			case JavaeePackage.EJB_REF: return (EObject)createEjbRef();
-			case JavaeePackage.EMPTY_TYPE: return (EObject)createEmptyType();
-			case JavaeePackage.ENV_ENTRY: return (EObject)createEnvEntry();
-			case JavaeePackage.ICON: return (EObject)createIcon();
-			case JavaeePackage.INJECTION_TARGET: return (EObject)createInjectionTarget();
-			case JavaeePackage.LIFECYCLE_CALLBACK: return (EObject)createLifecycleCallback();
-			case JavaeePackage.LISTENER: return (EObject)createListener();
-			case JavaeePackage.MESSAGE_DESTINATION: return (EObject)createMessageDestination();
-			case JavaeePackage.MESSAGE_DESTINATION_REF: return (EObject)createMessageDestinationRef();
-			case JavaeePackage.PARAM_VALUE: return (EObject)createParamValue();
-			case JavaeePackage.PERSISTENCE_CONTEXT_REF: return (EObject)createPersistenceContextRef();
-			case JavaeePackage.PERSISTENCE_UNIT_REF: return (EObject)createPersistenceUnitRef();
-			case JavaeePackage.PORT_COMPONENT_REF: return (EObject)createPortComponentRef();
-			case JavaeePackage.PROPERTY_TYPE: return (EObject)createPropertyType();
-			case JavaeePackage.RESOURCE_ENV_REF: return (EObject)createResourceEnvRef();
-			case JavaeePackage.RESOURCE_REF: return (EObject)createResourceRef();
-			case JavaeePackage.RUN_AS: return (EObject)createRunAs();
-			case JavaeePackage.SECURITY_ROLE: return (EObject)createSecurityRole();
-			case JavaeePackage.SECURITY_ROLE_REF: return (EObject)createSecurityRoleRef();
-			case JavaeePackage.SERVICE_REF: return (EObject)createServiceRef();
-			case JavaeePackage.SERVICE_REF_HANDLER: return (EObject)createServiceRefHandler();
-			case JavaeePackage.SERVICE_REF_HANDLER_CHAIN: return (EObject)createServiceRefHandlerChain();
-			case JavaeePackage.SERVICE_REF_HANDLER_CHAINS: return (EObject)createServiceRefHandlerChains();
-			case JavaeePackage.URL_PATTERN_TYPE: return (EObject)createUrlPatternType();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case JavaeePackage.EJB_REF_TYPE:
-				return createEjbRefTypeFromString(eDataType, initialValue);
-			case JavaeePackage.ENV_ENTRY_TYPE:
-				return createEnvEntryTypeFromString(eDataType, initialValue);
-			case JavaeePackage.MESSAGE_DESTINATION_USAGE_TYPE:
-				return createMessageDestinationUsageTypeFromString(eDataType, initialValue);
-			case JavaeePackage.PERSISTENCE_CONTEXT_TYPE:
-				return createPersistenceContextTypeFromString(eDataType, initialValue);
-			case JavaeePackage.RES_AUTH_TYPE:
-				return createResAuthTypeFromString(eDataType, initialValue);
-			case JavaeePackage.RES_SHARING_SCOPE_TYPE:
-				return createResSharingScopeTypeFromString(eDataType, initialValue);
-			case JavaeePackage.DEWEY_VERSION_TYPE:
-				return createDeweyVersionTypeFromString(eDataType, initialValue);
-			case JavaeePackage.EJB_LINK:
-				return createEJBLinkFromString(eDataType, initialValue);
-			case JavaeePackage.EJB_REF_NAME_TYPE:
-				return createEjbRefNameTypeFromString(eDataType, initialValue);
-			case JavaeePackage.EJB_REF_TYPE_OBJECT:
-				return createEjbRefTypeObjectFromString(eDataType, initialValue);
-			case JavaeePackage.ENV_ENTRY_TYPE_OBJECT:
-				return createEnvEntryTypeObjectFromString(eDataType, initialValue);
-			case JavaeePackage.FULLY_QUALIFIED_CLASS_TYPE:
-				return createFullyQualifiedClassTypeFromString(eDataType, initialValue);
-			case JavaeePackage.HOME:
-				return createHomeFromString(eDataType, initialValue);
-			case JavaeePackage.JAVA_IDENTIFIER:
-				return createJavaIdentifierFromString(eDataType, initialValue);
-			case JavaeePackage.JAVA_TYPE:
-				return createJavaTypeFromString(eDataType, initialValue);
-			case JavaeePackage.JNDI_NAME:
-				return createJNDINameFromString(eDataType, initialValue);
-			case JavaeePackage.LOCAL:
-				return createLocalFromString(eDataType, initialValue);
-			case JavaeePackage.LOCAL_HOME:
-				return createLocalHomeFromString(eDataType, initialValue);
-			case JavaeePackage.MESSAGE_DESTINATION_LINK:
-				return createMessageDestinationLinkFromString(eDataType, initialValue);
-			case JavaeePackage.MESSAGE_DESTINATION_TYPE_TYPE:
-				return createMessageDestinationTypeTypeFromString(eDataType, initialValue);
-			case JavaeePackage.MESSAGE_DESTINATION_USAGE_TYPE_OBJECT:
-				return createMessageDestinationUsageTypeObjectFromString(eDataType, initialValue);
-			case JavaeePackage.PATH_TYPE:
-				return createPathTypeFromString(eDataType, initialValue);
-			case JavaeePackage.PERSISTENCE_CONTEXT_TYPE_OBJECT:
-				return createPersistenceContextTypeObjectFromString(eDataType, initialValue);
-			case JavaeePackage.REMOTE:
-				return createRemoteFromString(eDataType, initialValue);
-			case JavaeePackage.RES_AUTH_TYPE_OBJECT:
-				return createResAuthTypeObjectFromString(eDataType, initialValue);
-			case JavaeePackage.RES_SHARING_SCOPE_TYPE_OBJECT:
-				return createResSharingScopeTypeObjectFromString(eDataType, initialValue);
-			case JavaeePackage.ROLE_NAME:
-				return createRoleNameFromString(eDataType, initialValue);
-			case JavaeePackage.SERVICE_REF_PROTOCOL_BINDING_LIST_TYPE:
-				return createServiceRefProtocolBindingListTypeFromString(eDataType, initialValue);
-			case JavaeePackage.SERVICE_REF_PROTOCOL_BINDING_TYPE:
-				return createServiceRefProtocolBindingTypeFromString(eDataType, initialValue);
-			case JavaeePackage.SERVICE_REF_PROTOCOL_URI_ALIAS_TYPE:
-				return createServiceRefProtocolURIAliasTypeFromString(eDataType, initialValue);
-			case JavaeePackage.SERVICE_REF_QNAME_PATTERN:
-				return createServiceRefQnamePatternFromString(eDataType, initialValue);
-			case JavaeePackage.TRUE_FALSE_TYPE:
-				return createTrueFalseTypeFromString(eDataType, initialValue);
-			case JavaeePackage.TRUE_FALSE_TYPE_OBJECT:
-				return createTrueFalseTypeObjectFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case JavaeePackage.EJB_REF_TYPE:
-				return convertEjbRefTypeToString(eDataType, instanceValue);
-			case JavaeePackage.ENV_ENTRY_TYPE:
-				return convertEnvEntryTypeToString(eDataType, instanceValue);
-			case JavaeePackage.MESSAGE_DESTINATION_USAGE_TYPE:
-				return convertMessageDestinationUsageTypeToString(eDataType, instanceValue);
-			case JavaeePackage.PERSISTENCE_CONTEXT_TYPE:
-				return convertPersistenceContextTypeToString(eDataType, instanceValue);
-			case JavaeePackage.RES_AUTH_TYPE:
-				return convertResAuthTypeToString(eDataType, instanceValue);
-			case JavaeePackage.RES_SHARING_SCOPE_TYPE:
-				return convertResSharingScopeTypeToString(eDataType, instanceValue);
-			case JavaeePackage.DEWEY_VERSION_TYPE:
-				return convertDeweyVersionTypeToString(eDataType, instanceValue);
-			case JavaeePackage.EJB_LINK:
-				return convertEJBLinkToString(eDataType, instanceValue);
-			case JavaeePackage.EJB_REF_NAME_TYPE:
-				return convertEjbRefNameTypeToString(eDataType, instanceValue);
-			case JavaeePackage.EJB_REF_TYPE_OBJECT:
-				return convertEjbRefTypeObjectToString(eDataType, instanceValue);
-			case JavaeePackage.ENV_ENTRY_TYPE_OBJECT:
-				return convertEnvEntryTypeObjectToString(eDataType, instanceValue);
-			case JavaeePackage.FULLY_QUALIFIED_CLASS_TYPE:
-				return convertFullyQualifiedClassTypeToString(eDataType, instanceValue);
-			case JavaeePackage.HOME:
-				return convertHomeToString(eDataType, instanceValue);
-			case JavaeePackage.JAVA_IDENTIFIER:
-				return convertJavaIdentifierToString(eDataType, instanceValue);
-			case JavaeePackage.JAVA_TYPE:
-				return convertJavaTypeToString(eDataType, instanceValue);
-			case JavaeePackage.JNDI_NAME:
-				return convertJNDINameToString(eDataType, instanceValue);
-			case JavaeePackage.LOCAL:
-				return convertLocalToString(eDataType, instanceValue);
-			case JavaeePackage.LOCAL_HOME:
-				return convertLocalHomeToString(eDataType, instanceValue);
-			case JavaeePackage.MESSAGE_DESTINATION_LINK:
-				return convertMessageDestinationLinkToString(eDataType, instanceValue);
-			case JavaeePackage.MESSAGE_DESTINATION_TYPE_TYPE:
-				return convertMessageDestinationTypeTypeToString(eDataType, instanceValue);
-			case JavaeePackage.MESSAGE_DESTINATION_USAGE_TYPE_OBJECT:
-				return convertMessageDestinationUsageTypeObjectToString(eDataType, instanceValue);
-			case JavaeePackage.PATH_TYPE:
-				return convertPathTypeToString(eDataType, instanceValue);
-			case JavaeePackage.PERSISTENCE_CONTEXT_TYPE_OBJECT:
-				return convertPersistenceContextTypeObjectToString(eDataType, instanceValue);
-			case JavaeePackage.REMOTE:
-				return convertRemoteToString(eDataType, instanceValue);
-			case JavaeePackage.RES_AUTH_TYPE_OBJECT:
-				return convertResAuthTypeObjectToString(eDataType, instanceValue);
-			case JavaeePackage.RES_SHARING_SCOPE_TYPE_OBJECT:
-				return convertResSharingScopeTypeObjectToString(eDataType, instanceValue);
-			case JavaeePackage.ROLE_NAME:
-				return convertRoleNameToString(eDataType, instanceValue);
-			case JavaeePackage.SERVICE_REF_PROTOCOL_BINDING_LIST_TYPE:
-				return convertServiceRefProtocolBindingListTypeToString(eDataType, instanceValue);
-			case JavaeePackage.SERVICE_REF_PROTOCOL_BINDING_TYPE:
-				return convertServiceRefProtocolBindingTypeToString(eDataType, instanceValue);
-			case JavaeePackage.SERVICE_REF_PROTOCOL_URI_ALIAS_TYPE:
-				return convertServiceRefProtocolURIAliasTypeToString(eDataType, instanceValue);
-			case JavaeePackage.SERVICE_REF_QNAME_PATTERN:
-				return convertServiceRefQnamePatternToString(eDataType, instanceValue);
-			case JavaeePackage.TRUE_FALSE_TYPE:
-				return convertTrueFalseTypeToString(eDataType, instanceValue);
-			case JavaeePackage.TRUE_FALSE_TYPE_OBJECT:
-				return convertTrueFalseTypeObjectToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Description createDescription() {
-		DescriptionImpl description = new DescriptionImpl();
-		return description;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DisplayName createDisplayName() {
-		DisplayNameImpl displayName = new DisplayNameImpl();
-		return displayName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EjbLocalRef createEjbLocalRef() {
-		EjbLocalRefImpl ejbLocalRef = new EjbLocalRefImpl();
-		return ejbLocalRef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EjbRef createEjbRef() {
-		EjbRefImpl ejbRef = new EjbRefImpl();
-		return ejbRef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EmptyType createEmptyType() {
-		EmptyTypeImpl emptyType = new EmptyTypeImpl();
-		return emptyType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EnvEntry createEnvEntry() {
-		EnvEntryImpl envEntry = new EnvEntryImpl();
-		return envEntry;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Icon createIcon() {
-		IconImpl icon = new IconImpl();
-		return icon;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public InjectionTarget createInjectionTarget() {
-		InjectionTargetImpl injectionTarget = new InjectionTargetImpl();
-		return injectionTarget;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LifecycleCallback createLifecycleCallback() {
-		LifecycleCallbackImpl lifecycleCallback = new LifecycleCallbackImpl();
-		return lifecycleCallback;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Listener createListener() {
-		ListenerImpl listener = new ListenerImpl();
-		return listener;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MessageDestination createMessageDestination() {
-		MessageDestinationImpl messageDestination = new MessageDestinationImpl();
-		return messageDestination;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MessageDestinationRef createMessageDestinationRef() {
-		MessageDestinationRefImpl messageDestinationRef = new MessageDestinationRefImpl();
-		return messageDestinationRef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ParamValue createParamValue() {
-		ParamValueImpl paramValue = new ParamValueImpl();
-		return paramValue;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PersistenceContextRef createPersistenceContextRef() {
-		PersistenceContextRefImpl persistenceContextRef = new PersistenceContextRefImpl();
-		return persistenceContextRef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PersistenceUnitRef createPersistenceUnitRef() {
-		PersistenceUnitRefImpl persistenceUnitRef = new PersistenceUnitRefImpl();
-		return persistenceUnitRef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PortComponentRef createPortComponentRef() {
-		PortComponentRefImpl portComponentRef = new PortComponentRefImpl();
-		return portComponentRef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PropertyType createPropertyType() {
-		PropertyTypeImpl propertyType = new PropertyTypeImpl();
-		return propertyType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceEnvRef createResourceEnvRef() {
-		ResourceEnvRefImpl resourceEnvRef = new ResourceEnvRefImpl();
-		return resourceEnvRef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceRef createResourceRef() {
-		ResourceRefImpl resourceRef = new ResourceRefImpl();
-		return resourceRef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RunAs createRunAs() {
-		RunAsImpl runAs = new RunAsImpl();
-		return runAs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SecurityRole createSecurityRole() {
-		SecurityRoleImpl securityRole = new SecurityRoleImpl();
-		return securityRole;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SecurityRoleRef createSecurityRoleRef() {
-		SecurityRoleRefImpl securityRoleRef = new SecurityRoleRefImpl();
-		return securityRoleRef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ServiceRef createServiceRef() {
-		ServiceRefImpl serviceRef = new ServiceRefImpl();
-		return serviceRef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ServiceRefHandler createServiceRefHandler() {
-		ServiceRefHandlerImpl serviceRefHandler = new ServiceRefHandlerImpl();
-		return serviceRefHandler;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ServiceRefHandlerChain createServiceRefHandlerChain() {
-		ServiceRefHandlerChainImpl serviceRefHandlerChain = new ServiceRefHandlerChainImpl();
-		return serviceRefHandlerChain;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ServiceRefHandlerChains createServiceRefHandlerChains() {
-		ServiceRefHandlerChainsImpl serviceRefHandlerChains = new ServiceRefHandlerChainsImpl();
-		return serviceRefHandlerChains;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public UrlPatternType createUrlPatternType() {
-		UrlPatternTypeImpl urlPatternType = new UrlPatternTypeImpl();
-		return urlPatternType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EjbRefType createEjbRefTypeFromString(EDataType eDataType, String initialValue) {
-		EjbRefType result = EjbRefType.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;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertEjbRefTypeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EnvEntryType createEnvEntryTypeFromString(EDataType eDataType, String initialValue) {
-		EnvEntryType result = EnvEntryType.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;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertEnvEntryTypeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MessageDestinationUsageType createMessageDestinationUsageTypeFromString(EDataType eDataType, String initialValue) {
-		MessageDestinationUsageType result = MessageDestinationUsageType.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;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertMessageDestinationUsageTypeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PersistenceContextType createPersistenceContextTypeFromString(EDataType eDataType, String initialValue) {
-		PersistenceContextType result = PersistenceContextType.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;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertPersistenceContextTypeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResAuthType createResAuthTypeFromString(EDataType eDataType, String initialValue) {
-		ResAuthType result = ResAuthType.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;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertResAuthTypeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResSharingScopeType createResSharingScopeTypeFromString(EDataType eDataType, String initialValue) {
-		ResSharingScopeType result = ResSharingScopeType.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;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertResSharingScopeTypeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createDeweyVersionTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.TOKEN, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertDeweyVersionTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.Literals.TOKEN, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createEJBLinkFromString(EDataType eDataType, String initialValue) {
-		return (String)super.createFromString(eDataType, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertEJBLinkToString(EDataType eDataType, Object instanceValue) {
-		return super.convertToString(eDataType, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createEjbRefNameTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)super.createFromString(eDataType, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertEjbRefNameTypeToString(EDataType eDataType, Object instanceValue) {
-		return super.convertToString(eDataType, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EjbRefType createEjbRefTypeObjectFromString(EDataType eDataType, String initialValue) {
-		return (EjbRefType)createEjbRefTypeFromString(JavaeePackage.Literals.EJB_REF_TYPE, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertEjbRefTypeObjectToString(EDataType eDataType, Object instanceValue) {
-		return convertEjbRefTypeToString(JavaeePackage.Literals.EJB_REF_TYPE, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EnvEntryType createEnvEntryTypeObjectFromString(EDataType eDataType, String initialValue) {
-		return (EnvEntryType)createEnvEntryTypeFromString(JavaeePackage.Literals.ENV_ENTRY_TYPE, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertEnvEntryTypeObjectToString(EDataType eDataType, Object instanceValue) {
-		return convertEnvEntryTypeToString(JavaeePackage.Literals.ENV_ENTRY_TYPE, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createFullyQualifiedClassTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)super.createFromString(eDataType, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertFullyQualifiedClassTypeToString(EDataType eDataType, Object instanceValue) {
-		return super.convertToString(eDataType, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createHomeFromString(EDataType eDataType, String initialValue) {
-		return (String)super.createFromString(eDataType, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertHomeToString(EDataType eDataType, Object instanceValue) {
-		return super.convertToString(eDataType, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createJavaIdentifierFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.TOKEN, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertJavaIdentifierToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.Literals.TOKEN, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createJavaTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.TOKEN, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertJavaTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.Literals.TOKEN, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createJNDINameFromString(EDataType eDataType, String initialValue) {
-		return (String)super.createFromString(eDataType, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertJNDINameToString(EDataType eDataType, Object instanceValue) {
-		return super.convertToString(eDataType, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createLocalFromString(EDataType eDataType, String initialValue) {
-		return (String)super.createFromString(eDataType, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertLocalToString(EDataType eDataType, Object instanceValue) {
-		return super.convertToString(eDataType, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createLocalHomeFromString(EDataType eDataType, String initialValue) {
-		return (String)super.createFromString(eDataType, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertLocalHomeToString(EDataType eDataType, Object instanceValue) {
-		return super.convertToString(eDataType, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createMessageDestinationLinkFromString(EDataType eDataType, String initialValue) {
-		return (String)super.createFromString(eDataType, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertMessageDestinationLinkToString(EDataType eDataType, Object instanceValue) {
-		return super.convertToString(eDataType, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createMessageDestinationTypeTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)super.createFromString(eDataType, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertMessageDestinationTypeTypeToString(EDataType eDataType, Object instanceValue) {
-		return super.convertToString(eDataType, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MessageDestinationUsageType createMessageDestinationUsageTypeObjectFromString(EDataType eDataType, String initialValue) {
-		return (MessageDestinationUsageType)createMessageDestinationUsageTypeFromString(JavaeePackage.Literals.MESSAGE_DESTINATION_USAGE_TYPE, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertMessageDestinationUsageTypeObjectToString(EDataType eDataType, Object instanceValue) {
-		return convertMessageDestinationUsageTypeToString(JavaeePackage.Literals.MESSAGE_DESTINATION_USAGE_TYPE, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createPathTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)super.createFromString(eDataType, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertPathTypeToString(EDataType eDataType, Object instanceValue) {
-		return super.convertToString(eDataType, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PersistenceContextType createPersistenceContextTypeObjectFromString(EDataType eDataType, String initialValue) {
-		return (PersistenceContextType)createPersistenceContextTypeFromString(JavaeePackage.Literals.PERSISTENCE_CONTEXT_TYPE, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertPersistenceContextTypeObjectToString(EDataType eDataType, Object instanceValue) {
-		return convertPersistenceContextTypeToString(JavaeePackage.Literals.PERSISTENCE_CONTEXT_TYPE, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createRemoteFromString(EDataType eDataType, String initialValue) {
-		return (String)super.createFromString(eDataType, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertRemoteToString(EDataType eDataType, Object instanceValue) {
-		return super.convertToString(eDataType, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResAuthType createResAuthTypeObjectFromString(EDataType eDataType, String initialValue) {
-		return (ResAuthType)createResAuthTypeFromString(JavaeePackage.Literals.RES_AUTH_TYPE, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertResAuthTypeObjectToString(EDataType eDataType, Object instanceValue) {
-		return convertResAuthTypeToString(JavaeePackage.Literals.RES_AUTH_TYPE, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResSharingScopeType createResSharingScopeTypeObjectFromString(EDataType eDataType, String initialValue) {
-		return (ResSharingScopeType)createResSharingScopeTypeFromString(JavaeePackage.Literals.RES_SHARING_SCOPE_TYPE, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertResSharingScopeTypeObjectToString(EDataType eDataType, Object instanceValue) {
-		return convertResSharingScopeTypeToString(JavaeePackage.Literals.RES_SHARING_SCOPE_TYPE, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createRoleNameFromString(EDataType eDataType, String initialValue) {
-		return (String)super.createFromString(eDataType, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertRoleNameToString(EDataType eDataType, Object instanceValue) {
-		return super.convertToString(eDataType, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List createServiceRefProtocolBindingListTypeFromString(EDataType eDataType, String initialValue) {
-		if (initialValue == null) return null;
-		List result = new ArrayList();
-		for (StringTokenizer stringTokenizer = new StringTokenizer(initialValue); stringTokenizer.hasMoreTokens(); ) {
-			String item = stringTokenizer.nextToken();
-			result.add(createServiceRefProtocolBindingTypeFromString(JavaeePackage.Literals.SERVICE_REF_PROTOCOL_BINDING_TYPE, item));
-		}
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertServiceRefProtocolBindingListTypeToString(EDataType eDataType, Object instanceValue) {
-		if (instanceValue == null) return null;
-		List list = (List)instanceValue;
-		if (list.isEmpty()) return "";
-		StringBuffer result = new StringBuffer();
-		for (Iterator i = list.iterator(); i.hasNext(); ) {
-			result.append(convertServiceRefProtocolBindingTypeToString(JavaeePackage.Literals.SERVICE_REF_PROTOCOL_BINDING_TYPE, i.next()));
-			result.append(' ');
-		}
-		return result.substring(0, result.length() - 1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createServiceRefProtocolBindingTypeFromString(EDataType eDataType, String initialValue) {
-		if (initialValue == null) return null;
-		String result = null;
-		RuntimeException exception = null;
-		try {
-			result = (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.ANY_URI, initialValue);
-			if (result != null && Diagnostician.INSTANCE.validate(eDataType, result, null, null)) {
-				return result;
-			}
-		}
-		catch (RuntimeException e) {
-			exception = e;
-		}
-		try {
-			result = (String)createServiceRefProtocolURIAliasTypeFromString(JavaeePackage.Literals.SERVICE_REF_PROTOCOL_URI_ALIAS_TYPE, initialValue);
-			if (result != null && Diagnostician.INSTANCE.validate(eDataType, result, null, null)) {
-				return result;
-			}
-		}
-		catch (RuntimeException e) {
-			exception = e;
-		}
-		if (result != null || exception == null) return result;
-    
-		throw exception;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertServiceRefProtocolBindingTypeToString(EDataType eDataType, Object instanceValue) {
-		if (instanceValue == null) return null;
-		if (XMLTypePackage.Literals.ANY_URI.isInstance(instanceValue)) {
-			try {
-				String value = XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.Literals.ANY_URI, instanceValue);
-				if (value != null) return value;
-			}
-			catch (Exception e) {
-			}
-		}
-		if (JavaeePackage.Literals.SERVICE_REF_PROTOCOL_URI_ALIAS_TYPE.isInstance(instanceValue)) {
-			try {
-				String value = convertServiceRefProtocolURIAliasTypeToString(JavaeePackage.Literals.SERVICE_REF_PROTOCOL_URI_ALIAS_TYPE, instanceValue);
-				if (value != null) return value;
-			}
-			catch (Exception e) {
-			}
-		}
-		throw new IllegalArgumentException("Invalid value: '"+instanceValue+"' for datatype :"+eDataType.getName());
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createServiceRefProtocolURIAliasTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.TOKEN, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertServiceRefProtocolURIAliasTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.Literals.TOKEN, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createServiceRefQnamePatternFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.TOKEN, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertServiceRefQnamePatternToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.Literals.TOKEN, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Boolean createTrueFalseTypeFromString(EDataType eDataType, String initialValue) {
-		return (Boolean)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.BOOLEAN, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertTrueFalseTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.Literals.BOOLEAN, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Boolean createTrueFalseTypeObjectFromString(EDataType eDataType, String initialValue) {
-		return (Boolean)createTrueFalseTypeFromString(JavaeePackage.Literals.TRUE_FALSE_TYPE, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertTrueFalseTypeObjectToString(EDataType eDataType, Object instanceValue) {
-		return convertTrueFalseTypeToString(JavaeePackage.Literals.TRUE_FALSE_TYPE, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaeePackage getJavaeePackage() {
-		return (JavaeePackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	public static JavaeePackage getPackage() {
-		return JavaeePackage.eINSTANCE;
-	}
-
-} //JavaeeFactoryImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/JavaeePackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/JavaeePackageImpl.java
deleted file mode 100644
index 901759a18..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/JavaeePackageImpl.java
+++ /dev/null
@@ -1,4461 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core.internal.impl;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EValidator;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.emf.ecore.xml.namespace.XMLNamespacePackage;
-
-import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-
-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.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.EjbRefType;
-import org.eclipse.jst.javaee.core.EmptyType;
-import org.eclipse.jst.javaee.core.EnvEntry;
-import org.eclipse.jst.javaee.core.EnvEntryType;
-import org.eclipse.jst.javaee.core.Icon;
-import org.eclipse.jst.javaee.core.InjectionTarget;
-import org.eclipse.jst.javaee.core.JavaeeFactory;
-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.MessageDestinationUsageType;
-import org.eclipse.jst.javaee.core.ParamValue;
-import org.eclipse.jst.javaee.core.PersistenceContextRef;
-import org.eclipse.jst.javaee.core.PersistenceContextType;
-import org.eclipse.jst.javaee.core.PersistenceUnitRef;
-import org.eclipse.jst.javaee.core.PortComponentRef;
-import org.eclipse.jst.javaee.core.PropertyType;
-import org.eclipse.jst.javaee.core.ResAuthType;
-import org.eclipse.jst.javaee.core.ResSharingScopeType;
-import org.eclipse.jst.javaee.core.ResourceEnvRef;
-import org.eclipse.jst.javaee.core.ResourceRef;
-import org.eclipse.jst.javaee.core.RunAs;
-import org.eclipse.jst.javaee.core.SecurityRole;
-import org.eclipse.jst.javaee.core.SecurityRoleRef;
-import org.eclipse.jst.javaee.core.ServiceRef;
-import org.eclipse.jst.javaee.core.ServiceRefHandler;
-import org.eclipse.jst.javaee.core.ServiceRefHandlerChain;
-import org.eclipse.jst.javaee.core.ServiceRefHandlerChains;
-import org.eclipse.jst.javaee.core.UrlPatternType;
-
-import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
-
-import org.eclipse.jst.javaee.core.internal.util.JavaeeValidator;
-
-import org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl;
-
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-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;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class JavaeePackageImpl extends EPackageImpl implements JavaeePackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass descriptionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass displayNameEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ejbLocalRefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ejbRefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass emptyTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass envEntryEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass iconEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass injectionTargetEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass lifecycleCallbackEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass listenerEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass messageDestinationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass messageDestinationRefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass paramValueEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass persistenceContextRefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass persistenceUnitRefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass portComponentRefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass propertyTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass resourceEnvRefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass resourceRefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass runAsEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass securityRoleEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass securityRoleRefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass serviceRefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass serviceRefHandlerEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass serviceRefHandlerChainEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass serviceRefHandlerChainsEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass urlPatternTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum ejbRefTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum envEntryTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum messageDestinationUsageTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum persistenceContextTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum resAuthTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum resSharingScopeTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType deweyVersionTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType ejbLinkEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType ejbRefNameTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType ejbRefTypeObjectEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType envEntryTypeObjectEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType fullyQualifiedClassTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType homeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType javaIdentifierEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType javaTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType jndiNameEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType localEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType localHomeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType messageDestinationLinkEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType messageDestinationTypeTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType messageDestinationUsageTypeObjectEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType pathTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType persistenceContextTypeObjectEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType remoteEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType resAuthTypeObjectEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType resSharingScopeTypeObjectEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType roleNameEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType serviceRefProtocolBindingListTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType serviceRefProtocolBindingTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType serviceRefProtocolURIAliasTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType serviceRefQnamePatternEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType trueFalseTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType trueFalseTypeObjectEDataType = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>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.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private JavaeePackageImpl() {
-		super(eNS_URI, JavaeeFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> 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.
-	 * <p>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.
-	 * <p>Invocation of this method will not affect any packages that have
-	 * already been initialized.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static JavaeePackage init() {
-		if (isInited) return (JavaeePackage)EPackage.Registry.INSTANCE.getEPackage(JavaeePackage.eNS_URI);
-
-		// Obtain or create and register package
-		JavaeePackageImpl theJavaeePackage = (JavaeePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof JavaeePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new JavaeePackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		XMLNamespacePackage.eINSTANCE.eClass();
-		XMLTypePackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		WebPackageImpl theWebPackage = (WebPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebPackage.eNS_URI) instanceof WebPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebPackage.eNS_URI) : WebPackage.eINSTANCE);
-		ApplicationPackageImpl theApplicationPackage = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) instanceof ApplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) : ApplicationPackage.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);
-		JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) instanceof JspPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) : JspPackage.eINSTANCE);
-
-		// Create package meta-data objects
-		theJavaeePackage.createPackageContents();
-		theWebPackage.createPackageContents();
-		theApplicationPackage.createPackageContents();
-		theEjbPackage.createPackageContents();
-		theApplicationclientPackage.createPackageContents();
-		theJspPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theJavaeePackage.initializePackageContents();
-		theWebPackage.initializePackageContents();
-		theApplicationPackage.initializePackageContents();
-		theEjbPackage.initializePackageContents();
-		theApplicationclientPackage.initializePackageContents();
-		theJspPackage.initializePackageContents();
-
-		// Register package validator
-		EValidator.Registry.INSTANCE.put
-			(theJavaeePackage, 
-			 new EValidator.Descriptor() {
-				 public EValidator getEValidator() {
-					 return JavaeeValidator.INSTANCE;
-				 }
-			 });
-
-		// Mark meta-data to indicate it can't be changed
-		theJavaeePackage.freeze();
-
-		return theJavaeePackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDescription() {
-		return descriptionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDescription_Value() {
-		return (EAttribute)descriptionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDescription_Lang() {
-		return (EAttribute)descriptionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDisplayName() {
-		return displayNameEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDisplayName_Value() {
-		return (EAttribute)displayNameEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDisplayName_Lang() {
-		return (EAttribute)displayNameEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getEjbLocalRef() {
-		return ejbLocalRefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEjbLocalRef_Descriptions() {
-		return (EReference)ejbLocalRefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEjbLocalRef_EjbRefName() {
-		return (EAttribute)ejbLocalRefEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEjbLocalRef_EjbRefType() {
-		return (EAttribute)ejbLocalRefEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEjbLocalRef_LocalHome() {
-		return (EAttribute)ejbLocalRefEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEjbLocalRef_Local() {
-		return (EAttribute)ejbLocalRefEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEjbLocalRef_EjbLink() {
-		return (EAttribute)ejbLocalRefEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEjbLocalRef_MappedName() {
-		return (EAttribute)ejbLocalRefEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEjbLocalRef_InjectionTargets() {
-		return (EReference)ejbLocalRefEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEjbLocalRef_Id() {
-		return (EAttribute)ejbLocalRefEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getEjbRef() {
-		return ejbRefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEjbRef_Descriptions() {
-		return (EReference)ejbRefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEjbRef_EjbRefName() {
-		return (EAttribute)ejbRefEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEjbRef_EjbRefType() {
-		return (EAttribute)ejbRefEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEjbRef_Home() {
-		return (EAttribute)ejbRefEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEjbRef_Remote() {
-		return (EAttribute)ejbRefEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEjbRef_EjbLink() {
-		return (EAttribute)ejbRefEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEjbRef_MappedName() {
-		return (EAttribute)ejbRefEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEjbRef_InjectionTargets() {
-		return (EReference)ejbRefEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEjbRef_Id() {
-		return (EAttribute)ejbRefEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getEmptyType() {
-		return emptyTypeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEmptyType_Id() {
-		return (EAttribute)emptyTypeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getEnvEntry() {
-		return envEntryEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEnvEntry_Descriptions() {
-		return (EReference)envEntryEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEnvEntry_EnvEntryName() {
-		return (EAttribute)envEntryEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEnvEntry_EnvEntryType() {
-		return (EAttribute)envEntryEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEnvEntry_EnvEntryValue() {
-		return (EAttribute)envEntryEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEnvEntry_MappedName() {
-		return (EAttribute)envEntryEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEnvEntry_InjectionTargets() {
-		return (EReference)envEntryEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEnvEntry_Id() {
-		return (EAttribute)envEntryEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getIcon() {
-		return iconEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getIcon_SmallIcon() {
-		return (EAttribute)iconEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getIcon_LargeIcon() {
-		return (EAttribute)iconEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getIcon_Id() {
-		return (EAttribute)iconEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getIcon_Lang() {
-		return (EAttribute)iconEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getInjectionTarget() {
-		return injectionTargetEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getInjectionTarget_InjectionTargetClass() {
-		return (EAttribute)injectionTargetEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getInjectionTarget_InjectionTargetName() {
-		return (EAttribute)injectionTargetEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getLifecycleCallback() {
-		return lifecycleCallbackEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getLifecycleCallback_LifecycleCallbackClass() {
-		return (EAttribute)lifecycleCallbackEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getLifecycleCallback_LifecycleCallbackMethod() {
-		return (EAttribute)lifecycleCallbackEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getListener() {
-		return listenerEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getListener_Descriptions() {
-		return (EReference)listenerEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getListener_DisplayNames() {
-		return (EReference)listenerEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getListener_Icons() {
-		return (EReference)listenerEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getListener_ListenerClass() {
-		return (EAttribute)listenerEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getListener_Id() {
-		return (EAttribute)listenerEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMessageDestination() {
-		return messageDestinationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMessageDestination_Descriptions() {
-		return (EReference)messageDestinationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMessageDestination_DisplayNames() {
-		return (EReference)messageDestinationEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMessageDestination_Icons() {
-		return (EReference)messageDestinationEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMessageDestination_MessageDestinationName() {
-		return (EAttribute)messageDestinationEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMessageDestination_MappedName() {
-		return (EAttribute)messageDestinationEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMessageDestination_Id() {
-		return (EAttribute)messageDestinationEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMessageDestinationRef() {
-		return messageDestinationRefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMessageDestinationRef_Descriptions() {
-		return (EReference)messageDestinationRefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMessageDestinationRef_MessageDestinationRefName() {
-		return (EAttribute)messageDestinationRefEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMessageDestinationRef_MessageDestinationType() {
-		return (EAttribute)messageDestinationRefEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMessageDestinationRef_MessageDestinationUsage() {
-		return (EAttribute)messageDestinationRefEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMessageDestinationRef_MessageDestinationLink() {
-		return (EAttribute)messageDestinationRefEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMessageDestinationRef_MappedName() {
-		return (EAttribute)messageDestinationRefEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMessageDestinationRef_InjectionTargets() {
-		return (EReference)messageDestinationRefEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMessageDestinationRef_Id() {
-		return (EAttribute)messageDestinationRefEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getParamValue() {
-		return paramValueEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getParamValue_Descriptions() {
-		return (EReference)paramValueEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getParamValue_ParamName() {
-		return (EAttribute)paramValueEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getParamValue_ParamValue() {
-		return (EAttribute)paramValueEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getParamValue_Id() {
-		return (EAttribute)paramValueEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPersistenceContextRef() {
-		return persistenceContextRefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPersistenceContextRef_Descriptions() {
-		return (EReference)persistenceContextRefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPersistenceContextRef_PersistenceContextRefName() {
-		return (EAttribute)persistenceContextRefEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPersistenceContextRef_PersistenceUnitName() {
-		return (EAttribute)persistenceContextRefEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPersistenceContextRef_PersistenceContextType() {
-		return (EAttribute)persistenceContextRefEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPersistenceContextRef_PersistenceProperties() {
-		return (EReference)persistenceContextRefEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPersistenceContextRef_MappedName() {
-		return (EAttribute)persistenceContextRefEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPersistenceContextRef_InjectionTargets() {
-		return (EReference)persistenceContextRefEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPersistenceContextRef_Id() {
-		return (EAttribute)persistenceContextRefEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPersistenceUnitRef() {
-		return persistenceUnitRefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPersistenceUnitRef_Descriptions() {
-		return (EReference)persistenceUnitRefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPersistenceUnitRef_PersistenceUnitRefName() {
-		return (EAttribute)persistenceUnitRefEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPersistenceUnitRef_PersistenceUnitName() {
-		return (EAttribute)persistenceUnitRefEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPersistenceUnitRef_MappedName() {
-		return (EAttribute)persistenceUnitRefEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPersistenceUnitRef_InjectionTargets() {
-		return (EReference)persistenceUnitRefEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPersistenceUnitRef_Id() {
-		return (EAttribute)persistenceUnitRefEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPortComponentRef() {
-		return portComponentRefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPortComponentRef_ServiceEndpointInterface() {
-		return (EAttribute)portComponentRefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPortComponentRef_EnableMtom() {
-		return (EAttribute)portComponentRefEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPortComponentRef_PortComponentLink() {
-		return (EAttribute)portComponentRefEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPortComponentRef_Id() {
-		return (EAttribute)portComponentRefEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPropertyType() {
-		return propertyTypeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPropertyType_Name() {
-		return (EAttribute)propertyTypeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPropertyType_Value() {
-		return (EAttribute)propertyTypeEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPropertyType_Id() {
-		return (EAttribute)propertyTypeEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getResourceEnvRef() {
-		return resourceEnvRefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getResourceEnvRef_Descriptions() {
-		return (EReference)resourceEnvRefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResourceEnvRef_ResourceEnvRefName() {
-		return (EAttribute)resourceEnvRefEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResourceEnvRef_ResourceEnvRefType() {
-		return (EAttribute)resourceEnvRefEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResourceEnvRef_MappedName() {
-		return (EAttribute)resourceEnvRefEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getResourceEnvRef_InjectionTargets() {
-		return (EReference)resourceEnvRefEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResourceEnvRef_Id() {
-		return (EAttribute)resourceEnvRefEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getResourceRef() {
-		return resourceRefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getResourceRef_Descriptions() {
-		return (EReference)resourceRefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResourceRef_ResRefName() {
-		return (EAttribute)resourceRefEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResourceRef_ResType() {
-		return (EAttribute)resourceRefEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResourceRef_ResAuth() {
-		return (EAttribute)resourceRefEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResourceRef_ResSharingScope() {
-		return (EAttribute)resourceRefEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResourceRef_MappedName() {
-		return (EAttribute)resourceRefEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getResourceRef_InjectionTargets() {
-		return (EReference)resourceRefEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResourceRef_Id() {
-		return (EAttribute)resourceRefEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getRunAs() {
-		return runAsEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getRunAs_Descriptions() {
-		return (EReference)runAsEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRunAs_RoleName() {
-		return (EAttribute)runAsEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRunAs_Id() {
-		return (EAttribute)runAsEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getSecurityRole() {
-		return securityRoleEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSecurityRole_Descriptions() {
-		return (EReference)securityRoleEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSecurityRole_RoleName() {
-		return (EAttribute)securityRoleEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSecurityRole_Id() {
-		return (EAttribute)securityRoleEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getSecurityRoleRef() {
-		return securityRoleRefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSecurityRoleRef_Descriptions() {
-		return (EReference)securityRoleRefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSecurityRoleRef_RoleName() {
-		return (EAttribute)securityRoleRefEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSecurityRoleRef_RoleLink() {
-		return (EAttribute)securityRoleRefEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSecurityRoleRef_Id() {
-		return (EAttribute)securityRoleRefEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getServiceRef() {
-		return serviceRefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getServiceRef_Descriptions() {
-		return (EReference)serviceRefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getServiceRef_DisplayNames() {
-		return (EReference)serviceRefEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getServiceRef_Icons() {
-		return (EReference)serviceRefEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getServiceRef_ServiceRefName() {
-		return (EAttribute)serviceRefEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getServiceRef_ServiceInterface() {
-		return (EAttribute)serviceRefEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getServiceRef_ServiceRefType() {
-		return (EAttribute)serviceRefEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getServiceRef_WsdlFile() {
-		return (EAttribute)serviceRefEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getServiceRef_JaxrpcMappingFile() {
-		return (EAttribute)serviceRefEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getServiceRef_ServiceQname() {
-		return (EAttribute)serviceRefEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getServiceRef_PortComponentRefs() {
-		return (EReference)serviceRefEClass.getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getServiceRef_Handlers() {
-		return (EReference)serviceRefEClass.getEStructuralFeatures().get(10);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getServiceRef_HandlerChains() {
-		return (EReference)serviceRefEClass.getEStructuralFeatures().get(11);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getServiceRef_MappedName() {
-		return (EAttribute)serviceRefEClass.getEStructuralFeatures().get(12);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getServiceRef_InjectionTargets() {
-		return (EReference)serviceRefEClass.getEStructuralFeatures().get(13);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getServiceRef_Id() {
-		return (EAttribute)serviceRefEClass.getEStructuralFeatures().get(14);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getServiceRefHandler() {
-		return serviceRefHandlerEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getServiceRefHandler_Descriptions() {
-		return (EReference)serviceRefHandlerEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getServiceRefHandler_DisplayNames() {
-		return (EReference)serviceRefHandlerEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getServiceRefHandler_Icons() {
-		return (EReference)serviceRefHandlerEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getServiceRefHandler_HandlerName() {
-		return (EAttribute)serviceRefHandlerEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getServiceRefHandler_HandlerClass() {
-		return (EAttribute)serviceRefHandlerEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getServiceRefHandler_InitParams() {
-		return (EReference)serviceRefHandlerEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getServiceRefHandler_SoapHeaders() {
-		return (EAttribute)serviceRefHandlerEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getServiceRefHandler_SoapRoles() {
-		return (EAttribute)serviceRefHandlerEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getServiceRefHandler_PortNames() {
-		return (EAttribute)serviceRefHandlerEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getServiceRefHandler_Id() {
-		return (EAttribute)serviceRefHandlerEClass.getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getServiceRefHandlerChain() {
-		return serviceRefHandlerChainEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getServiceRefHandlerChain_ServiceNamePattern() {
-		return (EAttribute)serviceRefHandlerChainEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getServiceRefHandlerChain_PortNamePattern() {
-		return (EAttribute)serviceRefHandlerChainEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getServiceRefHandlerChain_ProtocolBindings() {
-		return (EAttribute)serviceRefHandlerChainEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getServiceRefHandlerChain_Handlers() {
-		return (EReference)serviceRefHandlerChainEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getServiceRefHandlerChain_Id() {
-		return (EAttribute)serviceRefHandlerChainEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getServiceRefHandlerChains() {
-		return serviceRefHandlerChainsEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getServiceRefHandlerChains_HandlerChains() {
-		return (EReference)serviceRefHandlerChainsEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getServiceRefHandlerChains_Id() {
-		return (EAttribute)serviceRefHandlerChainsEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getUrlPatternType() {
-		return urlPatternTypeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getUrlPatternType_Value() {
-		return (EAttribute)urlPatternTypeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getEjbRefType() {
-		return ejbRefTypeEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getEnvEntryType() {
-		return envEntryTypeEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getMessageDestinationUsageType() {
-		return messageDestinationUsageTypeEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getPersistenceContextType() {
-		return persistenceContextTypeEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getResAuthType() {
-		return resAuthTypeEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getResSharingScopeType() {
-		return resSharingScopeTypeEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getDeweyVersionType() {
-		return deweyVersionTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getEJBLink() {
-		return ejbLinkEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getEjbRefNameType() {
-		return ejbRefNameTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getEjbRefTypeObject() {
-		return ejbRefTypeObjectEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getEnvEntryTypeObject() {
-		return envEntryTypeObjectEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getFullyQualifiedClassType() {
-		return fullyQualifiedClassTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getHome() {
-		return homeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getJavaIdentifier() {
-		return javaIdentifierEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getJavaType() {
-		return javaTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getJNDIName() {
-		return jndiNameEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getLocal() {
-		return localEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getLocalHome() {
-		return localHomeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getMessageDestinationLink() {
-		return messageDestinationLinkEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getMessageDestinationTypeType() {
-		return messageDestinationTypeTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getMessageDestinationUsageTypeObject() {
-		return messageDestinationUsageTypeObjectEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getPathType() {
-		return pathTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getPersistenceContextTypeObject() {
-		return persistenceContextTypeObjectEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getRemote() {
-		return remoteEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getResAuthTypeObject() {
-		return resAuthTypeObjectEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getResSharingScopeTypeObject() {
-		return resSharingScopeTypeObjectEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getRoleName() {
-		return roleNameEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getServiceRefProtocolBindingListType() {
-		return serviceRefProtocolBindingListTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getServiceRefProtocolBindingType() {
-		return serviceRefProtocolBindingTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getServiceRefProtocolURIAliasType() {
-		return serviceRefProtocolURIAliasTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getServiceRefQnamePattern() {
-		return serviceRefQnamePatternEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getTrueFalseType() {
-		return trueFalseTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getTrueFalseTypeObject() {
-		return trueFalseTypeObjectEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaeeFactory getJavaeeFactory() {
-		return (JavaeeFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @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.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		descriptionEClass = createEClass(DESCRIPTION);
-		createEAttribute(descriptionEClass, DESCRIPTION__VALUE);
-		createEAttribute(descriptionEClass, DESCRIPTION__LANG);
-
-		displayNameEClass = createEClass(DISPLAY_NAME);
-		createEAttribute(displayNameEClass, DISPLAY_NAME__VALUE);
-		createEAttribute(displayNameEClass, DISPLAY_NAME__LANG);
-
-		ejbLocalRefEClass = createEClass(EJB_LOCAL_REF);
-		createEReference(ejbLocalRefEClass, EJB_LOCAL_REF__DESCRIPTIONS);
-		createEAttribute(ejbLocalRefEClass, EJB_LOCAL_REF__EJB_REF_NAME);
-		createEAttribute(ejbLocalRefEClass, EJB_LOCAL_REF__EJB_REF_TYPE);
-		createEAttribute(ejbLocalRefEClass, EJB_LOCAL_REF__LOCAL_HOME);
-		createEAttribute(ejbLocalRefEClass, EJB_LOCAL_REF__LOCAL);
-		createEAttribute(ejbLocalRefEClass, EJB_LOCAL_REF__EJB_LINK);
-		createEAttribute(ejbLocalRefEClass, EJB_LOCAL_REF__MAPPED_NAME);
-		createEReference(ejbLocalRefEClass, EJB_LOCAL_REF__INJECTION_TARGETS);
-		createEAttribute(ejbLocalRefEClass, EJB_LOCAL_REF__ID);
-
-		ejbRefEClass = createEClass(EJB_REF);
-		createEReference(ejbRefEClass, EJB_REF__DESCRIPTIONS);
-		createEAttribute(ejbRefEClass, EJB_REF__EJB_REF_NAME);
-		createEAttribute(ejbRefEClass, EJB_REF__EJB_REF_TYPE);
-		createEAttribute(ejbRefEClass, EJB_REF__HOME);
-		createEAttribute(ejbRefEClass, EJB_REF__REMOTE);
-		createEAttribute(ejbRefEClass, EJB_REF__EJB_LINK);
-		createEAttribute(ejbRefEClass, EJB_REF__MAPPED_NAME);
-		createEReference(ejbRefEClass, EJB_REF__INJECTION_TARGETS);
-		createEAttribute(ejbRefEClass, EJB_REF__ID);
-
-		emptyTypeEClass = createEClass(EMPTY_TYPE);
-		createEAttribute(emptyTypeEClass, EMPTY_TYPE__ID);
-
-		envEntryEClass = createEClass(ENV_ENTRY);
-		createEReference(envEntryEClass, ENV_ENTRY__DESCRIPTIONS);
-		createEAttribute(envEntryEClass, ENV_ENTRY__ENV_ENTRY_NAME);
-		createEAttribute(envEntryEClass, ENV_ENTRY__ENV_ENTRY_TYPE);
-		createEAttribute(envEntryEClass, ENV_ENTRY__ENV_ENTRY_VALUE);
-		createEAttribute(envEntryEClass, ENV_ENTRY__MAPPED_NAME);
-		createEReference(envEntryEClass, ENV_ENTRY__INJECTION_TARGETS);
-		createEAttribute(envEntryEClass, ENV_ENTRY__ID);
-
-		iconEClass = createEClass(ICON);
-		createEAttribute(iconEClass, ICON__SMALL_ICON);
-		createEAttribute(iconEClass, ICON__LARGE_ICON);
-		createEAttribute(iconEClass, ICON__ID);
-		createEAttribute(iconEClass, ICON__LANG);
-
-		injectionTargetEClass = createEClass(INJECTION_TARGET);
-		createEAttribute(injectionTargetEClass, INJECTION_TARGET__INJECTION_TARGET_CLASS);
-		createEAttribute(injectionTargetEClass, INJECTION_TARGET__INJECTION_TARGET_NAME);
-
-		lifecycleCallbackEClass = createEClass(LIFECYCLE_CALLBACK);
-		createEAttribute(lifecycleCallbackEClass, LIFECYCLE_CALLBACK__LIFECYCLE_CALLBACK_CLASS);
-		createEAttribute(lifecycleCallbackEClass, LIFECYCLE_CALLBACK__LIFECYCLE_CALLBACK_METHOD);
-
-		listenerEClass = createEClass(LISTENER);
-		createEReference(listenerEClass, LISTENER__DESCRIPTIONS);
-		createEReference(listenerEClass, LISTENER__DISPLAY_NAMES);
-		createEReference(listenerEClass, LISTENER__ICONS);
-		createEAttribute(listenerEClass, LISTENER__LISTENER_CLASS);
-		createEAttribute(listenerEClass, LISTENER__ID);
-
-		messageDestinationEClass = createEClass(MESSAGE_DESTINATION);
-		createEReference(messageDestinationEClass, MESSAGE_DESTINATION__DESCRIPTIONS);
-		createEReference(messageDestinationEClass, MESSAGE_DESTINATION__DISPLAY_NAMES);
-		createEReference(messageDestinationEClass, MESSAGE_DESTINATION__ICONS);
-		createEAttribute(messageDestinationEClass, MESSAGE_DESTINATION__MESSAGE_DESTINATION_NAME);
-		createEAttribute(messageDestinationEClass, MESSAGE_DESTINATION__MAPPED_NAME);
-		createEAttribute(messageDestinationEClass, MESSAGE_DESTINATION__ID);
-
-		messageDestinationRefEClass = createEClass(MESSAGE_DESTINATION_REF);
-		createEReference(messageDestinationRefEClass, MESSAGE_DESTINATION_REF__DESCRIPTIONS);
-		createEAttribute(messageDestinationRefEClass, MESSAGE_DESTINATION_REF__MESSAGE_DESTINATION_REF_NAME);
-		createEAttribute(messageDestinationRefEClass, MESSAGE_DESTINATION_REF__MESSAGE_DESTINATION_TYPE);
-		createEAttribute(messageDestinationRefEClass, MESSAGE_DESTINATION_REF__MESSAGE_DESTINATION_USAGE);
-		createEAttribute(messageDestinationRefEClass, MESSAGE_DESTINATION_REF__MESSAGE_DESTINATION_LINK);
-		createEAttribute(messageDestinationRefEClass, MESSAGE_DESTINATION_REF__MAPPED_NAME);
-		createEReference(messageDestinationRefEClass, MESSAGE_DESTINATION_REF__INJECTION_TARGETS);
-		createEAttribute(messageDestinationRefEClass, MESSAGE_DESTINATION_REF__ID);
-
-		paramValueEClass = createEClass(PARAM_VALUE);
-		createEReference(paramValueEClass, PARAM_VALUE__DESCRIPTIONS);
-		createEAttribute(paramValueEClass, PARAM_VALUE__PARAM_NAME);
-		createEAttribute(paramValueEClass, PARAM_VALUE__PARAM_VALUE);
-		createEAttribute(paramValueEClass, PARAM_VALUE__ID);
-
-		persistenceContextRefEClass = createEClass(PERSISTENCE_CONTEXT_REF);
-		createEReference(persistenceContextRefEClass, PERSISTENCE_CONTEXT_REF__DESCRIPTIONS);
-		createEAttribute(persistenceContextRefEClass, PERSISTENCE_CONTEXT_REF__PERSISTENCE_CONTEXT_REF_NAME);
-		createEAttribute(persistenceContextRefEClass, PERSISTENCE_CONTEXT_REF__PERSISTENCE_UNIT_NAME);
-		createEAttribute(persistenceContextRefEClass, PERSISTENCE_CONTEXT_REF__PERSISTENCE_CONTEXT_TYPE);
-		createEReference(persistenceContextRefEClass, PERSISTENCE_CONTEXT_REF__PERSISTENCE_PROPERTIES);
-		createEAttribute(persistenceContextRefEClass, PERSISTENCE_CONTEXT_REF__MAPPED_NAME);
-		createEReference(persistenceContextRefEClass, PERSISTENCE_CONTEXT_REF__INJECTION_TARGETS);
-		createEAttribute(persistenceContextRefEClass, PERSISTENCE_CONTEXT_REF__ID);
-
-		persistenceUnitRefEClass = createEClass(PERSISTENCE_UNIT_REF);
-		createEReference(persistenceUnitRefEClass, PERSISTENCE_UNIT_REF__DESCRIPTIONS);
-		createEAttribute(persistenceUnitRefEClass, PERSISTENCE_UNIT_REF__PERSISTENCE_UNIT_REF_NAME);
-		createEAttribute(persistenceUnitRefEClass, PERSISTENCE_UNIT_REF__PERSISTENCE_UNIT_NAME);
-		createEAttribute(persistenceUnitRefEClass, PERSISTENCE_UNIT_REF__MAPPED_NAME);
-		createEReference(persistenceUnitRefEClass, PERSISTENCE_UNIT_REF__INJECTION_TARGETS);
-		createEAttribute(persistenceUnitRefEClass, PERSISTENCE_UNIT_REF__ID);
-
-		portComponentRefEClass = createEClass(PORT_COMPONENT_REF);
-		createEAttribute(portComponentRefEClass, PORT_COMPONENT_REF__SERVICE_ENDPOINT_INTERFACE);
-		createEAttribute(portComponentRefEClass, PORT_COMPONENT_REF__ENABLE_MTOM);
-		createEAttribute(portComponentRefEClass, PORT_COMPONENT_REF__PORT_COMPONENT_LINK);
-		createEAttribute(portComponentRefEClass, PORT_COMPONENT_REF__ID);
-
-		propertyTypeEClass = createEClass(PROPERTY_TYPE);
-		createEAttribute(propertyTypeEClass, PROPERTY_TYPE__NAME);
-		createEAttribute(propertyTypeEClass, PROPERTY_TYPE__VALUE);
-		createEAttribute(propertyTypeEClass, PROPERTY_TYPE__ID);
-
-		resourceEnvRefEClass = createEClass(RESOURCE_ENV_REF);
-		createEReference(resourceEnvRefEClass, RESOURCE_ENV_REF__DESCRIPTIONS);
-		createEAttribute(resourceEnvRefEClass, RESOURCE_ENV_REF__RESOURCE_ENV_REF_NAME);
-		createEAttribute(resourceEnvRefEClass, RESOURCE_ENV_REF__RESOURCE_ENV_REF_TYPE);
-		createEAttribute(resourceEnvRefEClass, RESOURCE_ENV_REF__MAPPED_NAME);
-		createEReference(resourceEnvRefEClass, RESOURCE_ENV_REF__INJECTION_TARGETS);
-		createEAttribute(resourceEnvRefEClass, RESOURCE_ENV_REF__ID);
-
-		resourceRefEClass = createEClass(RESOURCE_REF);
-		createEReference(resourceRefEClass, RESOURCE_REF__DESCRIPTIONS);
-		createEAttribute(resourceRefEClass, RESOURCE_REF__RES_REF_NAME);
-		createEAttribute(resourceRefEClass, RESOURCE_REF__RES_TYPE);
-		createEAttribute(resourceRefEClass, RESOURCE_REF__RES_AUTH);
-		createEAttribute(resourceRefEClass, RESOURCE_REF__RES_SHARING_SCOPE);
-		createEAttribute(resourceRefEClass, RESOURCE_REF__MAPPED_NAME);
-		createEReference(resourceRefEClass, RESOURCE_REF__INJECTION_TARGETS);
-		createEAttribute(resourceRefEClass, RESOURCE_REF__ID);
-
-		runAsEClass = createEClass(RUN_AS);
-		createEReference(runAsEClass, RUN_AS__DESCRIPTIONS);
-		createEAttribute(runAsEClass, RUN_AS__ROLE_NAME);
-		createEAttribute(runAsEClass, RUN_AS__ID);
-
-		securityRoleEClass = createEClass(SECURITY_ROLE);
-		createEReference(securityRoleEClass, SECURITY_ROLE__DESCRIPTIONS);
-		createEAttribute(securityRoleEClass, SECURITY_ROLE__ROLE_NAME);
-		createEAttribute(securityRoleEClass, SECURITY_ROLE__ID);
-
-		securityRoleRefEClass = createEClass(SECURITY_ROLE_REF);
-		createEReference(securityRoleRefEClass, SECURITY_ROLE_REF__DESCRIPTIONS);
-		createEAttribute(securityRoleRefEClass, SECURITY_ROLE_REF__ROLE_NAME);
-		createEAttribute(securityRoleRefEClass, SECURITY_ROLE_REF__ROLE_LINK);
-		createEAttribute(securityRoleRefEClass, SECURITY_ROLE_REF__ID);
-
-		serviceRefEClass = createEClass(SERVICE_REF);
-		createEReference(serviceRefEClass, SERVICE_REF__DESCRIPTIONS);
-		createEReference(serviceRefEClass, SERVICE_REF__DISPLAY_NAMES);
-		createEReference(serviceRefEClass, SERVICE_REF__ICONS);
-		createEAttribute(serviceRefEClass, SERVICE_REF__SERVICE_REF_NAME);
-		createEAttribute(serviceRefEClass, SERVICE_REF__SERVICE_INTERFACE);
-		createEAttribute(serviceRefEClass, SERVICE_REF__SERVICE_REF_TYPE);
-		createEAttribute(serviceRefEClass, SERVICE_REF__WSDL_FILE);
-		createEAttribute(serviceRefEClass, SERVICE_REF__JAXRPC_MAPPING_FILE);
-		createEAttribute(serviceRefEClass, SERVICE_REF__SERVICE_QNAME);
-		createEReference(serviceRefEClass, SERVICE_REF__PORT_COMPONENT_REFS);
-		createEReference(serviceRefEClass, SERVICE_REF__HANDLERS);
-		createEReference(serviceRefEClass, SERVICE_REF__HANDLER_CHAINS);
-		createEAttribute(serviceRefEClass, SERVICE_REF__MAPPED_NAME);
-		createEReference(serviceRefEClass, SERVICE_REF__INJECTION_TARGETS);
-		createEAttribute(serviceRefEClass, SERVICE_REF__ID);
-
-		serviceRefHandlerEClass = createEClass(SERVICE_REF_HANDLER);
-		createEReference(serviceRefHandlerEClass, SERVICE_REF_HANDLER__DESCRIPTIONS);
-		createEReference(serviceRefHandlerEClass, SERVICE_REF_HANDLER__DISPLAY_NAMES);
-		createEReference(serviceRefHandlerEClass, SERVICE_REF_HANDLER__ICONS);
-		createEAttribute(serviceRefHandlerEClass, SERVICE_REF_HANDLER__HANDLER_NAME);
-		createEAttribute(serviceRefHandlerEClass, SERVICE_REF_HANDLER__HANDLER_CLASS);
-		createEReference(serviceRefHandlerEClass, SERVICE_REF_HANDLER__INIT_PARAMS);
-		createEAttribute(serviceRefHandlerEClass, SERVICE_REF_HANDLER__SOAP_HEADERS);
-		createEAttribute(serviceRefHandlerEClass, SERVICE_REF_HANDLER__SOAP_ROLES);
-		createEAttribute(serviceRefHandlerEClass, SERVICE_REF_HANDLER__PORT_NAMES);
-		createEAttribute(serviceRefHandlerEClass, SERVICE_REF_HANDLER__ID);
-
-		serviceRefHandlerChainEClass = createEClass(SERVICE_REF_HANDLER_CHAIN);
-		createEAttribute(serviceRefHandlerChainEClass, SERVICE_REF_HANDLER_CHAIN__SERVICE_NAME_PATTERN);
-		createEAttribute(serviceRefHandlerChainEClass, SERVICE_REF_HANDLER_CHAIN__PORT_NAME_PATTERN);
-		createEAttribute(serviceRefHandlerChainEClass, SERVICE_REF_HANDLER_CHAIN__PROTOCOL_BINDINGS);
-		createEReference(serviceRefHandlerChainEClass, SERVICE_REF_HANDLER_CHAIN__HANDLERS);
-		createEAttribute(serviceRefHandlerChainEClass, SERVICE_REF_HANDLER_CHAIN__ID);
-
-		serviceRefHandlerChainsEClass = createEClass(SERVICE_REF_HANDLER_CHAINS);
-		createEReference(serviceRefHandlerChainsEClass, SERVICE_REF_HANDLER_CHAINS__HANDLER_CHAINS);
-		createEAttribute(serviceRefHandlerChainsEClass, SERVICE_REF_HANDLER_CHAINS__ID);
-
-		urlPatternTypeEClass = createEClass(URL_PATTERN_TYPE);
-		createEAttribute(urlPatternTypeEClass, URL_PATTERN_TYPE__VALUE);
-
-		// Create enums
-		ejbRefTypeEEnum = createEEnum(EJB_REF_TYPE);
-		envEntryTypeEEnum = createEEnum(ENV_ENTRY_TYPE);
-		messageDestinationUsageTypeEEnum = createEEnum(MESSAGE_DESTINATION_USAGE_TYPE);
-		persistenceContextTypeEEnum = createEEnum(PERSISTENCE_CONTEXT_TYPE);
-		resAuthTypeEEnum = createEEnum(RES_AUTH_TYPE);
-		resSharingScopeTypeEEnum = createEEnum(RES_SHARING_SCOPE_TYPE);
-
-		// Create data types
-		deweyVersionTypeEDataType = createEDataType(DEWEY_VERSION_TYPE);
-		ejbLinkEDataType = createEDataType(EJB_LINK);
-		ejbRefNameTypeEDataType = createEDataType(EJB_REF_NAME_TYPE);
-		ejbRefTypeObjectEDataType = createEDataType(EJB_REF_TYPE_OBJECT);
-		envEntryTypeObjectEDataType = createEDataType(ENV_ENTRY_TYPE_OBJECT);
-		fullyQualifiedClassTypeEDataType = createEDataType(FULLY_QUALIFIED_CLASS_TYPE);
-		homeEDataType = createEDataType(HOME);
-		javaIdentifierEDataType = createEDataType(JAVA_IDENTIFIER);
-		javaTypeEDataType = createEDataType(JAVA_TYPE);
-		jndiNameEDataType = createEDataType(JNDI_NAME);
-		localEDataType = createEDataType(LOCAL);
-		localHomeEDataType = createEDataType(LOCAL_HOME);
-		messageDestinationLinkEDataType = createEDataType(MESSAGE_DESTINATION_LINK);
-		messageDestinationTypeTypeEDataType = createEDataType(MESSAGE_DESTINATION_TYPE_TYPE);
-		messageDestinationUsageTypeObjectEDataType = createEDataType(MESSAGE_DESTINATION_USAGE_TYPE_OBJECT);
-		pathTypeEDataType = createEDataType(PATH_TYPE);
-		persistenceContextTypeObjectEDataType = createEDataType(PERSISTENCE_CONTEXT_TYPE_OBJECT);
-		remoteEDataType = createEDataType(REMOTE);
-		resAuthTypeObjectEDataType = createEDataType(RES_AUTH_TYPE_OBJECT);
-		resSharingScopeTypeObjectEDataType = createEDataType(RES_SHARING_SCOPE_TYPE_OBJECT);
-		roleNameEDataType = createEDataType(ROLE_NAME);
-		serviceRefProtocolBindingListTypeEDataType = createEDataType(SERVICE_REF_PROTOCOL_BINDING_LIST_TYPE);
-		serviceRefProtocolBindingTypeEDataType = createEDataType(SERVICE_REF_PROTOCOL_BINDING_TYPE);
-		serviceRefProtocolURIAliasTypeEDataType = createEDataType(SERVICE_REF_PROTOCOL_URI_ALIAS_TYPE);
-		serviceRefQnamePatternEDataType = createEDataType(SERVICE_REF_QNAME_PATTERN);
-		trueFalseTypeEDataType = createEDataType(TRUE_FALSE_TYPE);
-		trueFalseTypeObjectEDataType = createEDataType(TRUE_FALSE_TYPE_OBJECT);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @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.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		XMLTypePackage theXMLTypePackage = (XMLTypePackage)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI);
-		XMLNamespacePackage theXMLNamespacePackage = (XMLNamespacePackage)EPackage.Registry.INSTANCE.getEPackage(XMLNamespacePackage.eNS_URI);
-
-		// Add supertypes to classes
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(descriptionEClass, Description.class, "Description", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getDescription_Value(), theXMLTypePackage.getString(), "value", null, 0, 1, Description.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getDescription_Lang(), theXMLNamespacePackage.getLangType(), "lang", null, 0, 1, Description.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(displayNameEClass, DisplayName.class, "DisplayName", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getDisplayName_Value(), theXMLTypePackage.getString(), "value", null, 0, 1, DisplayName.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getDisplayName_Lang(), theXMLNamespacePackage.getLangType(), "lang", null, 0, 1, DisplayName.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(ejbLocalRefEClass, EjbLocalRef.class, "EjbLocalRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getEjbLocalRef_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, EjbLocalRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getEjbLocalRef_EjbRefName(), this.getEjbRefNameType(), "ejbRefName", null, 1, 1, EjbLocalRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getEjbLocalRef_EjbRefType(), this.getEjbRefType(), "ejbRefType", "Entity", 0, 1, EjbLocalRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getEjbLocalRef_LocalHome(), this.getLocalHome(), "localHome", null, 0, 1, EjbLocalRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getEjbLocalRef_Local(), this.getLocal(), "local", null, 0, 1, EjbLocalRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getEjbLocalRef_EjbLink(), this.getEJBLink(), "ejbLink", null, 0, 1, EjbLocalRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getEjbLocalRef_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, EjbLocalRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getEjbLocalRef_InjectionTargets(), this.getInjectionTarget(), null, "injectionTargets", null, 0, -1, EjbLocalRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getEjbLocalRef_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, EjbLocalRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(ejbRefEClass, EjbRef.class, "EjbRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getEjbRef_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, EjbRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getEjbRef_EjbRefName(), this.getEjbRefNameType(), "ejbRefName", null, 1, 1, EjbRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getEjbRef_EjbRefType(), this.getEjbRefType(), "ejbRefType", "Entity", 0, 1, EjbRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getEjbRef_Home(), this.getHome(), "home", null, 0, 1, EjbRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getEjbRef_Remote(), this.getRemote(), "remote", null, 0, 1, EjbRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getEjbRef_EjbLink(), this.getEJBLink(), "ejbLink", null, 0, 1, EjbRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getEjbRef_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, EjbRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getEjbRef_InjectionTargets(), this.getInjectionTarget(), null, "injectionTargets", null, 0, -1, EjbRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getEjbRef_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, EjbRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(emptyTypeEClass, EmptyType.class, "EmptyType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getEmptyType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, EmptyType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(envEntryEClass, EnvEntry.class, "EnvEntry", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getEnvEntry_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, EnvEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getEnvEntry_EnvEntryName(), this.getJNDIName(), "envEntryName", null, 1, 1, EnvEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getEnvEntry_EnvEntryType(), this.getEnvEntryType(), "envEntryType", "java.lang.Boolean", 0, 1, EnvEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getEnvEntry_EnvEntryValue(), theXMLTypePackage.getString(), "envEntryValue", null, 0, 1, EnvEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getEnvEntry_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, EnvEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getEnvEntry_InjectionTargets(), this.getInjectionTarget(), null, "injectionTargets", null, 0, -1, EnvEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getEnvEntry_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, EnvEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(iconEClass, Icon.class, "Icon", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getIcon_SmallIcon(), this.getPathType(), "smallIcon", null, 0, 1, Icon.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getIcon_LargeIcon(), this.getPathType(), "largeIcon", null, 0, 1, Icon.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getIcon_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, Icon.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getIcon_Lang(), theXMLNamespacePackage.getLangType(), "lang", null, 0, 1, Icon.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(injectionTargetEClass, InjectionTarget.class, "InjectionTarget", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getInjectionTarget_InjectionTargetClass(), this.getFullyQualifiedClassType(), "injectionTargetClass", null, 1, 1, InjectionTarget.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getInjectionTarget_InjectionTargetName(), this.getJavaIdentifier(), "injectionTargetName", null, 1, 1, InjectionTarget.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(lifecycleCallbackEClass, LifecycleCallback.class, "LifecycleCallback", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getLifecycleCallback_LifecycleCallbackClass(), this.getFullyQualifiedClassType(), "lifecycleCallbackClass", null, 0, 1, LifecycleCallback.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getLifecycleCallback_LifecycleCallbackMethod(), this.getJavaIdentifier(), "lifecycleCallbackMethod", null, 1, 1, LifecycleCallback.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(listenerEClass, Listener.class, "Listener", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getListener_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, Listener.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getListener_DisplayNames(), this.getDisplayName(), null, "displayNames", null, 0, -1, Listener.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getListener_Icons(), this.getIcon(), null, "icons", null, 0, -1, Listener.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getListener_ListenerClass(), this.getFullyQualifiedClassType(), "listenerClass", null, 1, 1, Listener.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getListener_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, Listener.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(messageDestinationEClass, MessageDestination.class, "MessageDestination", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getMessageDestination_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, MessageDestination.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getMessageDestination_DisplayNames(), this.getDisplayName(), null, "displayNames", null, 0, -1, MessageDestination.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getMessageDestination_Icons(), this.getIcon(), null, "icons", null, 0, -1, MessageDestination.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getMessageDestination_MessageDestinationName(), theXMLTypePackage.getToken(), "messageDestinationName", null, 1, 1, MessageDestination.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getMessageDestination_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, MessageDestination.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getMessageDestination_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, MessageDestination.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(messageDestinationRefEClass, MessageDestinationRef.class, "MessageDestinationRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getMessageDestinationRef_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, MessageDestinationRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getMessageDestinationRef_MessageDestinationRefName(), this.getJNDIName(), "messageDestinationRefName", null, 1, 1, MessageDestinationRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getMessageDestinationRef_MessageDestinationType(), this.getMessageDestinationTypeType(), "messageDestinationType", null, 0, 1, MessageDestinationRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getMessageDestinationRef_MessageDestinationUsage(), this.getMessageDestinationUsageType(), "messageDestinationUsage", "Consumes", 0, 1, MessageDestinationRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getMessageDestinationRef_MessageDestinationLink(), this.getMessageDestinationLink(), "messageDestinationLink", null, 0, 1, MessageDestinationRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getMessageDestinationRef_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, MessageDestinationRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getMessageDestinationRef_InjectionTargets(), this.getInjectionTarget(), null, "injectionTargets", null, 0, -1, MessageDestinationRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getMessageDestinationRef_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, MessageDestinationRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(paramValueEClass, ParamValue.class, "ParamValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getParamValue_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, ParamValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getParamValue_ParamName(), theXMLTypePackage.getToken(), "paramName", null, 1, 1, ParamValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getParamValue_ParamValue(), theXMLTypePackage.getString(), "paramValue", null, 1, 1, ParamValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getParamValue_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ParamValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(persistenceContextRefEClass, PersistenceContextRef.class, "PersistenceContextRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getPersistenceContextRef_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, PersistenceContextRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getPersistenceContextRef_PersistenceContextRefName(), this.getJNDIName(), "persistenceContextRefName", null, 1, 1, PersistenceContextRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getPersistenceContextRef_PersistenceUnitName(), theXMLTypePackage.getToken(), "persistenceUnitName", null, 0, 1, PersistenceContextRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getPersistenceContextRef_PersistenceContextType(), this.getPersistenceContextType(), "persistenceContextType", "Transaction", 0, 1, PersistenceContextRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEReference(getPersistenceContextRef_PersistenceProperties(), this.getPropertyType(), null, "persistenceProperties", null, 0, -1, PersistenceContextRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getPersistenceContextRef_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, PersistenceContextRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getPersistenceContextRef_InjectionTargets(), this.getInjectionTarget(), null, "injectionTargets", null, 0, -1, PersistenceContextRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getPersistenceContextRef_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, PersistenceContextRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(persistenceUnitRefEClass, PersistenceUnitRef.class, "PersistenceUnitRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getPersistenceUnitRef_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, PersistenceUnitRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getPersistenceUnitRef_PersistenceUnitRefName(), this.getJNDIName(), "persistenceUnitRefName", null, 1, 1, PersistenceUnitRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getPersistenceUnitRef_PersistenceUnitName(), theXMLTypePackage.getToken(), "persistenceUnitName", null, 0, 1, PersistenceUnitRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getPersistenceUnitRef_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, PersistenceUnitRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getPersistenceUnitRef_InjectionTargets(), this.getInjectionTarget(), null, "injectionTargets", null, 0, -1, PersistenceUnitRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getPersistenceUnitRef_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, PersistenceUnitRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(portComponentRefEClass, PortComponentRef.class, "PortComponentRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getPortComponentRef_ServiceEndpointInterface(), this.getFullyQualifiedClassType(), "serviceEndpointInterface", null, 1, 1, PortComponentRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getPortComponentRef_EnableMtom(), this.getTrueFalseType(), "enableMtom", null, 0, 1, PortComponentRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getPortComponentRef_PortComponentLink(), theXMLTypePackage.getToken(), "portComponentLink", null, 0, 1, PortComponentRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getPortComponentRef_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, PortComponentRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(propertyTypeEClass, PropertyType.class, "PropertyType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getPropertyType_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, PropertyType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getPropertyType_Value(), theXMLTypePackage.getString(), "value", null, 1, 1, PropertyType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getPropertyType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, PropertyType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(resourceEnvRefEClass, ResourceEnvRef.class, "ResourceEnvRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getResourceEnvRef_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, ResourceEnvRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getResourceEnvRef_ResourceEnvRefName(), this.getJNDIName(), "resourceEnvRefName", null, 1, 1, ResourceEnvRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getResourceEnvRef_ResourceEnvRefType(), this.getFullyQualifiedClassType(), "resourceEnvRefType", null, 0, 1, ResourceEnvRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getResourceEnvRef_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, ResourceEnvRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getResourceEnvRef_InjectionTargets(), this.getInjectionTarget(), null, "injectionTargets", null, 0, -1, ResourceEnvRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getResourceEnvRef_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ResourceEnvRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(resourceRefEClass, ResourceRef.class, "ResourceRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getResourceRef_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, ResourceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getResourceRef_ResRefName(), this.getJNDIName(), "resRefName", null, 1, 1, ResourceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getResourceRef_ResType(), this.getFullyQualifiedClassType(), "resType", null, 0, 1, ResourceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getResourceRef_ResAuth(), this.getResAuthType(), "resAuth", "Application", 0, 1, ResourceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getResourceRef_ResSharingScope(), this.getResSharingScopeType(), "resSharingScope", "Shareable", 0, 1, ResourceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getResourceRef_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, ResourceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getResourceRef_InjectionTargets(), this.getInjectionTarget(), null, "injectionTargets", null, 0, -1, ResourceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getResourceRef_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ResourceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(runAsEClass, RunAs.class, "RunAs", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getRunAs_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, RunAs.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getRunAs_RoleName(), this.getRoleName(), "roleName", null, 1, 1, RunAs.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getRunAs_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, RunAs.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(securityRoleEClass, SecurityRole.class, "SecurityRole", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getSecurityRole_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, SecurityRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getSecurityRole_RoleName(), this.getRoleName(), "roleName", null, 1, 1, SecurityRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getSecurityRole_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, SecurityRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(securityRoleRefEClass, SecurityRoleRef.class, "SecurityRoleRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getSecurityRoleRef_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, SecurityRoleRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getSecurityRoleRef_RoleName(), this.getRoleName(), "roleName", null, 1, 1, SecurityRoleRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getSecurityRoleRef_RoleLink(), this.getRoleName(), "roleLink", null, 0, 1, SecurityRoleRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getSecurityRoleRef_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, SecurityRoleRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(serviceRefEClass, ServiceRef.class, "ServiceRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getServiceRef_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getServiceRef_DisplayNames(), this.getDisplayName(), null, "displayNames", null, 0, -1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getServiceRef_Icons(), this.getIcon(), null, "icons", null, 0, -1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getServiceRef_ServiceRefName(), this.getJNDIName(), "serviceRefName", null, 1, 1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getServiceRef_ServiceInterface(), this.getFullyQualifiedClassType(), "serviceInterface", null, 1, 1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getServiceRef_ServiceRefType(), this.getFullyQualifiedClassType(), "serviceRefType", null, 0, 1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getServiceRef_WsdlFile(), theXMLTypePackage.getAnyURI(), "wsdlFile", null, 0, 1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getServiceRef_JaxrpcMappingFile(), this.getPathType(), "jaxrpcMappingFile", null, 0, 1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getServiceRef_ServiceQname(), theXMLTypePackage.getQName(), "serviceQname", null, 0, 1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getServiceRef_PortComponentRefs(), this.getPortComponentRef(), null, "portComponentRefs", null, 0, -1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getServiceRef_Handlers(), this.getServiceRefHandler(), null, "handlers", null, 0, -1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getServiceRef_HandlerChains(), this.getServiceRefHandlerChains(), null, "handlerChains", null, 0, 1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getServiceRef_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getServiceRef_InjectionTargets(), this.getInjectionTarget(), null, "injectionTargets", null, 0, -1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getServiceRef_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(serviceRefHandlerEClass, ServiceRefHandler.class, "ServiceRefHandler", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getServiceRefHandler_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, ServiceRefHandler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getServiceRefHandler_DisplayNames(), this.getDisplayName(), null, "displayNames", null, 0, -1, ServiceRefHandler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getServiceRefHandler_Icons(), this.getIcon(), null, "icons", null, 0, -1, ServiceRefHandler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getServiceRefHandler_HandlerName(), theXMLTypePackage.getToken(), "handlerName", null, 1, 1, ServiceRefHandler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getServiceRefHandler_HandlerClass(), this.getFullyQualifiedClassType(), "handlerClass", null, 1, 1, ServiceRefHandler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getServiceRefHandler_InitParams(), this.getParamValue(), null, "initParams", null, 0, -1, ServiceRefHandler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getServiceRefHandler_SoapHeaders(), theXMLTypePackage.getQName(), "soapHeaders", null, 0, -1, ServiceRefHandler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getServiceRefHandler_SoapRoles(), theXMLTypePackage.getToken(), "soapRoles", null, 0, -1, ServiceRefHandler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getServiceRefHandler_PortNames(), theXMLTypePackage.getToken(), "portNames", null, 0, -1, ServiceRefHandler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getServiceRefHandler_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ServiceRefHandler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(serviceRefHandlerChainEClass, ServiceRefHandlerChain.class, "ServiceRefHandlerChain", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getServiceRefHandlerChain_ServiceNamePattern(), this.getServiceRefQnamePattern(), "serviceNamePattern", null, 0, 1, ServiceRefHandlerChain.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getServiceRefHandlerChain_PortNamePattern(), this.getServiceRefQnamePattern(), "portNamePattern", null, 0, 1, ServiceRefHandlerChain.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getServiceRefHandlerChain_ProtocolBindings(), this.getServiceRefProtocolBindingListType(), "protocolBindings", null, 0, 1, ServiceRefHandlerChain.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getServiceRefHandlerChain_Handlers(), this.getServiceRefHandler(), null, "handlers", null, 1, -1, ServiceRefHandlerChain.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getServiceRefHandlerChain_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ServiceRefHandlerChain.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(serviceRefHandlerChainsEClass, ServiceRefHandlerChains.class, "ServiceRefHandlerChains", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getServiceRefHandlerChains_HandlerChains(), this.getServiceRefHandlerChain(), null, "handlerChains", null, 0, -1, ServiceRefHandlerChains.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getServiceRefHandlerChains_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ServiceRefHandlerChains.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(urlPatternTypeEClass, UrlPatternType.class, "UrlPatternType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getUrlPatternType_Value(), theXMLTypePackage.getString(), "value", null, 0, 1, UrlPatternType.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(ejbRefTypeEEnum, EjbRefType.class, "EjbRefType"); //$NON-NLS-1$
-		addEEnumLiteral(ejbRefTypeEEnum, EjbRefType.ENTITY_LITERAL);
-		addEEnumLiteral(ejbRefTypeEEnum, EjbRefType.SESSION_LITERAL);
-
-		initEEnum(envEntryTypeEEnum, EnvEntryType.class, "EnvEntryType"); //$NON-NLS-1$
-		addEEnumLiteral(envEntryTypeEEnum, EnvEntryType.JAVA_LANG_BOOLEAN_LITERAL);
-		addEEnumLiteral(envEntryTypeEEnum, EnvEntryType.JAVA_LANG_BYTE_LITERAL);
-		addEEnumLiteral(envEntryTypeEEnum, EnvEntryType.JAVA_LANG_CHARACTER_LITERAL);
-		addEEnumLiteral(envEntryTypeEEnum, EnvEntryType.JAVA_LANG_STRING_LITERAL);
-		addEEnumLiteral(envEntryTypeEEnum, EnvEntryType.JAVA_LANG_SHORT_LITERAL);
-		addEEnumLiteral(envEntryTypeEEnum, EnvEntryType.JAVA_LANG_INTEGER_LITERAL);
-		addEEnumLiteral(envEntryTypeEEnum, EnvEntryType.JAVA_LANG_LONG_LITERAL);
-		addEEnumLiteral(envEntryTypeEEnum, EnvEntryType.JAVA_LANG_FLOAT_LITERAL);
-		addEEnumLiteral(envEntryTypeEEnum, EnvEntryType.JAVA_LANG_DOUBLE_LITERAL);
-
-		initEEnum(messageDestinationUsageTypeEEnum, MessageDestinationUsageType.class, "MessageDestinationUsageType"); //$NON-NLS-1$
-		addEEnumLiteral(messageDestinationUsageTypeEEnum, MessageDestinationUsageType.CONSUMES_LITERAL);
-		addEEnumLiteral(messageDestinationUsageTypeEEnum, MessageDestinationUsageType.PRODUCES_LITERAL);
-		addEEnumLiteral(messageDestinationUsageTypeEEnum, MessageDestinationUsageType.CONSUMES_PRODUCES_LITERAL);
-
-		initEEnum(persistenceContextTypeEEnum, PersistenceContextType.class, "PersistenceContextType"); //$NON-NLS-1$
-		addEEnumLiteral(persistenceContextTypeEEnum, PersistenceContextType.TRANSACTION_LITERAL);
-		addEEnumLiteral(persistenceContextTypeEEnum, PersistenceContextType.EXTENDED_LITERAL);
-
-		initEEnum(resAuthTypeEEnum, ResAuthType.class, "ResAuthType"); //$NON-NLS-1$
-		addEEnumLiteral(resAuthTypeEEnum, ResAuthType.APPLICATION_LITERAL);
-		addEEnumLiteral(resAuthTypeEEnum, ResAuthType.CONTAINER_LITERAL);
-
-		initEEnum(resSharingScopeTypeEEnum, ResSharingScopeType.class, "ResSharingScopeType"); //$NON-NLS-1$
-		addEEnumLiteral(resSharingScopeTypeEEnum, ResSharingScopeType.SHAREABLE_LITERAL);
-		addEEnumLiteral(resSharingScopeTypeEEnum, ResSharingScopeType.UNSHAREABLE_LITERAL);
-
-		// Initialize data types
-		initEDataType(deweyVersionTypeEDataType, String.class, "DeweyVersionType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(ejbLinkEDataType, String.class, "EJBLink", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(ejbRefNameTypeEDataType, String.class, "EjbRefNameType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(ejbRefTypeObjectEDataType, EjbRefType.class, "EjbRefTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(envEntryTypeObjectEDataType, EnvEntryType.class, "EnvEntryTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(fullyQualifiedClassTypeEDataType, String.class, "FullyQualifiedClassType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(homeEDataType, String.class, "Home", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(javaIdentifierEDataType, String.class, "JavaIdentifier", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(javaTypeEDataType, String.class, "JavaType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(jndiNameEDataType, String.class, "JNDIName", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(localEDataType, String.class, "Local", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(localHomeEDataType, String.class, "LocalHome", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(messageDestinationLinkEDataType, String.class, "MessageDestinationLink", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(messageDestinationTypeTypeEDataType, String.class, "MessageDestinationTypeType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(messageDestinationUsageTypeObjectEDataType, MessageDestinationUsageType.class, "MessageDestinationUsageTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(pathTypeEDataType, String.class, "PathType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(persistenceContextTypeObjectEDataType, PersistenceContextType.class, "PersistenceContextTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(remoteEDataType, String.class, "Remote", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(resAuthTypeObjectEDataType, ResAuthType.class, "ResAuthTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(resSharingScopeTypeObjectEDataType, ResSharingScopeType.class, "ResSharingScopeTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(roleNameEDataType, String.class, "RoleName", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(serviceRefProtocolBindingListTypeEDataType, List.class, "ServiceRefProtocolBindingListType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(serviceRefProtocolBindingTypeEDataType, String.class, "ServiceRefProtocolBindingType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(serviceRefProtocolURIAliasTypeEDataType, String.class, "ServiceRefProtocolURIAliasType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(serviceRefQnamePatternEDataType, String.class, "ServiceRefQnamePattern", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(trueFalseTypeEDataType, boolean.class, "TrueFalseType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(trueFalseTypeObjectEDataType, Boolean.class, "TrueFalseTypeObject", 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 <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void createExtendedMetaDataAnnotations() {
-		String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$				
-		addAnnotation
-		  (descriptionEClass, 
-		   source, 
-		   new String[] {
-			 "name", "descriptionType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getDescription_Value(), 
-		   source, 
-		   new String[] {
-			 "name", ":0", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getDescription_Lang(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "lang", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "http://www.w3.org/XML/1998/namespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (deweyVersionTypeEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "dewey-versionType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#token", //$NON-NLS-1$ //$NON-NLS-2$
-			 "pattern", "\\.?[0-9]+(\\.[0-9]+)*" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (displayNameEClass, 
-		   source, 
-		   new String[] {
-			 "name", "display-nameType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getDisplayName_Value(), 
-		   source, 
-		   new String[] {
-			 "name", ":0", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getDisplayName_Lang(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "lang", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "http://www.w3.org/XML/1998/namespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (ejbLinkEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "ejb-linkType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (ejbLocalRefEClass, 
-		   source, 
-		   new String[] {
-			 "name", "ejb-local-refType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEjbLocalRef_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
-		  (getEjbLocalRef_EjbRefName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ejb-ref-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEjbLocalRef_EjbRefType(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ejb-ref-type", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEjbLocalRef_LocalHome(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "local-home", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEjbLocalRef_Local(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "local", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEjbLocalRef_EjbLink(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ejb-link", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getEjbLocalRef_MappedName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "mapped-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEjbLocalRef_InjectionTargets(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "injection-target", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEjbLocalRef_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (ejbRefEClass, 
-		   source, 
-		   new String[] {
-			 "name", "ejb-refType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEjbRef_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
-		  (getEjbRef_EjbRefName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ejb-ref-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEjbRef_EjbRefType(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ejb-ref-type", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEjbRef_Home(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "home", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEjbRef_Remote(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "remote", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEjbRef_EjbLink(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ejb-link", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getEjbRef_MappedName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "mapped-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEjbRef_InjectionTargets(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "injection-target", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEjbRef_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (ejbRefNameTypeEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "ejb-ref-nameType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (ejbRefTypeEEnum, 
-		   source, 
-		   new String[] {
-			 "name", "ejb-ref-typeType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (ejbRefTypeObjectEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "ejb-ref-typeType:Object", //$NON-NLS-1$ //$NON-NLS-2$
-			 "baseType", "ejb-ref-typeType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (emptyTypeEClass, 
-		   source, 
-		   new String[] {
-			 "name", "emptyType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "empty" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEmptyType_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (envEntryEClass, 
-		   source, 
-		   new String[] {
-			 "name", "env-entryType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEnvEntry_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
-		  (getEnvEntry_EnvEntryName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "env-entry-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getEnvEntry_EnvEntryType(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "env-entry-type", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getEnvEntry_EnvEntryValue(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "env-entry-value", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getEnvEntry_MappedName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "mapped-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEnvEntry_InjectionTargets(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "injection-target", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEnvEntry_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (envEntryTypeEEnum, 
-		   source, 
-		   new String[] {
-			 "name", "env-entry-type-valuesType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (envEntryTypeObjectEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "env-entry-type-valuesType:Object", //$NON-NLS-1$ //$NON-NLS-2$
-			 "baseType", "env-entry-type-valuesType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (fullyQualifiedClassTypeEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "fully-qualified-classType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (homeEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "homeType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (iconEClass, 
-		   source, 
-		   new String[] {
-			 "name", "iconType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getIcon_SmallIcon(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "small-icon", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getIcon_LargeIcon(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "large-icon", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getIcon_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getIcon_Lang(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "lang", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "http://www.w3.org/XML/1998/namespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (injectionTargetEClass, 
-		   source, 
-		   new String[] {
-			 "name", "injection-targetType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getInjectionTarget_InjectionTargetClass(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "injection-target-class", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getInjectionTarget_InjectionTargetName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "injection-target-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (javaIdentifierEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "java-identifierType", //$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{L}|\\p{Nd}|_|$)*" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (javaTypeEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "java-typeType", //$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
-		  (jndiNameEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "jndi-nameType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (lifecycleCallbackEClass, 
-		   source, 
-		   new String[] {
-			 "name", "lifecycle-callbackType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getLifecycleCallback_LifecycleCallbackClass(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "lifecycle-callback-class", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getLifecycleCallback_LifecycleCallbackMethod(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "lifecycle-callback-method", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (listenerEClass, 
-		   source, 
-		   new String[] {
-			 "name", "listenerType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getListener_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
-		  (getListener_DisplayNames(), 
-		   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$
-		   });		
-		addAnnotation
-		  (getListener_Icons(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "icon", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getListener_ListenerClass(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "listener-class", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getListener_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (localEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "localType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (localHomeEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "local-homeType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (messageDestinationEClass, 
-		   source, 
-		   new String[] {
-			 "name", "message-destinationType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getMessageDestination_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
-		  (getMessageDestination_DisplayNames(), 
-		   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$
-		   });		
-		addAnnotation
-		  (getMessageDestination_Icons(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "icon", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getMessageDestination_MessageDestinationName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "message-destination-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getMessageDestination_MappedName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "mapped-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getMessageDestination_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (messageDestinationLinkEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "message-destination-linkType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (messageDestinationRefEClass, 
-		   source, 
-		   new String[] {
-			 "name", "message-destination-refType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getMessageDestinationRef_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
-		  (getMessageDestinationRef_MessageDestinationRefName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "message-destination-ref-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getMessageDestinationRef_MessageDestinationType(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "message-destination-type", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getMessageDestinationRef_MessageDestinationUsage(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "message-destination-usage", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getMessageDestinationRef_MessageDestinationLink(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "message-destination-link", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getMessageDestinationRef_MappedName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "mapped-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getMessageDestinationRef_InjectionTargets(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "injection-target", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getMessageDestinationRef_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (messageDestinationTypeTypeEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "message-destination-typeType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (messageDestinationUsageTypeEEnum, 
-		   source, 
-		   new String[] {
-			 "name", "message-destination-usageType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (messageDestinationUsageTypeObjectEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "message-destination-usageType:Object", //$NON-NLS-1$ //$NON-NLS-2$
-			 "baseType", "message-destination-usageType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (paramValueEClass, 
-		   source, 
-		   new String[] {
-			 "name", "param-valueType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getParamValue_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
-		  (getParamValue_ParamName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "param-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getParamValue_ParamValue(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "param-value", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getParamValue_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (pathTypeEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "pathType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (persistenceContextRefEClass, 
-		   source, 
-		   new String[] {
-			 "name", "persistence-context-refType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getPersistenceContextRef_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
-		  (getPersistenceContextRef_PersistenceContextRefName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "persistence-context-ref-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getPersistenceContextRef_PersistenceUnitName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "persistence-unit-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getPersistenceContextRef_PersistenceContextType(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "persistence-context-type", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getPersistenceContextRef_PersistenceProperties(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "persistence-property", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getPersistenceContextRef_MappedName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "mapped-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getPersistenceContextRef_InjectionTargets(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "injection-target", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getPersistenceContextRef_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (persistenceContextTypeEEnum, 
-		   source, 
-		   new String[] {
-			 "name", "persistence-context-typeType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (persistenceContextTypeObjectEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "persistence-context-typeType:Object", //$NON-NLS-1$ //$NON-NLS-2$
-			 "baseType", "persistence-context-typeType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (persistenceUnitRefEClass, 
-		   source, 
-		   new String[] {
-			 "name", "persistence-unit-refType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getPersistenceUnitRef_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
-		  (getPersistenceUnitRef_PersistenceUnitRefName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "persistence-unit-ref-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getPersistenceUnitRef_PersistenceUnitName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "persistence-unit-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getPersistenceUnitRef_MappedName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "mapped-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getPersistenceUnitRef_InjectionTargets(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "injection-target", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getPersistenceUnitRef_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (portComponentRefEClass, 
-		   source, 
-		   new String[] {
-			 "name", "port-component-refType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getPortComponentRef_ServiceEndpointInterface(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "service-endpoint-interface", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getPortComponentRef_EnableMtom(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "enable-mtom", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getPortComponentRef_PortComponentLink(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "port-component-link", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getPortComponentRef_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (propertyTypeEClass, 
-		   source, 
-		   new String[] {
-			 "name", "propertyType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getPropertyType_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
-		  (getPropertyType_Value(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "value", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getPropertyType_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (remoteEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "remoteType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (resAuthTypeEEnum, 
-		   source, 
-		   new String[] {
-			 "name", "res-authType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (resAuthTypeObjectEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "res-authType:Object", //$NON-NLS-1$ //$NON-NLS-2$
-			 "baseType", "res-authType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (resourceEnvRefEClass, 
-		   source, 
-		   new String[] {
-			 "name", "resource-env-refType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getResourceEnvRef_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
-		  (getResourceEnvRef_ResourceEnvRefName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "resource-env-ref-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getResourceEnvRef_ResourceEnvRefType(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "resource-env-ref-type", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getResourceEnvRef_MappedName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "mapped-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getResourceEnvRef_InjectionTargets(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "injection-target", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getResourceEnvRef_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (resourceRefEClass, 
-		   source, 
-		   new String[] {
-			 "name", "resource-refType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getResourceRef_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
-		  (getResourceRef_ResRefName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "res-ref-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getResourceRef_ResType(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "res-type", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getResourceRef_ResAuth(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "res-auth", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getResourceRef_ResSharingScope(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "res-sharing-scope", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getResourceRef_MappedName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "mapped-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getResourceRef_InjectionTargets(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "injection-target", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getResourceRef_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (resSharingScopeTypeEEnum, 
-		   source, 
-		   new String[] {
-			 "name", "res-sharing-scopeType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (resSharingScopeTypeObjectEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "res-sharing-scopeType:Object", //$NON-NLS-1$ //$NON-NLS-2$
-			 "baseType", "res-sharing-scopeType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (roleNameEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "role-nameType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (runAsEClass, 
-		   source, 
-		   new String[] {
-			 "name", "run-asType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getRunAs_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
-		  (getRunAs_RoleName(), 
-		   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
-		  (getRunAs_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (securityRoleEClass, 
-		   source, 
-		   new String[] {
-			 "name", "security-roleType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getSecurityRole_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
-		  (getSecurityRole_RoleName(), 
-		   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
-		  (getSecurityRole_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (securityRoleRefEClass, 
-		   source, 
-		   new String[] {
-			 "name", "security-role-refType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getSecurityRoleRef_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
-		  (getSecurityRoleRef_RoleName(), 
-		   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
-		  (getSecurityRoleRef_RoleLink(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "role-link", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getSecurityRoleRef_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (serviceRefEClass, 
-		   source, 
-		   new String[] {
-			 "name", "service-refType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getServiceRef_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
-		  (getServiceRef_DisplayNames(), 
-		   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$
-		   });		
-		addAnnotation
-		  (getServiceRef_Icons(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "icon", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getServiceRef_ServiceRefName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "service-ref-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getServiceRef_ServiceInterface(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "service-interface", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getServiceRef_ServiceRefType(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "service-ref-type", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getServiceRef_WsdlFile(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "wsdl-file", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getServiceRef_JaxrpcMappingFile(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "jaxrpc-mapping-file", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getServiceRef_ServiceQname(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "service-qname", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getServiceRef_PortComponentRefs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "port-component-ref", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getServiceRef_Handlers(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "handler", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getServiceRef_HandlerChains(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "handler-chains", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getServiceRef_MappedName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "mapped-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getServiceRef_InjectionTargets(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "injection-target", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getServiceRef_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (serviceRefHandlerEClass, 
-		   source, 
-		   new String[] {
-			 "name", "service-ref_handlerType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getServiceRefHandler_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
-		  (getServiceRefHandler_DisplayNames(), 
-		   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$
-		   });		
-		addAnnotation
-		  (getServiceRefHandler_Icons(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "icon", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getServiceRefHandler_HandlerName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "handler-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getServiceRefHandler_HandlerClass(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "handler-class", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getServiceRefHandler_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
-		  (getServiceRefHandler_SoapHeaders(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "soap-header", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getServiceRefHandler_SoapRoles(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "soap-role", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getServiceRefHandler_PortNames(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "port-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getServiceRefHandler_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (serviceRefHandlerChainEClass, 
-		   source, 
-		   new String[] {
-			 "name", "service-ref_handler-chainType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getServiceRefHandlerChain_ServiceNamePattern(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "service-name-pattern", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getServiceRefHandlerChain_PortNamePattern(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "port-name-pattern", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getServiceRefHandlerChain_ProtocolBindings(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "protocol-bindings", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getServiceRefHandlerChain_Handlers(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "handler", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getServiceRefHandlerChain_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (serviceRefHandlerChainsEClass, 
-		   source, 
-		   new String[] {
-			 "name", "service-ref_handler-chainsType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getServiceRefHandlerChains_HandlerChains(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "handler-chain", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getServiceRefHandlerChains_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (serviceRefProtocolBindingListTypeEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "service-ref_protocol-bindingListType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "itemType", "service-ref_protocol-bindingType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (serviceRefProtocolBindingTypeEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "service-ref_protocol-bindingType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "memberTypes", "http://www.eclipse.org/emf/2003/XMLType#anyURI service-ref_protocol-URIAliasType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (serviceRefProtocolURIAliasTypeEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "service-ref_protocol-URIAliasType", //$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
-		  (serviceRefQnamePatternEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "service-ref_qname-pattern", //$NON-NLS-1$ //$NON-NLS-2$
-			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#token", //$NON-NLS-1$ //$NON-NLS-2$
-			 "pattern", "\\*|([\\i-[:]][\\c-[:]]*:)?[\\i-[:]][\\c-[:]]*\\*?" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (trueFalseTypeEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "true-falseType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#boolean", //$NON-NLS-1$ //$NON-NLS-2$
-			 "pattern", "(true|false)" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (trueFalseTypeObjectEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "true-falseType:Object", //$NON-NLS-1$ //$NON-NLS-2$
-			 "baseType", "true-falseType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (urlPatternTypeEClass, 
-		   source, 
-		   new String[] {
-			 "name", "url-patternType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getUrlPatternType_Value(), 
-		   source, 
-		   new String[] {
-			 "name", ":0", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
-		   });
-	}
-
-} //JavaeePackageImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/LifecycleCallbackImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/LifecycleCallbackImpl.java
deleted file mode 100644
index 08f66c556..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/LifecycleCallbackImpl.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core.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.core.LifecycleCallback;
-
-import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Lifecycle Callback</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.LifecycleCallbackImpl#getLifecycleCallbackClass <em>Lifecycle Callback Class</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.LifecycleCallbackImpl#getLifecycleCallbackMethod <em>Lifecycle Callback Method</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class LifecycleCallbackImpl extends EObjectImpl implements LifecycleCallback {
-	/**
-	 * The default value of the '{@link #getLifecycleCallbackClass() <em>Lifecycle Callback Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLifecycleCallbackClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LIFECYCLE_CALLBACK_CLASS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLifecycleCallbackClass() <em>Lifecycle Callback Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLifecycleCallbackClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected String lifecycleCallbackClass = LIFECYCLE_CALLBACK_CLASS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLifecycleCallbackMethod() <em>Lifecycle Callback Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLifecycleCallbackMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LIFECYCLE_CALLBACK_METHOD_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLifecycleCallbackMethod() <em>Lifecycle Callback Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLifecycleCallbackMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected String lifecycleCallbackMethod = LIFECYCLE_CALLBACK_METHOD_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LifecycleCallbackImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JavaeePackage.Literals.LIFECYCLE_CALLBACK;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLifecycleCallbackClass() {
-		return lifecycleCallbackClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLifecycleCallbackClass(String newLifecycleCallbackClass) {
-		String oldLifecycleCallbackClass = lifecycleCallbackClass;
-		lifecycleCallbackClass = newLifecycleCallbackClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.LIFECYCLE_CALLBACK__LIFECYCLE_CALLBACK_CLASS, oldLifecycleCallbackClass, lifecycleCallbackClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLifecycleCallbackMethod() {
-		return lifecycleCallbackMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLifecycleCallbackMethod(String newLifecycleCallbackMethod) {
-		String oldLifecycleCallbackMethod = lifecycleCallbackMethod;
-		lifecycleCallbackMethod = newLifecycleCallbackMethod;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.LIFECYCLE_CALLBACK__LIFECYCLE_CALLBACK_METHOD, oldLifecycleCallbackMethod, lifecycleCallbackMethod));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JavaeePackage.LIFECYCLE_CALLBACK__LIFECYCLE_CALLBACK_CLASS:
-				return getLifecycleCallbackClass();
-			case JavaeePackage.LIFECYCLE_CALLBACK__LIFECYCLE_CALLBACK_METHOD:
-				return getLifecycleCallbackMethod();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JavaeePackage.LIFECYCLE_CALLBACK__LIFECYCLE_CALLBACK_CLASS:
-				setLifecycleCallbackClass((String)newValue);
-				return;
-			case JavaeePackage.LIFECYCLE_CALLBACK__LIFECYCLE_CALLBACK_METHOD:
-				setLifecycleCallbackMethod((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.LIFECYCLE_CALLBACK__LIFECYCLE_CALLBACK_CLASS:
-				setLifecycleCallbackClass(LIFECYCLE_CALLBACK_CLASS_EDEFAULT);
-				return;
-			case JavaeePackage.LIFECYCLE_CALLBACK__LIFECYCLE_CALLBACK_METHOD:
-				setLifecycleCallbackMethod(LIFECYCLE_CALLBACK_METHOD_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.LIFECYCLE_CALLBACK__LIFECYCLE_CALLBACK_CLASS:
-				return LIFECYCLE_CALLBACK_CLASS_EDEFAULT == null ? lifecycleCallbackClass != null : !LIFECYCLE_CALLBACK_CLASS_EDEFAULT.equals(lifecycleCallbackClass);
-			case JavaeePackage.LIFECYCLE_CALLBACK__LIFECYCLE_CALLBACK_METHOD:
-				return LIFECYCLE_CALLBACK_METHOD_EDEFAULT == null ? lifecycleCallbackMethod != null : !LIFECYCLE_CALLBACK_METHOD_EDEFAULT.equals(lifecycleCallbackMethod);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (lifecycleCallbackClass: "); //$NON-NLS-1$
-		result.append(lifecycleCallbackClass);
-		result.append(", lifecycleCallbackMethod: "); //$NON-NLS-1$
-		result.append(lifecycleCallbackMethod);
-		result.append(')');
-		return result.toString();
-	}
-
-} //LifecycleCallbackImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/ListenerImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/ListenerImpl.java
deleted file mode 100644
index 579fb0698..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/ListenerImpl.java
+++ /dev/null
@@ -1,352 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core.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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-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.Listener;
-
-import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Listener</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ListenerImpl#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ListenerImpl#getDisplayNames <em>Display Names</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ListenerImpl#getIcons <em>Icons</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ListenerImpl#getListenerClass <em>Listener Class</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ListenerImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ListenerImpl extends EObjectImpl implements Listener {
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayNames() <em>Display Names</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayNames()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList displayNames = null;
-
-	/**
-	 * The cached value of the '{@link #getIcons() <em>Icons</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIcons()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList icons = null;
-
-	/**
-	 * The default value of the '{@link #getListenerClass() <em>Listener Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getListenerClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LISTENER_CLASS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getListenerClass() <em>Listener Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getListenerClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected String listenerClass = LISTENER_CLASS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ListenerImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JavaeePackage.Literals.LISTENER;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, JavaeePackage.LISTENER__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDisplayNames() {
-		if (displayNames == null) {
-			displayNames = new EObjectContainmentEList(DisplayName.class, this, JavaeePackage.LISTENER__DISPLAY_NAMES);
-		}
-		return displayNames;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getIcons() {
-		if (icons == null) {
-			icons = new EObjectContainmentEList(Icon.class, this, JavaeePackage.LISTENER__ICONS);
-		}
-		return icons;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getListenerClass() {
-		return listenerClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setListenerClass(String newListenerClass) {
-		String oldListenerClass = listenerClass;
-		listenerClass = newListenerClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.LISTENER__LISTENER_CLASS, oldListenerClass, listenerClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.LISTENER__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JavaeePackage.LISTENER__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-			case JavaeePackage.LISTENER__DISPLAY_NAMES:
-				return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
-			case JavaeePackage.LISTENER__ICONS:
-				return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JavaeePackage.LISTENER__DESCRIPTIONS:
-				return getDescriptions();
-			case JavaeePackage.LISTENER__DISPLAY_NAMES:
-				return getDisplayNames();
-			case JavaeePackage.LISTENER__ICONS:
-				return getIcons();
-			case JavaeePackage.LISTENER__LISTENER_CLASS:
-				return getListenerClass();
-			case JavaeePackage.LISTENER__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JavaeePackage.LISTENER__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case JavaeePackage.LISTENER__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				getDisplayNames().addAll((Collection)newValue);
-				return;
-			case JavaeePackage.LISTENER__ICONS:
-				getIcons().clear();
-				getIcons().addAll((Collection)newValue);
-				return;
-			case JavaeePackage.LISTENER__LISTENER_CLASS:
-				setListenerClass((String)newValue);
-				return;
-			case JavaeePackage.LISTENER__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.LISTENER__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case JavaeePackage.LISTENER__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				return;
-			case JavaeePackage.LISTENER__ICONS:
-				getIcons().clear();
-				return;
-			case JavaeePackage.LISTENER__LISTENER_CLASS:
-				setListenerClass(LISTENER_CLASS_EDEFAULT);
-				return;
-			case JavaeePackage.LISTENER__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.LISTENER__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case JavaeePackage.LISTENER__DISPLAY_NAMES:
-				return displayNames != null && !displayNames.isEmpty();
-			case JavaeePackage.LISTENER__ICONS:
-				return icons != null && !icons.isEmpty();
-			case JavaeePackage.LISTENER__LISTENER_CLASS:
-				return LISTENER_CLASS_EDEFAULT == null ? listenerClass != null : !LISTENER_CLASS_EDEFAULT.equals(listenerClass);
-			case JavaeePackage.LISTENER__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (listenerClass: "); //$NON-NLS-1$
-		result.append(listenerClass);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ListenerImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/MessageDestinationImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/MessageDestinationImpl.java
deleted file mode 100644
index 2c4b2f67f..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/MessageDestinationImpl.java
+++ /dev/null
@@ -1,406 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core.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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-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.MessageDestination;
-
-import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Message Destination</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.MessageDestinationImpl#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.MessageDestinationImpl#getDisplayNames <em>Display Names</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.MessageDestinationImpl#getIcons <em>Icons</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.MessageDestinationImpl#getMessageDestinationName <em>Message Destination Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.MessageDestinationImpl#getMappedName <em>Mapped Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.MessageDestinationImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MessageDestinationImpl extends EObjectImpl implements MessageDestination {
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayNames() <em>Display Names</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayNames()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList displayNames = null;
-
-	/**
-	 * The cached value of the '{@link #getIcons() <em>Icons</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIcons()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList icons = null;
-
-	/**
-	 * The default value of the '{@link #getMessageDestinationName() <em>Message Destination Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessageDestinationName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MESSAGE_DESTINATION_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMessageDestinationName() <em>Message Destination Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessageDestinationName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String messageDestinationName = MESSAGE_DESTINATION_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getMappedName() <em>Mapped Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMappedName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MAPPED_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMappedName() <em>Mapped Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMappedName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String mappedName = MAPPED_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MessageDestinationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JavaeePackage.Literals.MESSAGE_DESTINATION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, JavaeePackage.MESSAGE_DESTINATION__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDisplayNames() {
-		if (displayNames == null) {
-			displayNames = new EObjectContainmentEList(DisplayName.class, this, JavaeePackage.MESSAGE_DESTINATION__DISPLAY_NAMES);
-		}
-		return displayNames;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getIcons() {
-		if (icons == null) {
-			icons = new EObjectContainmentEList(Icon.class, this, JavaeePackage.MESSAGE_DESTINATION__ICONS);
-		}
-		return icons;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getMessageDestinationName() {
-		return messageDestinationName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMessageDestinationName(String newMessageDestinationName) {
-		String oldMessageDestinationName = messageDestinationName;
-		messageDestinationName = newMessageDestinationName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.MESSAGE_DESTINATION__MESSAGE_DESTINATION_NAME, oldMessageDestinationName, messageDestinationName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getMappedName() {
-		return mappedName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMappedName(String newMappedName) {
-		String oldMappedName = mappedName;
-		mappedName = newMappedName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.MESSAGE_DESTINATION__MAPPED_NAME, oldMappedName, mappedName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.MESSAGE_DESTINATION__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JavaeePackage.MESSAGE_DESTINATION__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-			case JavaeePackage.MESSAGE_DESTINATION__DISPLAY_NAMES:
-				return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
-			case JavaeePackage.MESSAGE_DESTINATION__ICONS:
-				return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JavaeePackage.MESSAGE_DESTINATION__DESCRIPTIONS:
-				return getDescriptions();
-			case JavaeePackage.MESSAGE_DESTINATION__DISPLAY_NAMES:
-				return getDisplayNames();
-			case JavaeePackage.MESSAGE_DESTINATION__ICONS:
-				return getIcons();
-			case JavaeePackage.MESSAGE_DESTINATION__MESSAGE_DESTINATION_NAME:
-				return getMessageDestinationName();
-			case JavaeePackage.MESSAGE_DESTINATION__MAPPED_NAME:
-				return getMappedName();
-			case JavaeePackage.MESSAGE_DESTINATION__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JavaeePackage.MESSAGE_DESTINATION__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case JavaeePackage.MESSAGE_DESTINATION__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				getDisplayNames().addAll((Collection)newValue);
-				return;
-			case JavaeePackage.MESSAGE_DESTINATION__ICONS:
-				getIcons().clear();
-				getIcons().addAll((Collection)newValue);
-				return;
-			case JavaeePackage.MESSAGE_DESTINATION__MESSAGE_DESTINATION_NAME:
-				setMessageDestinationName((String)newValue);
-				return;
-			case JavaeePackage.MESSAGE_DESTINATION__MAPPED_NAME:
-				setMappedName((String)newValue);
-				return;
-			case JavaeePackage.MESSAGE_DESTINATION__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.MESSAGE_DESTINATION__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case JavaeePackage.MESSAGE_DESTINATION__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				return;
-			case JavaeePackage.MESSAGE_DESTINATION__ICONS:
-				getIcons().clear();
-				return;
-			case JavaeePackage.MESSAGE_DESTINATION__MESSAGE_DESTINATION_NAME:
-				setMessageDestinationName(MESSAGE_DESTINATION_NAME_EDEFAULT);
-				return;
-			case JavaeePackage.MESSAGE_DESTINATION__MAPPED_NAME:
-				setMappedName(MAPPED_NAME_EDEFAULT);
-				return;
-			case JavaeePackage.MESSAGE_DESTINATION__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.MESSAGE_DESTINATION__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case JavaeePackage.MESSAGE_DESTINATION__DISPLAY_NAMES:
-				return displayNames != null && !displayNames.isEmpty();
-			case JavaeePackage.MESSAGE_DESTINATION__ICONS:
-				return icons != null && !icons.isEmpty();
-			case JavaeePackage.MESSAGE_DESTINATION__MESSAGE_DESTINATION_NAME:
-				return MESSAGE_DESTINATION_NAME_EDEFAULT == null ? messageDestinationName != null : !MESSAGE_DESTINATION_NAME_EDEFAULT.equals(messageDestinationName);
-			case JavaeePackage.MESSAGE_DESTINATION__MAPPED_NAME:
-				return MAPPED_NAME_EDEFAULT == null ? mappedName != null : !MAPPED_NAME_EDEFAULT.equals(mappedName);
-			case JavaeePackage.MESSAGE_DESTINATION__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (messageDestinationName: "); //$NON-NLS-1$
-		result.append(messageDestinationName);
-		result.append(", mappedName: "); //$NON-NLS-1$
-		result.append(mappedName);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //MessageDestinationImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/MessageDestinationRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/MessageDestinationRefImpl.java
deleted file mode 100644
index 917554edb..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/MessageDestinationRefImpl.java
+++ /dev/null
@@ -1,566 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core.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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jst.javaee.core.Description;
-import org.eclipse.jst.javaee.core.InjectionTarget;
-import org.eclipse.jst.javaee.core.MessageDestinationRef;
-import org.eclipse.jst.javaee.core.MessageDestinationUsageType;
-
-import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Message Destination Ref</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.MessageDestinationRefImpl#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.MessageDestinationRefImpl#getMessageDestinationRefName <em>Message Destination Ref Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.MessageDestinationRefImpl#getMessageDestinationType <em>Message Destination Type</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.MessageDestinationRefImpl#getMessageDestinationUsage <em>Message Destination Usage</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.MessageDestinationRefImpl#getMessageDestinationLink <em>Message Destination Link</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.MessageDestinationRefImpl#getMappedName <em>Mapped Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.MessageDestinationRefImpl#getInjectionTargets <em>Injection Targets</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.MessageDestinationRefImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MessageDestinationRefImpl extends EObjectImpl implements MessageDestinationRef {
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The default value of the '{@link #getMessageDestinationRefName() <em>Message Destination Ref Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessageDestinationRefName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MESSAGE_DESTINATION_REF_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMessageDestinationRefName() <em>Message Destination Ref Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessageDestinationRefName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String messageDestinationRefName = MESSAGE_DESTINATION_REF_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getMessageDestinationType() <em>Message Destination Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessageDestinationType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MESSAGE_DESTINATION_TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMessageDestinationType() <em>Message Destination Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessageDestinationType()
-	 * @generated
-	 * @ordered
-	 */
-	protected String messageDestinationType = MESSAGE_DESTINATION_TYPE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getMessageDestinationUsage() <em>Message Destination Usage</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessageDestinationUsage()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final MessageDestinationUsageType MESSAGE_DESTINATION_USAGE_EDEFAULT = MessageDestinationUsageType.CONSUMES_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getMessageDestinationUsage() <em>Message Destination Usage</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessageDestinationUsage()
-	 * @generated
-	 * @ordered
-	 */
-	protected MessageDestinationUsageType messageDestinationUsage = MESSAGE_DESTINATION_USAGE_EDEFAULT;
-
-	/**
-	 * This is true if the Message Destination Usage attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean messageDestinationUsageESet = false;
-
-	/**
-	 * The default value of the '{@link #getMessageDestinationLink() <em>Message Destination Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessageDestinationLink()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MESSAGE_DESTINATION_LINK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMessageDestinationLink() <em>Message Destination Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessageDestinationLink()
-	 * @generated
-	 * @ordered
-	 */
-	protected String messageDestinationLink = MESSAGE_DESTINATION_LINK_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getMappedName() <em>Mapped Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMappedName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MAPPED_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMappedName() <em>Mapped Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMappedName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String mappedName = MAPPED_NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getInjectionTargets() <em>Injection Targets</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInjectionTargets()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList injectionTargets = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MessageDestinationRefImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JavaeePackage.Literals.MESSAGE_DESTINATION_REF;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, JavaeePackage.MESSAGE_DESTINATION_REF__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getMessageDestinationRefName() {
-		return messageDestinationRefName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMessageDestinationRefName(String newMessageDestinationRefName) {
-		String oldMessageDestinationRefName = messageDestinationRefName;
-		messageDestinationRefName = newMessageDestinationRefName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.MESSAGE_DESTINATION_REF__MESSAGE_DESTINATION_REF_NAME, oldMessageDestinationRefName, messageDestinationRefName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getMessageDestinationType() {
-		return messageDestinationType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMessageDestinationType(String newMessageDestinationType) {
-		String oldMessageDestinationType = messageDestinationType;
-		messageDestinationType = newMessageDestinationType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.MESSAGE_DESTINATION_REF__MESSAGE_DESTINATION_TYPE, oldMessageDestinationType, messageDestinationType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MessageDestinationUsageType getMessageDestinationUsage() {
-		return messageDestinationUsage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMessageDestinationUsage(MessageDestinationUsageType newMessageDestinationUsage) {
-		MessageDestinationUsageType oldMessageDestinationUsage = messageDestinationUsage;
-		messageDestinationUsage = newMessageDestinationUsage == null ? MESSAGE_DESTINATION_USAGE_EDEFAULT : newMessageDestinationUsage;
-		boolean oldMessageDestinationUsageESet = messageDestinationUsageESet;
-		messageDestinationUsageESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.MESSAGE_DESTINATION_REF__MESSAGE_DESTINATION_USAGE, oldMessageDestinationUsage, messageDestinationUsage, !oldMessageDestinationUsageESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetMessageDestinationUsage() {
-		MessageDestinationUsageType oldMessageDestinationUsage = messageDestinationUsage;
-		boolean oldMessageDestinationUsageESet = messageDestinationUsageESet;
-		messageDestinationUsage = MESSAGE_DESTINATION_USAGE_EDEFAULT;
-		messageDestinationUsageESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, JavaeePackage.MESSAGE_DESTINATION_REF__MESSAGE_DESTINATION_USAGE, oldMessageDestinationUsage, MESSAGE_DESTINATION_USAGE_EDEFAULT, oldMessageDestinationUsageESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetMessageDestinationUsage() {
-		return messageDestinationUsageESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getMessageDestinationLink() {
-		return messageDestinationLink;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMessageDestinationLink(String newMessageDestinationLink) {
-		String oldMessageDestinationLink = messageDestinationLink;
-		messageDestinationLink = newMessageDestinationLink;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.MESSAGE_DESTINATION_REF__MESSAGE_DESTINATION_LINK, oldMessageDestinationLink, messageDestinationLink));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getMappedName() {
-		return mappedName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMappedName(String newMappedName) {
-		String oldMappedName = mappedName;
-		mappedName = newMappedName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.MESSAGE_DESTINATION_REF__MAPPED_NAME, oldMappedName, mappedName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getInjectionTargets() {
-		if (injectionTargets == null) {
-			injectionTargets = new EObjectContainmentEList(InjectionTarget.class, this, JavaeePackage.MESSAGE_DESTINATION_REF__INJECTION_TARGETS);
-		}
-		return injectionTargets;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.MESSAGE_DESTINATION_REF__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JavaeePackage.MESSAGE_DESTINATION_REF__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-			case JavaeePackage.MESSAGE_DESTINATION_REF__INJECTION_TARGETS:
-				return ((InternalEList)getInjectionTargets()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JavaeePackage.MESSAGE_DESTINATION_REF__DESCRIPTIONS:
-				return getDescriptions();
-			case JavaeePackage.MESSAGE_DESTINATION_REF__MESSAGE_DESTINATION_REF_NAME:
-				return getMessageDestinationRefName();
-			case JavaeePackage.MESSAGE_DESTINATION_REF__MESSAGE_DESTINATION_TYPE:
-				return getMessageDestinationType();
-			case JavaeePackage.MESSAGE_DESTINATION_REF__MESSAGE_DESTINATION_USAGE:
-				return getMessageDestinationUsage();
-			case JavaeePackage.MESSAGE_DESTINATION_REF__MESSAGE_DESTINATION_LINK:
-				return getMessageDestinationLink();
-			case JavaeePackage.MESSAGE_DESTINATION_REF__MAPPED_NAME:
-				return getMappedName();
-			case JavaeePackage.MESSAGE_DESTINATION_REF__INJECTION_TARGETS:
-				return getInjectionTargets();
-			case JavaeePackage.MESSAGE_DESTINATION_REF__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JavaeePackage.MESSAGE_DESTINATION_REF__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case JavaeePackage.MESSAGE_DESTINATION_REF__MESSAGE_DESTINATION_REF_NAME:
-				setMessageDestinationRefName((String)newValue);
-				return;
-			case JavaeePackage.MESSAGE_DESTINATION_REF__MESSAGE_DESTINATION_TYPE:
-				setMessageDestinationType((String)newValue);
-				return;
-			case JavaeePackage.MESSAGE_DESTINATION_REF__MESSAGE_DESTINATION_USAGE:
-				setMessageDestinationUsage((MessageDestinationUsageType)newValue);
-				return;
-			case JavaeePackage.MESSAGE_DESTINATION_REF__MESSAGE_DESTINATION_LINK:
-				setMessageDestinationLink((String)newValue);
-				return;
-			case JavaeePackage.MESSAGE_DESTINATION_REF__MAPPED_NAME:
-				setMappedName((String)newValue);
-				return;
-			case JavaeePackage.MESSAGE_DESTINATION_REF__INJECTION_TARGETS:
-				getInjectionTargets().clear();
-				getInjectionTargets().addAll((Collection)newValue);
-				return;
-			case JavaeePackage.MESSAGE_DESTINATION_REF__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.MESSAGE_DESTINATION_REF__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case JavaeePackage.MESSAGE_DESTINATION_REF__MESSAGE_DESTINATION_REF_NAME:
-				setMessageDestinationRefName(MESSAGE_DESTINATION_REF_NAME_EDEFAULT);
-				return;
-			case JavaeePackage.MESSAGE_DESTINATION_REF__MESSAGE_DESTINATION_TYPE:
-				setMessageDestinationType(MESSAGE_DESTINATION_TYPE_EDEFAULT);
-				return;
-			case JavaeePackage.MESSAGE_DESTINATION_REF__MESSAGE_DESTINATION_USAGE:
-				unsetMessageDestinationUsage();
-				return;
-			case JavaeePackage.MESSAGE_DESTINATION_REF__MESSAGE_DESTINATION_LINK:
-				setMessageDestinationLink(MESSAGE_DESTINATION_LINK_EDEFAULT);
-				return;
-			case JavaeePackage.MESSAGE_DESTINATION_REF__MAPPED_NAME:
-				setMappedName(MAPPED_NAME_EDEFAULT);
-				return;
-			case JavaeePackage.MESSAGE_DESTINATION_REF__INJECTION_TARGETS:
-				getInjectionTargets().clear();
-				return;
-			case JavaeePackage.MESSAGE_DESTINATION_REF__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.MESSAGE_DESTINATION_REF__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case JavaeePackage.MESSAGE_DESTINATION_REF__MESSAGE_DESTINATION_REF_NAME:
-				return MESSAGE_DESTINATION_REF_NAME_EDEFAULT == null ? messageDestinationRefName != null : !MESSAGE_DESTINATION_REF_NAME_EDEFAULT.equals(messageDestinationRefName);
-			case JavaeePackage.MESSAGE_DESTINATION_REF__MESSAGE_DESTINATION_TYPE:
-				return MESSAGE_DESTINATION_TYPE_EDEFAULT == null ? messageDestinationType != null : !MESSAGE_DESTINATION_TYPE_EDEFAULT.equals(messageDestinationType);
-			case JavaeePackage.MESSAGE_DESTINATION_REF__MESSAGE_DESTINATION_USAGE:
-				return isSetMessageDestinationUsage();
-			case JavaeePackage.MESSAGE_DESTINATION_REF__MESSAGE_DESTINATION_LINK:
-				return MESSAGE_DESTINATION_LINK_EDEFAULT == null ? messageDestinationLink != null : !MESSAGE_DESTINATION_LINK_EDEFAULT.equals(messageDestinationLink);
-			case JavaeePackage.MESSAGE_DESTINATION_REF__MAPPED_NAME:
-				return MAPPED_NAME_EDEFAULT == null ? mappedName != null : !MAPPED_NAME_EDEFAULT.equals(mappedName);
-			case JavaeePackage.MESSAGE_DESTINATION_REF__INJECTION_TARGETS:
-				return injectionTargets != null && !injectionTargets.isEmpty();
-			case JavaeePackage.MESSAGE_DESTINATION_REF__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (messageDestinationRefName: "); //$NON-NLS-1$
-		result.append(messageDestinationRefName);
-		result.append(", messageDestinationType: "); //$NON-NLS-1$
-		result.append(messageDestinationType);
-		result.append(", messageDestinationUsage: "); //$NON-NLS-1$
-		if (messageDestinationUsageESet) result.append(messageDestinationUsage); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(", messageDestinationLink: "); //$NON-NLS-1$
-		result.append(messageDestinationLink);
-		result.append(", mappedName: "); //$NON-NLS-1$
-		result.append(mappedName);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //MessageDestinationRefImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/ParamValueImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/ParamValueImpl.java
deleted file mode 100644
index 9b6f9fd9e..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/ParamValueImpl.java
+++ /dev/null
@@ -1,332 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core.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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jst.javaee.core.Description;
-import org.eclipse.jst.javaee.core.ParamValue;
-
-import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Param Value</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ParamValueImpl#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ParamValueImpl#getParamName <em>Param Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ParamValueImpl#getParamValue <em>Param Value</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ParamValueImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ParamValueImpl extends EObjectImpl implements ParamValue {
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The default value of the '{@link #getParamName() <em>Param Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getParamName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PARAM_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getParamName() <em>Param Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getParamName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String paramName = PARAM_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getParamValue() <em>Param Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getParamValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PARAM_VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getParamValue() <em>Param Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getParamValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String paramValue = PARAM_VALUE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ParamValueImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JavaeePackage.Literals.PARAM_VALUE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, JavaeePackage.PARAM_VALUE__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getParamName() {
-		return paramName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setParamName(String newParamName) {
-		String oldParamName = paramName;
-		paramName = newParamName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.PARAM_VALUE__PARAM_NAME, oldParamName, paramName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getParamValue() {
-		return paramValue;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setParamValue(String newParamValue) {
-		String oldParamValue = paramValue;
-		paramValue = newParamValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.PARAM_VALUE__PARAM_VALUE, oldParamValue, paramValue));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.PARAM_VALUE__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JavaeePackage.PARAM_VALUE__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JavaeePackage.PARAM_VALUE__DESCRIPTIONS:
-				return getDescriptions();
-			case JavaeePackage.PARAM_VALUE__PARAM_NAME:
-				return getParamName();
-			case JavaeePackage.PARAM_VALUE__PARAM_VALUE:
-				return getParamValue();
-			case JavaeePackage.PARAM_VALUE__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JavaeePackage.PARAM_VALUE__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case JavaeePackage.PARAM_VALUE__PARAM_NAME:
-				setParamName((String)newValue);
-				return;
-			case JavaeePackage.PARAM_VALUE__PARAM_VALUE:
-				setParamValue((String)newValue);
-				return;
-			case JavaeePackage.PARAM_VALUE__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.PARAM_VALUE__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case JavaeePackage.PARAM_VALUE__PARAM_NAME:
-				setParamName(PARAM_NAME_EDEFAULT);
-				return;
-			case JavaeePackage.PARAM_VALUE__PARAM_VALUE:
-				setParamValue(PARAM_VALUE_EDEFAULT);
-				return;
-			case JavaeePackage.PARAM_VALUE__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.PARAM_VALUE__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case JavaeePackage.PARAM_VALUE__PARAM_NAME:
-				return PARAM_NAME_EDEFAULT == null ? paramName != null : !PARAM_NAME_EDEFAULT.equals(paramName);
-			case JavaeePackage.PARAM_VALUE__PARAM_VALUE:
-				return PARAM_VALUE_EDEFAULT == null ? paramValue != null : !PARAM_VALUE_EDEFAULT.equals(paramValue);
-			case JavaeePackage.PARAM_VALUE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (paramName: "); //$NON-NLS-1$
-		result.append(paramName);
-		result.append(", paramValue: "); //$NON-NLS-1$
-		result.append(paramValue);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ParamValueImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/PersistenceContextRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/PersistenceContextRefImpl.java
deleted file mode 100644
index 19ae0c3d4..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/PersistenceContextRefImpl.java
+++ /dev/null
@@ -1,549 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core.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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jst.javaee.core.Description;
-import org.eclipse.jst.javaee.core.InjectionTarget;
-import org.eclipse.jst.javaee.core.PersistenceContextRef;
-import org.eclipse.jst.javaee.core.PersistenceContextType;
-import org.eclipse.jst.javaee.core.PropertyType;
-
-import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Persistence Context Ref</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceContextRefImpl#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceContextRefImpl#getPersistenceContextRefName <em>Persistence Context Ref Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceContextRefImpl#getPersistenceUnitName <em>Persistence Unit Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceContextRefImpl#getPersistenceContextType <em>Persistence Context Type</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceContextRefImpl#getPersistenceProperties <em>Persistence Properties</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceContextRefImpl#getMappedName <em>Mapped Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceContextRefImpl#getInjectionTargets <em>Injection Targets</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceContextRefImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PersistenceContextRefImpl extends EObjectImpl implements PersistenceContextRef {
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The default value of the '{@link #getPersistenceContextRefName() <em>Persistence Context Ref Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPersistenceContextRefName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PERSISTENCE_CONTEXT_REF_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPersistenceContextRefName() <em>Persistence Context Ref Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPersistenceContextRefName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String persistenceContextRefName = PERSISTENCE_CONTEXT_REF_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPersistenceUnitName() <em>Persistence Unit Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPersistenceUnitName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PERSISTENCE_UNIT_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPersistenceUnitName() <em>Persistence Unit Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPersistenceUnitName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String persistenceUnitName = PERSISTENCE_UNIT_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPersistenceContextType() <em>Persistence Context Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPersistenceContextType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final PersistenceContextType PERSISTENCE_CONTEXT_TYPE_EDEFAULT = PersistenceContextType.TRANSACTION_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getPersistenceContextType() <em>Persistence Context Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPersistenceContextType()
-	 * @generated
-	 * @ordered
-	 */
-	protected PersistenceContextType persistenceContextType = PERSISTENCE_CONTEXT_TYPE_EDEFAULT;
-
-	/**
-	 * This is true if the Persistence Context Type attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean persistenceContextTypeESet = false;
-
-	/**
-	 * The cached value of the '{@link #getPersistenceProperties() <em>Persistence Properties</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPersistenceProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList persistenceProperties = null;
-
-	/**
-	 * The default value of the '{@link #getMappedName() <em>Mapped Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMappedName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MAPPED_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMappedName() <em>Mapped Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMappedName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String mappedName = MAPPED_NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getInjectionTargets() <em>Injection Targets</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInjectionTargets()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList injectionTargets = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PersistenceContextRefImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JavaeePackage.Literals.PERSISTENCE_CONTEXT_REF;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, JavaeePackage.PERSISTENCE_CONTEXT_REF__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPersistenceContextRefName() {
-		return persistenceContextRefName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPersistenceContextRefName(String newPersistenceContextRefName) {
-		String oldPersistenceContextRefName = persistenceContextRefName;
-		persistenceContextRefName = newPersistenceContextRefName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.PERSISTENCE_CONTEXT_REF__PERSISTENCE_CONTEXT_REF_NAME, oldPersistenceContextRefName, persistenceContextRefName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPersistenceUnitName() {
-		return persistenceUnitName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPersistenceUnitName(String newPersistenceUnitName) {
-		String oldPersistenceUnitName = persistenceUnitName;
-		persistenceUnitName = newPersistenceUnitName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.PERSISTENCE_CONTEXT_REF__PERSISTENCE_UNIT_NAME, oldPersistenceUnitName, persistenceUnitName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PersistenceContextType getPersistenceContextType() {
-		return persistenceContextType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPersistenceContextType(PersistenceContextType newPersistenceContextType) {
-		PersistenceContextType oldPersistenceContextType = persistenceContextType;
-		persistenceContextType = newPersistenceContextType == null ? PERSISTENCE_CONTEXT_TYPE_EDEFAULT : newPersistenceContextType;
-		boolean oldPersistenceContextTypeESet = persistenceContextTypeESet;
-		persistenceContextTypeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.PERSISTENCE_CONTEXT_REF__PERSISTENCE_CONTEXT_TYPE, oldPersistenceContextType, persistenceContextType, !oldPersistenceContextTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetPersistenceContextType() {
-		PersistenceContextType oldPersistenceContextType = persistenceContextType;
-		boolean oldPersistenceContextTypeESet = persistenceContextTypeESet;
-		persistenceContextType = PERSISTENCE_CONTEXT_TYPE_EDEFAULT;
-		persistenceContextTypeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, JavaeePackage.PERSISTENCE_CONTEXT_REF__PERSISTENCE_CONTEXT_TYPE, oldPersistenceContextType, PERSISTENCE_CONTEXT_TYPE_EDEFAULT, oldPersistenceContextTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetPersistenceContextType() {
-		return persistenceContextTypeESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPersistenceProperties() {
-		if (persistenceProperties == null) {
-			persistenceProperties = new EObjectContainmentEList(PropertyType.class, this, JavaeePackage.PERSISTENCE_CONTEXT_REF__PERSISTENCE_PROPERTIES);
-		}
-		return persistenceProperties;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getMappedName() {
-		return mappedName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMappedName(String newMappedName) {
-		String oldMappedName = mappedName;
-		mappedName = newMappedName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.PERSISTENCE_CONTEXT_REF__MAPPED_NAME, oldMappedName, mappedName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getInjectionTargets() {
-		if (injectionTargets == null) {
-			injectionTargets = new EObjectContainmentEList(InjectionTarget.class, this, JavaeePackage.PERSISTENCE_CONTEXT_REF__INJECTION_TARGETS);
-		}
-		return injectionTargets;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.PERSISTENCE_CONTEXT_REF__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JavaeePackage.PERSISTENCE_CONTEXT_REF__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-			case JavaeePackage.PERSISTENCE_CONTEXT_REF__PERSISTENCE_PROPERTIES:
-				return ((InternalEList)getPersistenceProperties()).basicRemove(otherEnd, msgs);
-			case JavaeePackage.PERSISTENCE_CONTEXT_REF__INJECTION_TARGETS:
-				return ((InternalEList)getInjectionTargets()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JavaeePackage.PERSISTENCE_CONTEXT_REF__DESCRIPTIONS:
-				return getDescriptions();
-			case JavaeePackage.PERSISTENCE_CONTEXT_REF__PERSISTENCE_CONTEXT_REF_NAME:
-				return getPersistenceContextRefName();
-			case JavaeePackage.PERSISTENCE_CONTEXT_REF__PERSISTENCE_UNIT_NAME:
-				return getPersistenceUnitName();
-			case JavaeePackage.PERSISTENCE_CONTEXT_REF__PERSISTENCE_CONTEXT_TYPE:
-				return getPersistenceContextType();
-			case JavaeePackage.PERSISTENCE_CONTEXT_REF__PERSISTENCE_PROPERTIES:
-				return getPersistenceProperties();
-			case JavaeePackage.PERSISTENCE_CONTEXT_REF__MAPPED_NAME:
-				return getMappedName();
-			case JavaeePackage.PERSISTENCE_CONTEXT_REF__INJECTION_TARGETS:
-				return getInjectionTargets();
-			case JavaeePackage.PERSISTENCE_CONTEXT_REF__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JavaeePackage.PERSISTENCE_CONTEXT_REF__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case JavaeePackage.PERSISTENCE_CONTEXT_REF__PERSISTENCE_CONTEXT_REF_NAME:
-				setPersistenceContextRefName((String)newValue);
-				return;
-			case JavaeePackage.PERSISTENCE_CONTEXT_REF__PERSISTENCE_UNIT_NAME:
-				setPersistenceUnitName((String)newValue);
-				return;
-			case JavaeePackage.PERSISTENCE_CONTEXT_REF__PERSISTENCE_CONTEXT_TYPE:
-				setPersistenceContextType((PersistenceContextType)newValue);
-				return;
-			case JavaeePackage.PERSISTENCE_CONTEXT_REF__PERSISTENCE_PROPERTIES:
-				getPersistenceProperties().clear();
-				getPersistenceProperties().addAll((Collection)newValue);
-				return;
-			case JavaeePackage.PERSISTENCE_CONTEXT_REF__MAPPED_NAME:
-				setMappedName((String)newValue);
-				return;
-			case JavaeePackage.PERSISTENCE_CONTEXT_REF__INJECTION_TARGETS:
-				getInjectionTargets().clear();
-				getInjectionTargets().addAll((Collection)newValue);
-				return;
-			case JavaeePackage.PERSISTENCE_CONTEXT_REF__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.PERSISTENCE_CONTEXT_REF__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case JavaeePackage.PERSISTENCE_CONTEXT_REF__PERSISTENCE_CONTEXT_REF_NAME:
-				setPersistenceContextRefName(PERSISTENCE_CONTEXT_REF_NAME_EDEFAULT);
-				return;
-			case JavaeePackage.PERSISTENCE_CONTEXT_REF__PERSISTENCE_UNIT_NAME:
-				setPersistenceUnitName(PERSISTENCE_UNIT_NAME_EDEFAULT);
-				return;
-			case JavaeePackage.PERSISTENCE_CONTEXT_REF__PERSISTENCE_CONTEXT_TYPE:
-				unsetPersistenceContextType();
-				return;
-			case JavaeePackage.PERSISTENCE_CONTEXT_REF__PERSISTENCE_PROPERTIES:
-				getPersistenceProperties().clear();
-				return;
-			case JavaeePackage.PERSISTENCE_CONTEXT_REF__MAPPED_NAME:
-				setMappedName(MAPPED_NAME_EDEFAULT);
-				return;
-			case JavaeePackage.PERSISTENCE_CONTEXT_REF__INJECTION_TARGETS:
-				getInjectionTargets().clear();
-				return;
-			case JavaeePackage.PERSISTENCE_CONTEXT_REF__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.PERSISTENCE_CONTEXT_REF__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case JavaeePackage.PERSISTENCE_CONTEXT_REF__PERSISTENCE_CONTEXT_REF_NAME:
-				return PERSISTENCE_CONTEXT_REF_NAME_EDEFAULT == null ? persistenceContextRefName != null : !PERSISTENCE_CONTEXT_REF_NAME_EDEFAULT.equals(persistenceContextRefName);
-			case JavaeePackage.PERSISTENCE_CONTEXT_REF__PERSISTENCE_UNIT_NAME:
-				return PERSISTENCE_UNIT_NAME_EDEFAULT == null ? persistenceUnitName != null : !PERSISTENCE_UNIT_NAME_EDEFAULT.equals(persistenceUnitName);
-			case JavaeePackage.PERSISTENCE_CONTEXT_REF__PERSISTENCE_CONTEXT_TYPE:
-				return isSetPersistenceContextType();
-			case JavaeePackage.PERSISTENCE_CONTEXT_REF__PERSISTENCE_PROPERTIES:
-				return persistenceProperties != null && !persistenceProperties.isEmpty();
-			case JavaeePackage.PERSISTENCE_CONTEXT_REF__MAPPED_NAME:
-				return MAPPED_NAME_EDEFAULT == null ? mappedName != null : !MAPPED_NAME_EDEFAULT.equals(mappedName);
-			case JavaeePackage.PERSISTENCE_CONTEXT_REF__INJECTION_TARGETS:
-				return injectionTargets != null && !injectionTargets.isEmpty();
-			case JavaeePackage.PERSISTENCE_CONTEXT_REF__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (persistenceContextRefName: "); //$NON-NLS-1$
-		result.append(persistenceContextRefName);
-		result.append(", persistenceUnitName: "); //$NON-NLS-1$
-		result.append(persistenceUnitName);
-		result.append(", persistenceContextType: "); //$NON-NLS-1$
-		if (persistenceContextTypeESet) result.append(persistenceContextType); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(", mappedName: "); //$NON-NLS-1$
-		result.append(mappedName);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //PersistenceContextRefImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/PersistenceUnitRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/PersistenceUnitRefImpl.java
deleted file mode 100644
index d88c99dfc..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/PersistenceUnitRefImpl.java
+++ /dev/null
@@ -1,423 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core.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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jst.javaee.core.Description;
-import org.eclipse.jst.javaee.core.InjectionTarget;
-import org.eclipse.jst.javaee.core.PersistenceUnitRef;
-
-import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Persistence Unit Ref</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceUnitRefImpl#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceUnitRefImpl#getPersistenceUnitRefName <em>Persistence Unit Ref Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceUnitRefImpl#getPersistenceUnitName <em>Persistence Unit Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceUnitRefImpl#getMappedName <em>Mapped Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceUnitRefImpl#getInjectionTargets <em>Injection Targets</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceUnitRefImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PersistenceUnitRefImpl extends EObjectImpl implements PersistenceUnitRef {
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The default value of the '{@link #getPersistenceUnitRefName() <em>Persistence Unit Ref Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPersistenceUnitRefName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PERSISTENCE_UNIT_REF_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPersistenceUnitRefName() <em>Persistence Unit Ref Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPersistenceUnitRefName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String persistenceUnitRefName = PERSISTENCE_UNIT_REF_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPersistenceUnitName() <em>Persistence Unit Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPersistenceUnitName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PERSISTENCE_UNIT_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPersistenceUnitName() <em>Persistence Unit Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPersistenceUnitName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String persistenceUnitName = PERSISTENCE_UNIT_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getMappedName() <em>Mapped Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMappedName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MAPPED_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMappedName() <em>Mapped Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMappedName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String mappedName = MAPPED_NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getInjectionTargets() <em>Injection Targets</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInjectionTargets()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList injectionTargets = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PersistenceUnitRefImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JavaeePackage.Literals.PERSISTENCE_UNIT_REF;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, JavaeePackage.PERSISTENCE_UNIT_REF__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPersistenceUnitRefName() {
-		return persistenceUnitRefName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPersistenceUnitRefName(String newPersistenceUnitRefName) {
-		String oldPersistenceUnitRefName = persistenceUnitRefName;
-		persistenceUnitRefName = newPersistenceUnitRefName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.PERSISTENCE_UNIT_REF__PERSISTENCE_UNIT_REF_NAME, oldPersistenceUnitRefName, persistenceUnitRefName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPersistenceUnitName() {
-		return persistenceUnitName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPersistenceUnitName(String newPersistenceUnitName) {
-		String oldPersistenceUnitName = persistenceUnitName;
-		persistenceUnitName = newPersistenceUnitName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.PERSISTENCE_UNIT_REF__PERSISTENCE_UNIT_NAME, oldPersistenceUnitName, persistenceUnitName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getMappedName() {
-		return mappedName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMappedName(String newMappedName) {
-		String oldMappedName = mappedName;
-		mappedName = newMappedName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.PERSISTENCE_UNIT_REF__MAPPED_NAME, oldMappedName, mappedName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getInjectionTargets() {
-		if (injectionTargets == null) {
-			injectionTargets = new EObjectContainmentEList(InjectionTarget.class, this, JavaeePackage.PERSISTENCE_UNIT_REF__INJECTION_TARGETS);
-		}
-		return injectionTargets;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.PERSISTENCE_UNIT_REF__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JavaeePackage.PERSISTENCE_UNIT_REF__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-			case JavaeePackage.PERSISTENCE_UNIT_REF__INJECTION_TARGETS:
-				return ((InternalEList)getInjectionTargets()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JavaeePackage.PERSISTENCE_UNIT_REF__DESCRIPTIONS:
-				return getDescriptions();
-			case JavaeePackage.PERSISTENCE_UNIT_REF__PERSISTENCE_UNIT_REF_NAME:
-				return getPersistenceUnitRefName();
-			case JavaeePackage.PERSISTENCE_UNIT_REF__PERSISTENCE_UNIT_NAME:
-				return getPersistenceUnitName();
-			case JavaeePackage.PERSISTENCE_UNIT_REF__MAPPED_NAME:
-				return getMappedName();
-			case JavaeePackage.PERSISTENCE_UNIT_REF__INJECTION_TARGETS:
-				return getInjectionTargets();
-			case JavaeePackage.PERSISTENCE_UNIT_REF__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JavaeePackage.PERSISTENCE_UNIT_REF__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case JavaeePackage.PERSISTENCE_UNIT_REF__PERSISTENCE_UNIT_REF_NAME:
-				setPersistenceUnitRefName((String)newValue);
-				return;
-			case JavaeePackage.PERSISTENCE_UNIT_REF__PERSISTENCE_UNIT_NAME:
-				setPersistenceUnitName((String)newValue);
-				return;
-			case JavaeePackage.PERSISTENCE_UNIT_REF__MAPPED_NAME:
-				setMappedName((String)newValue);
-				return;
-			case JavaeePackage.PERSISTENCE_UNIT_REF__INJECTION_TARGETS:
-				getInjectionTargets().clear();
-				getInjectionTargets().addAll((Collection)newValue);
-				return;
-			case JavaeePackage.PERSISTENCE_UNIT_REF__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.PERSISTENCE_UNIT_REF__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case JavaeePackage.PERSISTENCE_UNIT_REF__PERSISTENCE_UNIT_REF_NAME:
-				setPersistenceUnitRefName(PERSISTENCE_UNIT_REF_NAME_EDEFAULT);
-				return;
-			case JavaeePackage.PERSISTENCE_UNIT_REF__PERSISTENCE_UNIT_NAME:
-				setPersistenceUnitName(PERSISTENCE_UNIT_NAME_EDEFAULT);
-				return;
-			case JavaeePackage.PERSISTENCE_UNIT_REF__MAPPED_NAME:
-				setMappedName(MAPPED_NAME_EDEFAULT);
-				return;
-			case JavaeePackage.PERSISTENCE_UNIT_REF__INJECTION_TARGETS:
-				getInjectionTargets().clear();
-				return;
-			case JavaeePackage.PERSISTENCE_UNIT_REF__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.PERSISTENCE_UNIT_REF__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case JavaeePackage.PERSISTENCE_UNIT_REF__PERSISTENCE_UNIT_REF_NAME:
-				return PERSISTENCE_UNIT_REF_NAME_EDEFAULT == null ? persistenceUnitRefName != null : !PERSISTENCE_UNIT_REF_NAME_EDEFAULT.equals(persistenceUnitRefName);
-			case JavaeePackage.PERSISTENCE_UNIT_REF__PERSISTENCE_UNIT_NAME:
-				return PERSISTENCE_UNIT_NAME_EDEFAULT == null ? persistenceUnitName != null : !PERSISTENCE_UNIT_NAME_EDEFAULT.equals(persistenceUnitName);
-			case JavaeePackage.PERSISTENCE_UNIT_REF__MAPPED_NAME:
-				return MAPPED_NAME_EDEFAULT == null ? mappedName != null : !MAPPED_NAME_EDEFAULT.equals(mappedName);
-			case JavaeePackage.PERSISTENCE_UNIT_REF__INJECTION_TARGETS:
-				return injectionTargets != null && !injectionTargets.isEmpty();
-			case JavaeePackage.PERSISTENCE_UNIT_REF__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (persistenceUnitRefName: "); //$NON-NLS-1$
-		result.append(persistenceUnitRefName);
-		result.append(", persistenceUnitName: "); //$NON-NLS-1$
-		result.append(persistenceUnitName);
-		result.append(", mappedName: "); //$NON-NLS-1$
-		result.append(mappedName);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //PersistenceUnitRefImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/PortComponentRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/PortComponentRefImpl.java
deleted file mode 100644
index aced7c775..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/PortComponentRefImpl.java
+++ /dev/null
@@ -1,362 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core.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.core.PortComponentRef;
-
-import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Port Component Ref</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.PortComponentRefImpl#getServiceEndpointInterface <em>Service Endpoint Interface</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.PortComponentRefImpl#isEnableMtom <em>Enable Mtom</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.PortComponentRefImpl#getPortComponentLink <em>Port Component Link</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.PortComponentRefImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PortComponentRefImpl extends EObjectImpl implements PortComponentRef {
-	/**
-	 * The default value of the '{@link #getServiceEndpointInterface() <em>Service Endpoint Interface</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getServiceEndpointInterface()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SERVICE_ENDPOINT_INTERFACE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getServiceEndpointInterface() <em>Service Endpoint Interface</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getServiceEndpointInterface()
-	 * @generated
-	 * @ordered
-	 */
-	protected String serviceEndpointInterface = SERVICE_ENDPOINT_INTERFACE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isEnableMtom() <em>Enable Mtom</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isEnableMtom()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean ENABLE_MTOM_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isEnableMtom() <em>Enable Mtom</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isEnableMtom()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean enableMtom = ENABLE_MTOM_EDEFAULT;
-
-	/**
-	 * This is true if the Enable Mtom attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean enableMtomESet = false;
-
-	/**
-	 * The default value of the '{@link #getPortComponentLink() <em>Port Component Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPortComponentLink()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PORT_COMPONENT_LINK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPortComponentLink() <em>Port Component Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPortComponentLink()
-	 * @generated
-	 * @ordered
-	 */
-	protected String portComponentLink = PORT_COMPONENT_LINK_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PortComponentRefImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JavaeePackage.Literals.PORT_COMPONENT_REF;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getServiceEndpointInterface() {
-		return serviceEndpointInterface;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setServiceEndpointInterface(String newServiceEndpointInterface) {
-		String oldServiceEndpointInterface = serviceEndpointInterface;
-		serviceEndpointInterface = newServiceEndpointInterface;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.PORT_COMPONENT_REF__SERVICE_ENDPOINT_INTERFACE, oldServiceEndpointInterface, serviceEndpointInterface));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isEnableMtom() {
-		return enableMtom;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEnableMtom(boolean newEnableMtom) {
-		boolean oldEnableMtom = enableMtom;
-		enableMtom = newEnableMtom;
-		boolean oldEnableMtomESet = enableMtomESet;
-		enableMtomESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.PORT_COMPONENT_REF__ENABLE_MTOM, oldEnableMtom, enableMtom, !oldEnableMtomESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetEnableMtom() {
-		boolean oldEnableMtom = enableMtom;
-		boolean oldEnableMtomESet = enableMtomESet;
-		enableMtom = ENABLE_MTOM_EDEFAULT;
-		enableMtomESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, JavaeePackage.PORT_COMPONENT_REF__ENABLE_MTOM, oldEnableMtom, ENABLE_MTOM_EDEFAULT, oldEnableMtomESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetEnableMtom() {
-		return enableMtomESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPortComponentLink() {
-		return portComponentLink;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPortComponentLink(String newPortComponentLink) {
-		String oldPortComponentLink = portComponentLink;
-		portComponentLink = newPortComponentLink;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.PORT_COMPONENT_REF__PORT_COMPONENT_LINK, oldPortComponentLink, portComponentLink));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.PORT_COMPONENT_REF__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JavaeePackage.PORT_COMPONENT_REF__SERVICE_ENDPOINT_INTERFACE:
-				return getServiceEndpointInterface();
-			case JavaeePackage.PORT_COMPONENT_REF__ENABLE_MTOM:
-				return isEnableMtom() ? Boolean.TRUE : Boolean.FALSE;
-			case JavaeePackage.PORT_COMPONENT_REF__PORT_COMPONENT_LINK:
-				return getPortComponentLink();
-			case JavaeePackage.PORT_COMPONENT_REF__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JavaeePackage.PORT_COMPONENT_REF__SERVICE_ENDPOINT_INTERFACE:
-				setServiceEndpointInterface((String)newValue);
-				return;
-			case JavaeePackage.PORT_COMPONENT_REF__ENABLE_MTOM:
-				setEnableMtom(((Boolean)newValue).booleanValue());
-				return;
-			case JavaeePackage.PORT_COMPONENT_REF__PORT_COMPONENT_LINK:
-				setPortComponentLink((String)newValue);
-				return;
-			case JavaeePackage.PORT_COMPONENT_REF__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.PORT_COMPONENT_REF__SERVICE_ENDPOINT_INTERFACE:
-				setServiceEndpointInterface(SERVICE_ENDPOINT_INTERFACE_EDEFAULT);
-				return;
-			case JavaeePackage.PORT_COMPONENT_REF__ENABLE_MTOM:
-				unsetEnableMtom();
-				return;
-			case JavaeePackage.PORT_COMPONENT_REF__PORT_COMPONENT_LINK:
-				setPortComponentLink(PORT_COMPONENT_LINK_EDEFAULT);
-				return;
-			case JavaeePackage.PORT_COMPONENT_REF__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.PORT_COMPONENT_REF__SERVICE_ENDPOINT_INTERFACE:
-				return SERVICE_ENDPOINT_INTERFACE_EDEFAULT == null ? serviceEndpointInterface != null : !SERVICE_ENDPOINT_INTERFACE_EDEFAULT.equals(serviceEndpointInterface);
-			case JavaeePackage.PORT_COMPONENT_REF__ENABLE_MTOM:
-				return isSetEnableMtom();
-			case JavaeePackage.PORT_COMPONENT_REF__PORT_COMPONENT_LINK:
-				return PORT_COMPONENT_LINK_EDEFAULT == null ? portComponentLink != null : !PORT_COMPONENT_LINK_EDEFAULT.equals(portComponentLink);
-			case JavaeePackage.PORT_COMPONENT_REF__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (serviceEndpointInterface: "); //$NON-NLS-1$
-		result.append(serviceEndpointInterface);
-		result.append(", enableMtom: "); //$NON-NLS-1$
-		if (enableMtomESet) result.append(enableMtom); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(", portComponentLink: "); //$NON-NLS-1$
-		result.append(portComponentLink);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //PortComponentRefImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/PropertyTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/PropertyTypeImpl.java
deleted file mode 100644
index 882354110..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/PropertyTypeImpl.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core.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.core.PropertyType;
-
-import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Property Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.PropertyTypeImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.PropertyTypeImpl#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.PropertyTypeImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PropertyTypeImpl extends EObjectImpl implements PropertyType {
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String value = VALUE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PropertyTypeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JavaeePackage.Literals.PROPERTY_TYPE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.PROPERTY_TYPE__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(String newValue) {
-		String oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.PROPERTY_TYPE__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.PROPERTY_TYPE__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JavaeePackage.PROPERTY_TYPE__NAME:
-				return getName();
-			case JavaeePackage.PROPERTY_TYPE__VALUE:
-				return getValue();
-			case JavaeePackage.PROPERTY_TYPE__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JavaeePackage.PROPERTY_TYPE__NAME:
-				setName((String)newValue);
-				return;
-			case JavaeePackage.PROPERTY_TYPE__VALUE:
-				setValue((String)newValue);
-				return;
-			case JavaeePackage.PROPERTY_TYPE__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.PROPERTY_TYPE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case JavaeePackage.PROPERTY_TYPE__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-			case JavaeePackage.PROPERTY_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.PROPERTY_TYPE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case JavaeePackage.PROPERTY_TYPE__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-			case JavaeePackage.PROPERTY_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	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(", value: "); //$NON-NLS-1$
-		result.append(value);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //PropertyTypeImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/ResourceEnvRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/ResourceEnvRefImpl.java
deleted file mode 100644
index 11100ef03..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/ResourceEnvRefImpl.java
+++ /dev/null
@@ -1,423 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core.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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jst.javaee.core.Description;
-import org.eclipse.jst.javaee.core.InjectionTarget;
-import org.eclipse.jst.javaee.core.ResourceEnvRef;
-
-import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Resource Env Ref</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ResourceEnvRefImpl#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ResourceEnvRefImpl#getResourceEnvRefName <em>Resource Env Ref Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ResourceEnvRefImpl#getResourceEnvRefType <em>Resource Env Ref Type</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ResourceEnvRefImpl#getMappedName <em>Mapped Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ResourceEnvRefImpl#getInjectionTargets <em>Injection Targets</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ResourceEnvRefImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ResourceEnvRefImpl extends EObjectImpl implements ResourceEnvRef {
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The default value of the '{@link #getResourceEnvRefName() <em>Resource Env Ref Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResourceEnvRefName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String RESOURCE_ENV_REF_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getResourceEnvRefName() <em>Resource Env Ref Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResourceEnvRefName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String resourceEnvRefName = RESOURCE_ENV_REF_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getResourceEnvRefType() <em>Resource Env Ref Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResourceEnvRefType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String RESOURCE_ENV_REF_TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getResourceEnvRefType() <em>Resource Env Ref Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResourceEnvRefType()
-	 * @generated
-	 * @ordered
-	 */
-	protected String resourceEnvRefType = RESOURCE_ENV_REF_TYPE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getMappedName() <em>Mapped Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMappedName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MAPPED_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMappedName() <em>Mapped Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMappedName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String mappedName = MAPPED_NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getInjectionTargets() <em>Injection Targets</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInjectionTargets()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList injectionTargets = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ResourceEnvRefImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JavaeePackage.Literals.RESOURCE_ENV_REF;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, JavaeePackage.RESOURCE_ENV_REF__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getResourceEnvRefName() {
-		return resourceEnvRefName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setResourceEnvRefName(String newResourceEnvRefName) {
-		String oldResourceEnvRefName = resourceEnvRefName;
-		resourceEnvRefName = newResourceEnvRefName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.RESOURCE_ENV_REF__RESOURCE_ENV_REF_NAME, oldResourceEnvRefName, resourceEnvRefName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getResourceEnvRefType() {
-		return resourceEnvRefType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setResourceEnvRefType(String newResourceEnvRefType) {
-		String oldResourceEnvRefType = resourceEnvRefType;
-		resourceEnvRefType = newResourceEnvRefType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.RESOURCE_ENV_REF__RESOURCE_ENV_REF_TYPE, oldResourceEnvRefType, resourceEnvRefType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getMappedName() {
-		return mappedName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMappedName(String newMappedName) {
-		String oldMappedName = mappedName;
-		mappedName = newMappedName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.RESOURCE_ENV_REF__MAPPED_NAME, oldMappedName, mappedName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getInjectionTargets() {
-		if (injectionTargets == null) {
-			injectionTargets = new EObjectContainmentEList(InjectionTarget.class, this, JavaeePackage.RESOURCE_ENV_REF__INJECTION_TARGETS);
-		}
-		return injectionTargets;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.RESOURCE_ENV_REF__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JavaeePackage.RESOURCE_ENV_REF__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-			case JavaeePackage.RESOURCE_ENV_REF__INJECTION_TARGETS:
-				return ((InternalEList)getInjectionTargets()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JavaeePackage.RESOURCE_ENV_REF__DESCRIPTIONS:
-				return getDescriptions();
-			case JavaeePackage.RESOURCE_ENV_REF__RESOURCE_ENV_REF_NAME:
-				return getResourceEnvRefName();
-			case JavaeePackage.RESOURCE_ENV_REF__RESOURCE_ENV_REF_TYPE:
-				return getResourceEnvRefType();
-			case JavaeePackage.RESOURCE_ENV_REF__MAPPED_NAME:
-				return getMappedName();
-			case JavaeePackage.RESOURCE_ENV_REF__INJECTION_TARGETS:
-				return getInjectionTargets();
-			case JavaeePackage.RESOURCE_ENV_REF__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JavaeePackage.RESOURCE_ENV_REF__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case JavaeePackage.RESOURCE_ENV_REF__RESOURCE_ENV_REF_NAME:
-				setResourceEnvRefName((String)newValue);
-				return;
-			case JavaeePackage.RESOURCE_ENV_REF__RESOURCE_ENV_REF_TYPE:
-				setResourceEnvRefType((String)newValue);
-				return;
-			case JavaeePackage.RESOURCE_ENV_REF__MAPPED_NAME:
-				setMappedName((String)newValue);
-				return;
-			case JavaeePackage.RESOURCE_ENV_REF__INJECTION_TARGETS:
-				getInjectionTargets().clear();
-				getInjectionTargets().addAll((Collection)newValue);
-				return;
-			case JavaeePackage.RESOURCE_ENV_REF__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.RESOURCE_ENV_REF__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case JavaeePackage.RESOURCE_ENV_REF__RESOURCE_ENV_REF_NAME:
-				setResourceEnvRefName(RESOURCE_ENV_REF_NAME_EDEFAULT);
-				return;
-			case JavaeePackage.RESOURCE_ENV_REF__RESOURCE_ENV_REF_TYPE:
-				setResourceEnvRefType(RESOURCE_ENV_REF_TYPE_EDEFAULT);
-				return;
-			case JavaeePackage.RESOURCE_ENV_REF__MAPPED_NAME:
-				setMappedName(MAPPED_NAME_EDEFAULT);
-				return;
-			case JavaeePackage.RESOURCE_ENV_REF__INJECTION_TARGETS:
-				getInjectionTargets().clear();
-				return;
-			case JavaeePackage.RESOURCE_ENV_REF__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.RESOURCE_ENV_REF__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case JavaeePackage.RESOURCE_ENV_REF__RESOURCE_ENV_REF_NAME:
-				return RESOURCE_ENV_REF_NAME_EDEFAULT == null ? resourceEnvRefName != null : !RESOURCE_ENV_REF_NAME_EDEFAULT.equals(resourceEnvRefName);
-			case JavaeePackage.RESOURCE_ENV_REF__RESOURCE_ENV_REF_TYPE:
-				return RESOURCE_ENV_REF_TYPE_EDEFAULT == null ? resourceEnvRefType != null : !RESOURCE_ENV_REF_TYPE_EDEFAULT.equals(resourceEnvRefType);
-			case JavaeePackage.RESOURCE_ENV_REF__MAPPED_NAME:
-				return MAPPED_NAME_EDEFAULT == null ? mappedName != null : !MAPPED_NAME_EDEFAULT.equals(mappedName);
-			case JavaeePackage.RESOURCE_ENV_REF__INJECTION_TARGETS:
-				return injectionTargets != null && !injectionTargets.isEmpty();
-			case JavaeePackage.RESOURCE_ENV_REF__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (resourceEnvRefName: "); //$NON-NLS-1$
-		result.append(resourceEnvRefName);
-		result.append(", resourceEnvRefType: "); //$NON-NLS-1$
-		result.append(resourceEnvRefType);
-		result.append(", mappedName: "); //$NON-NLS-1$
-		result.append(mappedName);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ResourceEnvRefImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/ResourceRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/ResourceRefImpl.java
deleted file mode 100644
index 104da06fe..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/ResourceRefImpl.java
+++ /dev/null
@@ -1,601 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core.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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jst.javaee.core.Description;
-import org.eclipse.jst.javaee.core.InjectionTarget;
-import org.eclipse.jst.javaee.core.ResAuthType;
-import org.eclipse.jst.javaee.core.ResSharingScopeType;
-import org.eclipse.jst.javaee.core.ResourceRef;
-
-import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Resource Ref</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ResourceRefImpl#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ResourceRefImpl#getResRefName <em>Res Ref Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ResourceRefImpl#getResType <em>Res Type</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ResourceRefImpl#getResAuth <em>Res Auth</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ResourceRefImpl#getResSharingScope <em>Res Sharing Scope</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ResourceRefImpl#getMappedName <em>Mapped Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ResourceRefImpl#getInjectionTargets <em>Injection Targets</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ResourceRefImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ResourceRefImpl extends EObjectImpl implements ResourceRef {
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The default value of the '{@link #getResRefName() <em>Res Ref Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResRefName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String RES_REF_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getResRefName() <em>Res Ref Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResRefName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String resRefName = RES_REF_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getResType() <em>Res Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String RES_TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getResType() <em>Res Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResType()
-	 * @generated
-	 * @ordered
-	 */
-	protected String resType = RES_TYPE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getResAuth() <em>Res Auth</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResAuth()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final ResAuthType RES_AUTH_EDEFAULT = ResAuthType.APPLICATION_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getResAuth() <em>Res Auth</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResAuth()
-	 * @generated
-	 * @ordered
-	 */
-	protected ResAuthType resAuth = RES_AUTH_EDEFAULT;
-
-	/**
-	 * This is true if the Res Auth attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean resAuthESet = false;
-
-	/**
-	 * The default value of the '{@link #getResSharingScope() <em>Res Sharing Scope</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResSharingScope()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final ResSharingScopeType RES_SHARING_SCOPE_EDEFAULT = ResSharingScopeType.SHAREABLE_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getResSharingScope() <em>Res Sharing Scope</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResSharingScope()
-	 * @generated
-	 * @ordered
-	 */
-	protected ResSharingScopeType resSharingScope = RES_SHARING_SCOPE_EDEFAULT;
-
-	/**
-	 * This is true if the Res Sharing Scope attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean resSharingScopeESet = false;
-
-	/**
-	 * The default value of the '{@link #getMappedName() <em>Mapped Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMappedName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MAPPED_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMappedName() <em>Mapped Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMappedName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String mappedName = MAPPED_NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getInjectionTargets() <em>Injection Targets</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInjectionTargets()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList injectionTargets = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ResourceRefImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JavaeePackage.Literals.RESOURCE_REF;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, JavaeePackage.RESOURCE_REF__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getResRefName() {
-		return resRefName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setResRefName(String newResRefName) {
-		String oldResRefName = resRefName;
-		resRefName = newResRefName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.RESOURCE_REF__RES_REF_NAME, oldResRefName, resRefName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getResType() {
-		return resType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setResType(String newResType) {
-		String oldResType = resType;
-		resType = newResType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.RESOURCE_REF__RES_TYPE, oldResType, resType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResAuthType getResAuth() {
-		return resAuth;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setResAuth(ResAuthType newResAuth) {
-		ResAuthType oldResAuth = resAuth;
-		resAuth = newResAuth == null ? RES_AUTH_EDEFAULT : newResAuth;
-		boolean oldResAuthESet = resAuthESet;
-		resAuthESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.RESOURCE_REF__RES_AUTH, oldResAuth, resAuth, !oldResAuthESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetResAuth() {
-		ResAuthType oldResAuth = resAuth;
-		boolean oldResAuthESet = resAuthESet;
-		resAuth = RES_AUTH_EDEFAULT;
-		resAuthESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, JavaeePackage.RESOURCE_REF__RES_AUTH, oldResAuth, RES_AUTH_EDEFAULT, oldResAuthESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetResAuth() {
-		return resAuthESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResSharingScopeType getResSharingScope() {
-		return resSharingScope;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setResSharingScope(ResSharingScopeType newResSharingScope) {
-		ResSharingScopeType oldResSharingScope = resSharingScope;
-		resSharingScope = newResSharingScope == null ? RES_SHARING_SCOPE_EDEFAULT : newResSharingScope;
-		boolean oldResSharingScopeESet = resSharingScopeESet;
-		resSharingScopeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.RESOURCE_REF__RES_SHARING_SCOPE, oldResSharingScope, resSharingScope, !oldResSharingScopeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetResSharingScope() {
-		ResSharingScopeType oldResSharingScope = resSharingScope;
-		boolean oldResSharingScopeESet = resSharingScopeESet;
-		resSharingScope = RES_SHARING_SCOPE_EDEFAULT;
-		resSharingScopeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, JavaeePackage.RESOURCE_REF__RES_SHARING_SCOPE, oldResSharingScope, RES_SHARING_SCOPE_EDEFAULT, oldResSharingScopeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetResSharingScope() {
-		return resSharingScopeESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getMappedName() {
-		return mappedName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMappedName(String newMappedName) {
-		String oldMappedName = mappedName;
-		mappedName = newMappedName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.RESOURCE_REF__MAPPED_NAME, oldMappedName, mappedName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getInjectionTargets() {
-		if (injectionTargets == null) {
-			injectionTargets = new EObjectContainmentEList(InjectionTarget.class, this, JavaeePackage.RESOURCE_REF__INJECTION_TARGETS);
-		}
-		return injectionTargets;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.RESOURCE_REF__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JavaeePackage.RESOURCE_REF__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-			case JavaeePackage.RESOURCE_REF__INJECTION_TARGETS:
-				return ((InternalEList)getInjectionTargets()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JavaeePackage.RESOURCE_REF__DESCRIPTIONS:
-				return getDescriptions();
-			case JavaeePackage.RESOURCE_REF__RES_REF_NAME:
-				return getResRefName();
-			case JavaeePackage.RESOURCE_REF__RES_TYPE:
-				return getResType();
-			case JavaeePackage.RESOURCE_REF__RES_AUTH:
-				return getResAuth();
-			case JavaeePackage.RESOURCE_REF__RES_SHARING_SCOPE:
-				return getResSharingScope();
-			case JavaeePackage.RESOURCE_REF__MAPPED_NAME:
-				return getMappedName();
-			case JavaeePackage.RESOURCE_REF__INJECTION_TARGETS:
-				return getInjectionTargets();
-			case JavaeePackage.RESOURCE_REF__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JavaeePackage.RESOURCE_REF__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case JavaeePackage.RESOURCE_REF__RES_REF_NAME:
-				setResRefName((String)newValue);
-				return;
-			case JavaeePackage.RESOURCE_REF__RES_TYPE:
-				setResType((String)newValue);
-				return;
-			case JavaeePackage.RESOURCE_REF__RES_AUTH:
-				setResAuth((ResAuthType)newValue);
-				return;
-			case JavaeePackage.RESOURCE_REF__RES_SHARING_SCOPE:
-				setResSharingScope((ResSharingScopeType)newValue);
-				return;
-			case JavaeePackage.RESOURCE_REF__MAPPED_NAME:
-				setMappedName((String)newValue);
-				return;
-			case JavaeePackage.RESOURCE_REF__INJECTION_TARGETS:
-				getInjectionTargets().clear();
-				getInjectionTargets().addAll((Collection)newValue);
-				return;
-			case JavaeePackage.RESOURCE_REF__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.RESOURCE_REF__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case JavaeePackage.RESOURCE_REF__RES_REF_NAME:
-				setResRefName(RES_REF_NAME_EDEFAULT);
-				return;
-			case JavaeePackage.RESOURCE_REF__RES_TYPE:
-				setResType(RES_TYPE_EDEFAULT);
-				return;
-			case JavaeePackage.RESOURCE_REF__RES_AUTH:
-				unsetResAuth();
-				return;
-			case JavaeePackage.RESOURCE_REF__RES_SHARING_SCOPE:
-				unsetResSharingScope();
-				return;
-			case JavaeePackage.RESOURCE_REF__MAPPED_NAME:
-				setMappedName(MAPPED_NAME_EDEFAULT);
-				return;
-			case JavaeePackage.RESOURCE_REF__INJECTION_TARGETS:
-				getInjectionTargets().clear();
-				return;
-			case JavaeePackage.RESOURCE_REF__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.RESOURCE_REF__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case JavaeePackage.RESOURCE_REF__RES_REF_NAME:
-				return RES_REF_NAME_EDEFAULT == null ? resRefName != null : !RES_REF_NAME_EDEFAULT.equals(resRefName);
-			case JavaeePackage.RESOURCE_REF__RES_TYPE:
-				return RES_TYPE_EDEFAULT == null ? resType != null : !RES_TYPE_EDEFAULT.equals(resType);
-			case JavaeePackage.RESOURCE_REF__RES_AUTH:
-				return isSetResAuth();
-			case JavaeePackage.RESOURCE_REF__RES_SHARING_SCOPE:
-				return isSetResSharingScope();
-			case JavaeePackage.RESOURCE_REF__MAPPED_NAME:
-				return MAPPED_NAME_EDEFAULT == null ? mappedName != null : !MAPPED_NAME_EDEFAULT.equals(mappedName);
-			case JavaeePackage.RESOURCE_REF__INJECTION_TARGETS:
-				return injectionTargets != null && !injectionTargets.isEmpty();
-			case JavaeePackage.RESOURCE_REF__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (resRefName: "); //$NON-NLS-1$
-		result.append(resRefName);
-		result.append(", resType: "); //$NON-NLS-1$
-		result.append(resType);
-		result.append(", resAuth: "); //$NON-NLS-1$
-		if (resAuthESet) result.append(resAuth); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(", resSharingScope: "); //$NON-NLS-1$
-		if (resSharingScopeESet) result.append(resSharingScope); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(", mappedName: "); //$NON-NLS-1$
-		result.append(mappedName);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ResourceRefImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/RunAsImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/RunAsImpl.java
deleted file mode 100644
index e25b708a3..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/RunAsImpl.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core.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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jst.javaee.core.Description;
-import org.eclipse.jst.javaee.core.RunAs;
-
-import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Run As</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.RunAsImpl#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.RunAsImpl#getRoleName <em>Role Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.RunAsImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class RunAsImpl extends EObjectImpl implements RunAs {
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The default value of the '{@link #getRoleName() <em>Role Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRoleName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ROLE_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getRoleName() <em>Role Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRoleName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String roleName = ROLE_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RunAsImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JavaeePackage.Literals.RUN_AS;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, JavaeePackage.RUN_AS__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getRoleName() {
-		return roleName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRoleName(String newRoleName) {
-		String oldRoleName = roleName;
-		roleName = newRoleName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.RUN_AS__ROLE_NAME, oldRoleName, roleName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.RUN_AS__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JavaeePackage.RUN_AS__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JavaeePackage.RUN_AS__DESCRIPTIONS:
-				return getDescriptions();
-			case JavaeePackage.RUN_AS__ROLE_NAME:
-				return getRoleName();
-			case JavaeePackage.RUN_AS__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JavaeePackage.RUN_AS__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case JavaeePackage.RUN_AS__ROLE_NAME:
-				setRoleName((String)newValue);
-				return;
-			case JavaeePackage.RUN_AS__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.RUN_AS__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case JavaeePackage.RUN_AS__ROLE_NAME:
-				setRoleName(ROLE_NAME_EDEFAULT);
-				return;
-			case JavaeePackage.RUN_AS__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.RUN_AS__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case JavaeePackage.RUN_AS__ROLE_NAME:
-				return ROLE_NAME_EDEFAULT == null ? roleName != null : !ROLE_NAME_EDEFAULT.equals(roleName);
-			case JavaeePackage.RUN_AS__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (roleName: "); //$NON-NLS-1$
-		result.append(roleName);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //RunAsImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/SecurityRoleImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/SecurityRoleImpl.java
deleted file mode 100644
index fb3433839..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/SecurityRoleImpl.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core.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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jst.javaee.core.Description;
-import org.eclipse.jst.javaee.core.SecurityRole;
-
-import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Security Role</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.SecurityRoleImpl#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.SecurityRoleImpl#getRoleName <em>Role Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.SecurityRoleImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SecurityRoleImpl extends EObjectImpl implements SecurityRole {
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The default value of the '{@link #getRoleName() <em>Role Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRoleName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ROLE_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getRoleName() <em>Role Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRoleName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String roleName = ROLE_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SecurityRoleImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JavaeePackage.Literals.SECURITY_ROLE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, JavaeePackage.SECURITY_ROLE__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getRoleName() {
-		return roleName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRoleName(String newRoleName) {
-		String oldRoleName = roleName;
-		roleName = newRoleName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.SECURITY_ROLE__ROLE_NAME, oldRoleName, roleName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.SECURITY_ROLE__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JavaeePackage.SECURITY_ROLE__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JavaeePackage.SECURITY_ROLE__DESCRIPTIONS:
-				return getDescriptions();
-			case JavaeePackage.SECURITY_ROLE__ROLE_NAME:
-				return getRoleName();
-			case JavaeePackage.SECURITY_ROLE__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JavaeePackage.SECURITY_ROLE__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case JavaeePackage.SECURITY_ROLE__ROLE_NAME:
-				setRoleName((String)newValue);
-				return;
-			case JavaeePackage.SECURITY_ROLE__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.SECURITY_ROLE__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case JavaeePackage.SECURITY_ROLE__ROLE_NAME:
-				setRoleName(ROLE_NAME_EDEFAULT);
-				return;
-			case JavaeePackage.SECURITY_ROLE__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.SECURITY_ROLE__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case JavaeePackage.SECURITY_ROLE__ROLE_NAME:
-				return ROLE_NAME_EDEFAULT == null ? roleName != null : !ROLE_NAME_EDEFAULT.equals(roleName);
-			case JavaeePackage.SECURITY_ROLE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (roleName: "); //$NON-NLS-1$
-		result.append(roleName);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //SecurityRoleImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/SecurityRoleRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/SecurityRoleRefImpl.java
deleted file mode 100644
index f1ddc9138..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/SecurityRoleRefImpl.java
+++ /dev/null
@@ -1,332 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core.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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jst.javaee.core.Description;
-import org.eclipse.jst.javaee.core.SecurityRoleRef;
-
-import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Security Role Ref</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.SecurityRoleRefImpl#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.SecurityRoleRefImpl#getRoleName <em>Role Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.SecurityRoleRefImpl#getRoleLink <em>Role Link</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.SecurityRoleRefImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SecurityRoleRefImpl extends EObjectImpl implements SecurityRoleRef {
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The default value of the '{@link #getRoleName() <em>Role Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRoleName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ROLE_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getRoleName() <em>Role Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRoleName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String roleName = ROLE_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getRoleLink() <em>Role Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRoleLink()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ROLE_LINK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getRoleLink() <em>Role Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRoleLink()
-	 * @generated
-	 * @ordered
-	 */
-	protected String roleLink = ROLE_LINK_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SecurityRoleRefImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JavaeePackage.Literals.SECURITY_ROLE_REF;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, JavaeePackage.SECURITY_ROLE_REF__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getRoleName() {
-		return roleName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRoleName(String newRoleName) {
-		String oldRoleName = roleName;
-		roleName = newRoleName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.SECURITY_ROLE_REF__ROLE_NAME, oldRoleName, roleName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getRoleLink() {
-		return roleLink;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRoleLink(String newRoleLink) {
-		String oldRoleLink = roleLink;
-		roleLink = newRoleLink;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.SECURITY_ROLE_REF__ROLE_LINK, oldRoleLink, roleLink));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.SECURITY_ROLE_REF__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JavaeePackage.SECURITY_ROLE_REF__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JavaeePackage.SECURITY_ROLE_REF__DESCRIPTIONS:
-				return getDescriptions();
-			case JavaeePackage.SECURITY_ROLE_REF__ROLE_NAME:
-				return getRoleName();
-			case JavaeePackage.SECURITY_ROLE_REF__ROLE_LINK:
-				return getRoleLink();
-			case JavaeePackage.SECURITY_ROLE_REF__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JavaeePackage.SECURITY_ROLE_REF__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case JavaeePackage.SECURITY_ROLE_REF__ROLE_NAME:
-				setRoleName((String)newValue);
-				return;
-			case JavaeePackage.SECURITY_ROLE_REF__ROLE_LINK:
-				setRoleLink((String)newValue);
-				return;
-			case JavaeePackage.SECURITY_ROLE_REF__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.SECURITY_ROLE_REF__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case JavaeePackage.SECURITY_ROLE_REF__ROLE_NAME:
-				setRoleName(ROLE_NAME_EDEFAULT);
-				return;
-			case JavaeePackage.SECURITY_ROLE_REF__ROLE_LINK:
-				setRoleLink(ROLE_LINK_EDEFAULT);
-				return;
-			case JavaeePackage.SECURITY_ROLE_REF__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.SECURITY_ROLE_REF__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case JavaeePackage.SECURITY_ROLE_REF__ROLE_NAME:
-				return ROLE_NAME_EDEFAULT == null ? roleName != null : !ROLE_NAME_EDEFAULT.equals(roleName);
-			case JavaeePackage.SECURITY_ROLE_REF__ROLE_LINK:
-				return ROLE_LINK_EDEFAULT == null ? roleLink != null : !ROLE_LINK_EDEFAULT.equals(roleLink);
-			case JavaeePackage.SECURITY_ROLE_REF__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (roleName: "); //$NON-NLS-1$
-		result.append(roleName);
-		result.append(", roleLink: "); //$NON-NLS-1$
-		result.append(roleLink);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //SecurityRoleRefImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/ServiceRefHandlerChainImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/ServiceRefHandlerChainImpl.java
deleted file mode 100644
index 46ed03555..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/ServiceRefHandlerChainImpl.java
+++ /dev/null
@@ -1,386 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core.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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jst.javaee.core.ServiceRefHandler;
-import org.eclipse.jst.javaee.core.ServiceRefHandlerChain;
-
-import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Service Ref Handler Chain</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefHandlerChainImpl#getServiceNamePattern <em>Service Name Pattern</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefHandlerChainImpl#getPortNamePattern <em>Port Name Pattern</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefHandlerChainImpl#getProtocolBindings <em>Protocol Bindings</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefHandlerChainImpl#getHandlers <em>Handlers</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefHandlerChainImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ServiceRefHandlerChainImpl extends EObjectImpl implements ServiceRefHandlerChain {
-	/**
-	 * The default value of the '{@link #getServiceNamePattern() <em>Service Name Pattern</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getServiceNamePattern()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SERVICE_NAME_PATTERN_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getServiceNamePattern() <em>Service Name Pattern</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getServiceNamePattern()
-	 * @generated
-	 * @ordered
-	 */
-	protected String serviceNamePattern = SERVICE_NAME_PATTERN_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPortNamePattern() <em>Port Name Pattern</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPortNamePattern()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PORT_NAME_PATTERN_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPortNamePattern() <em>Port Name Pattern</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPortNamePattern()
-	 * @generated
-	 * @ordered
-	 */
-	protected String portNamePattern = PORT_NAME_PATTERN_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getProtocolBindings() <em>Protocol Bindings</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProtocolBindings()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final List PROTOCOL_BINDINGS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getProtocolBindings() <em>Protocol Bindings</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProtocolBindings()
-	 * @generated
-	 * @ordered
-	 */
-	protected List protocolBindings = PROTOCOL_BINDINGS_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getHandlers() <em>Handlers</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHandlers()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList handlers = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ServiceRefHandlerChainImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JavaeePackage.Literals.SERVICE_REF_HANDLER_CHAIN;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getServiceNamePattern() {
-		return serviceNamePattern;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setServiceNamePattern(String newServiceNamePattern) {
-		String oldServiceNamePattern = serviceNamePattern;
-		serviceNamePattern = newServiceNamePattern;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.SERVICE_REF_HANDLER_CHAIN__SERVICE_NAME_PATTERN, oldServiceNamePattern, serviceNamePattern));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPortNamePattern() {
-		return portNamePattern;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPortNamePattern(String newPortNamePattern) {
-		String oldPortNamePattern = portNamePattern;
-		portNamePattern = newPortNamePattern;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.SERVICE_REF_HANDLER_CHAIN__PORT_NAME_PATTERN, oldPortNamePattern, portNamePattern));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getProtocolBindings() {
-		return protocolBindings;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setProtocolBindings(List newProtocolBindings) {
-		List oldProtocolBindings = protocolBindings;
-		protocolBindings = newProtocolBindings;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.SERVICE_REF_HANDLER_CHAIN__PROTOCOL_BINDINGS, oldProtocolBindings, protocolBindings));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getHandlers() {
-		if (handlers == null) {
-			handlers = new EObjectContainmentEList(ServiceRefHandler.class, this, JavaeePackage.SERVICE_REF_HANDLER_CHAIN__HANDLERS);
-		}
-		return handlers;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.SERVICE_REF_HANDLER_CHAIN__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JavaeePackage.SERVICE_REF_HANDLER_CHAIN__HANDLERS:
-				return ((InternalEList)getHandlers()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JavaeePackage.SERVICE_REF_HANDLER_CHAIN__SERVICE_NAME_PATTERN:
-				return getServiceNamePattern();
-			case JavaeePackage.SERVICE_REF_HANDLER_CHAIN__PORT_NAME_PATTERN:
-				return getPortNamePattern();
-			case JavaeePackage.SERVICE_REF_HANDLER_CHAIN__PROTOCOL_BINDINGS:
-				return getProtocolBindings();
-			case JavaeePackage.SERVICE_REF_HANDLER_CHAIN__HANDLERS:
-				return getHandlers();
-			case JavaeePackage.SERVICE_REF_HANDLER_CHAIN__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JavaeePackage.SERVICE_REF_HANDLER_CHAIN__SERVICE_NAME_PATTERN:
-				setServiceNamePattern((String)newValue);
-				return;
-			case JavaeePackage.SERVICE_REF_HANDLER_CHAIN__PORT_NAME_PATTERN:
-				setPortNamePattern((String)newValue);
-				return;
-			case JavaeePackage.SERVICE_REF_HANDLER_CHAIN__PROTOCOL_BINDINGS:
-				setProtocolBindings((List)newValue);
-				return;
-			case JavaeePackage.SERVICE_REF_HANDLER_CHAIN__HANDLERS:
-				getHandlers().clear();
-				getHandlers().addAll((Collection)newValue);
-				return;
-			case JavaeePackage.SERVICE_REF_HANDLER_CHAIN__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.SERVICE_REF_HANDLER_CHAIN__SERVICE_NAME_PATTERN:
-				setServiceNamePattern(SERVICE_NAME_PATTERN_EDEFAULT);
-				return;
-			case JavaeePackage.SERVICE_REF_HANDLER_CHAIN__PORT_NAME_PATTERN:
-				setPortNamePattern(PORT_NAME_PATTERN_EDEFAULT);
-				return;
-			case JavaeePackage.SERVICE_REF_HANDLER_CHAIN__PROTOCOL_BINDINGS:
-				setProtocolBindings(PROTOCOL_BINDINGS_EDEFAULT);
-				return;
-			case JavaeePackage.SERVICE_REF_HANDLER_CHAIN__HANDLERS:
-				getHandlers().clear();
-				return;
-			case JavaeePackage.SERVICE_REF_HANDLER_CHAIN__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.SERVICE_REF_HANDLER_CHAIN__SERVICE_NAME_PATTERN:
-				return SERVICE_NAME_PATTERN_EDEFAULT == null ? serviceNamePattern != null : !SERVICE_NAME_PATTERN_EDEFAULT.equals(serviceNamePattern);
-			case JavaeePackage.SERVICE_REF_HANDLER_CHAIN__PORT_NAME_PATTERN:
-				return PORT_NAME_PATTERN_EDEFAULT == null ? portNamePattern != null : !PORT_NAME_PATTERN_EDEFAULT.equals(portNamePattern);
-			case JavaeePackage.SERVICE_REF_HANDLER_CHAIN__PROTOCOL_BINDINGS:
-				return PROTOCOL_BINDINGS_EDEFAULT == null ? protocolBindings != null : !PROTOCOL_BINDINGS_EDEFAULT.equals(protocolBindings);
-			case JavaeePackage.SERVICE_REF_HANDLER_CHAIN__HANDLERS:
-				return handlers != null && !handlers.isEmpty();
-			case JavaeePackage.SERVICE_REF_HANDLER_CHAIN__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (serviceNamePattern: "); //$NON-NLS-1$
-		result.append(serviceNamePattern);
-		result.append(", portNamePattern: "); //$NON-NLS-1$
-		result.append(portNamePattern);
-		result.append(", protocolBindings: "); //$NON-NLS-1$
-		result.append(protocolBindings);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ServiceRefHandlerChainImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/ServiceRefHandlerChainsImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/ServiceRefHandlerChainsImpl.java
deleted file mode 100644
index 3c92ac55e..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/ServiceRefHandlerChainsImpl.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core.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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jst.javaee.core.ServiceRefHandlerChain;
-import org.eclipse.jst.javaee.core.ServiceRefHandlerChains;
-
-import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Service Ref Handler Chains</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefHandlerChainsImpl#getHandlerChains <em>Handler Chains</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefHandlerChainsImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ServiceRefHandlerChainsImpl extends EObjectImpl implements ServiceRefHandlerChains {
-	/**
-	 * The cached value of the '{@link #getHandlerChains() <em>Handler Chains</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHandlerChains()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList handlerChains = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ServiceRefHandlerChainsImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JavaeePackage.Literals.SERVICE_REF_HANDLER_CHAINS;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getHandlerChains() {
-		if (handlerChains == null) {
-			handlerChains = new EObjectContainmentEList(ServiceRefHandlerChain.class, this, JavaeePackage.SERVICE_REF_HANDLER_CHAINS__HANDLER_CHAINS);
-		}
-		return handlerChains;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.SERVICE_REF_HANDLER_CHAINS__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JavaeePackage.SERVICE_REF_HANDLER_CHAINS__HANDLER_CHAINS:
-				return ((InternalEList)getHandlerChains()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JavaeePackage.SERVICE_REF_HANDLER_CHAINS__HANDLER_CHAINS:
-				return getHandlerChains();
-			case JavaeePackage.SERVICE_REF_HANDLER_CHAINS__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JavaeePackage.SERVICE_REF_HANDLER_CHAINS__HANDLER_CHAINS:
-				getHandlerChains().clear();
-				getHandlerChains().addAll((Collection)newValue);
-				return;
-			case JavaeePackage.SERVICE_REF_HANDLER_CHAINS__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.SERVICE_REF_HANDLER_CHAINS__HANDLER_CHAINS:
-				getHandlerChains().clear();
-				return;
-			case JavaeePackage.SERVICE_REF_HANDLER_CHAINS__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.SERVICE_REF_HANDLER_CHAINS__HANDLER_CHAINS:
-				return handlerChains != null && !handlerChains.isEmpty();
-			case JavaeePackage.SERVICE_REF_HANDLER_CHAINS__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	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();
-	}
-
-} //ServiceRefHandlerChainsImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/ServiceRefHandlerImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/ServiceRefHandlerImpl.java
deleted file mode 100644
index 7a3daf8a5..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/ServiceRefHandlerImpl.java
+++ /dev/null
@@ -1,552 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core.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.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-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.ParamValue;
-import org.eclipse.jst.javaee.core.ServiceRefHandler;
-
-import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Service Ref Handler</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefHandlerImpl#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefHandlerImpl#getDisplayNames <em>Display Names</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefHandlerImpl#getIcons <em>Icons</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefHandlerImpl#getHandlerName <em>Handler Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefHandlerImpl#getHandlerClass <em>Handler Class</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefHandlerImpl#getInitParams <em>Init Params</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefHandlerImpl#getSoapHeaders <em>Soap Headers</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefHandlerImpl#getSoapRoles <em>Soap Roles</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefHandlerImpl#getPortNames <em>Port Names</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefHandlerImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ServiceRefHandlerImpl extends EObjectImpl implements ServiceRefHandler {
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayNames() <em>Display Names</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayNames()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList displayNames = null;
-
-	/**
-	 * The cached value of the '{@link #getIcons() <em>Icons</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIcons()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList icons = null;
-
-	/**
-	 * The default value of the '{@link #getHandlerName() <em>Handler Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHandlerName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String HANDLER_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getHandlerName() <em>Handler Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHandlerName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String handlerName = HANDLER_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getHandlerClass() <em>Handler Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHandlerClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String HANDLER_CLASS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getHandlerClass() <em>Handler Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHandlerClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected String handlerClass = HANDLER_CLASS_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getInitParams() <em>Init Params</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInitParams()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList initParams = null;
-
-	/**
-	 * The cached value of the '{@link #getSoapHeaders() <em>Soap Headers</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSoapHeaders()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList soapHeaders = null;
-
-	/**
-	 * The cached value of the '{@link #getSoapRoles() <em>Soap Roles</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSoapRoles()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList soapRoles = null;
-
-	/**
-	 * The cached value of the '{@link #getPortNames() <em>Port Names</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPortNames()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList portNames = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ServiceRefHandlerImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JavaeePackage.Literals.SERVICE_REF_HANDLER;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, JavaeePackage.SERVICE_REF_HANDLER__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDisplayNames() {
-		if (displayNames == null) {
-			displayNames = new EObjectContainmentEList(DisplayName.class, this, JavaeePackage.SERVICE_REF_HANDLER__DISPLAY_NAMES);
-		}
-		return displayNames;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getIcons() {
-		if (icons == null) {
-			icons = new EObjectContainmentEList(Icon.class, this, JavaeePackage.SERVICE_REF_HANDLER__ICONS);
-		}
-		return icons;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getHandlerName() {
-		return handlerName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHandlerName(String newHandlerName) {
-		String oldHandlerName = handlerName;
-		handlerName = newHandlerName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.SERVICE_REF_HANDLER__HANDLER_NAME, oldHandlerName, handlerName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getHandlerClass() {
-		return handlerClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHandlerClass(String newHandlerClass) {
-		String oldHandlerClass = handlerClass;
-		handlerClass = newHandlerClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.SERVICE_REF_HANDLER__HANDLER_CLASS, oldHandlerClass, handlerClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getInitParams() {
-		if (initParams == null) {
-			initParams = new EObjectContainmentEList(ParamValue.class, this, JavaeePackage.SERVICE_REF_HANDLER__INIT_PARAMS);
-		}
-		return initParams;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getSoapHeaders() {
-		if (soapHeaders == null) {
-			soapHeaders = new EDataTypeEList(Object.class, this, JavaeePackage.SERVICE_REF_HANDLER__SOAP_HEADERS);
-		}
-		return soapHeaders;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getSoapRoles() {
-		if (soapRoles == null) {
-			soapRoles = new EDataTypeEList(String.class, this, JavaeePackage.SERVICE_REF_HANDLER__SOAP_ROLES);
-		}
-		return soapRoles;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPortNames() {
-		if (portNames == null) {
-			portNames = new EDataTypeEList(String.class, this, JavaeePackage.SERVICE_REF_HANDLER__PORT_NAMES);
-		}
-		return portNames;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.SERVICE_REF_HANDLER__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JavaeePackage.SERVICE_REF_HANDLER__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-			case JavaeePackage.SERVICE_REF_HANDLER__DISPLAY_NAMES:
-				return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
-			case JavaeePackage.SERVICE_REF_HANDLER__ICONS:
-				return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
-			case JavaeePackage.SERVICE_REF_HANDLER__INIT_PARAMS:
-				return ((InternalEList)getInitParams()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JavaeePackage.SERVICE_REF_HANDLER__DESCRIPTIONS:
-				return getDescriptions();
-			case JavaeePackage.SERVICE_REF_HANDLER__DISPLAY_NAMES:
-				return getDisplayNames();
-			case JavaeePackage.SERVICE_REF_HANDLER__ICONS:
-				return getIcons();
-			case JavaeePackage.SERVICE_REF_HANDLER__HANDLER_NAME:
-				return getHandlerName();
-			case JavaeePackage.SERVICE_REF_HANDLER__HANDLER_CLASS:
-				return getHandlerClass();
-			case JavaeePackage.SERVICE_REF_HANDLER__INIT_PARAMS:
-				return getInitParams();
-			case JavaeePackage.SERVICE_REF_HANDLER__SOAP_HEADERS:
-				return getSoapHeaders();
-			case JavaeePackage.SERVICE_REF_HANDLER__SOAP_ROLES:
-				return getSoapRoles();
-			case JavaeePackage.SERVICE_REF_HANDLER__PORT_NAMES:
-				return getPortNames();
-			case JavaeePackage.SERVICE_REF_HANDLER__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JavaeePackage.SERVICE_REF_HANDLER__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case JavaeePackage.SERVICE_REF_HANDLER__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				getDisplayNames().addAll((Collection)newValue);
-				return;
-			case JavaeePackage.SERVICE_REF_HANDLER__ICONS:
-				getIcons().clear();
-				getIcons().addAll((Collection)newValue);
-				return;
-			case JavaeePackage.SERVICE_REF_HANDLER__HANDLER_NAME:
-				setHandlerName((String)newValue);
-				return;
-			case JavaeePackage.SERVICE_REF_HANDLER__HANDLER_CLASS:
-				setHandlerClass((String)newValue);
-				return;
-			case JavaeePackage.SERVICE_REF_HANDLER__INIT_PARAMS:
-				getInitParams().clear();
-				getInitParams().addAll((Collection)newValue);
-				return;
-			case JavaeePackage.SERVICE_REF_HANDLER__SOAP_HEADERS:
-				getSoapHeaders().clear();
-				getSoapHeaders().addAll((Collection)newValue);
-				return;
-			case JavaeePackage.SERVICE_REF_HANDLER__SOAP_ROLES:
-				getSoapRoles().clear();
-				getSoapRoles().addAll((Collection)newValue);
-				return;
-			case JavaeePackage.SERVICE_REF_HANDLER__PORT_NAMES:
-				getPortNames().clear();
-				getPortNames().addAll((Collection)newValue);
-				return;
-			case JavaeePackage.SERVICE_REF_HANDLER__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.SERVICE_REF_HANDLER__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case JavaeePackage.SERVICE_REF_HANDLER__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				return;
-			case JavaeePackage.SERVICE_REF_HANDLER__ICONS:
-				getIcons().clear();
-				return;
-			case JavaeePackage.SERVICE_REF_HANDLER__HANDLER_NAME:
-				setHandlerName(HANDLER_NAME_EDEFAULT);
-				return;
-			case JavaeePackage.SERVICE_REF_HANDLER__HANDLER_CLASS:
-				setHandlerClass(HANDLER_CLASS_EDEFAULT);
-				return;
-			case JavaeePackage.SERVICE_REF_HANDLER__INIT_PARAMS:
-				getInitParams().clear();
-				return;
-			case JavaeePackage.SERVICE_REF_HANDLER__SOAP_HEADERS:
-				getSoapHeaders().clear();
-				return;
-			case JavaeePackage.SERVICE_REF_HANDLER__SOAP_ROLES:
-				getSoapRoles().clear();
-				return;
-			case JavaeePackage.SERVICE_REF_HANDLER__PORT_NAMES:
-				getPortNames().clear();
-				return;
-			case JavaeePackage.SERVICE_REF_HANDLER__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.SERVICE_REF_HANDLER__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case JavaeePackage.SERVICE_REF_HANDLER__DISPLAY_NAMES:
-				return displayNames != null && !displayNames.isEmpty();
-			case JavaeePackage.SERVICE_REF_HANDLER__ICONS:
-				return icons != null && !icons.isEmpty();
-			case JavaeePackage.SERVICE_REF_HANDLER__HANDLER_NAME:
-				return HANDLER_NAME_EDEFAULT == null ? handlerName != null : !HANDLER_NAME_EDEFAULT.equals(handlerName);
-			case JavaeePackage.SERVICE_REF_HANDLER__HANDLER_CLASS:
-				return HANDLER_CLASS_EDEFAULT == null ? handlerClass != null : !HANDLER_CLASS_EDEFAULT.equals(handlerClass);
-			case JavaeePackage.SERVICE_REF_HANDLER__INIT_PARAMS:
-				return initParams != null && !initParams.isEmpty();
-			case JavaeePackage.SERVICE_REF_HANDLER__SOAP_HEADERS:
-				return soapHeaders != null && !soapHeaders.isEmpty();
-			case JavaeePackage.SERVICE_REF_HANDLER__SOAP_ROLES:
-				return soapRoles != null && !soapRoles.isEmpty();
-			case JavaeePackage.SERVICE_REF_HANDLER__PORT_NAMES:
-				return portNames != null && !portNames.isEmpty();
-			case JavaeePackage.SERVICE_REF_HANDLER__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (handlerName: "); //$NON-NLS-1$
-		result.append(handlerName);
-		result.append(", handlerClass: "); //$NON-NLS-1$
-		result.append(handlerClass);
-		result.append(", soapHeaders: "); //$NON-NLS-1$
-		result.append(soapHeaders);
-		result.append(", soapRoles: "); //$NON-NLS-1$
-		result.append(soapRoles);
-		result.append(", portNames: "); //$NON-NLS-1$
-		result.append(portNames);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ServiceRefHandlerImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/ServiceRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/ServiceRefImpl.java
deleted file mode 100644
index de798136e..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/ServiceRefImpl.java
+++ /dev/null
@@ -1,854 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core.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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-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.InjectionTarget;
-import org.eclipse.jst.javaee.core.PortComponentRef;
-import org.eclipse.jst.javaee.core.ServiceRef;
-import org.eclipse.jst.javaee.core.ServiceRefHandler;
-import org.eclipse.jst.javaee.core.ServiceRefHandlerChains;
-
-import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Service Ref</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefImpl#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefImpl#getDisplayNames <em>Display Names</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefImpl#getIcons <em>Icons</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefImpl#getServiceRefName <em>Service Ref Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefImpl#getServiceInterface <em>Service Interface</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefImpl#getServiceRefType <em>Service Ref Type</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefImpl#getWsdlFile <em>Wsdl File</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefImpl#getJaxrpcMappingFile <em>Jaxrpc Mapping File</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefImpl#getServiceQname <em>Service Qname</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefImpl#getPortComponentRefs <em>Port Component Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefImpl#getHandlers <em>Handlers</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefImpl#getHandlerChains <em>Handler Chains</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefImpl#getMappedName <em>Mapped Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefImpl#getInjectionTargets <em>Injection Targets</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ServiceRefImpl extends EObjectImpl implements ServiceRef {
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayNames() <em>Display Names</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayNames()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList displayNames = null;
-
-	/**
-	 * The cached value of the '{@link #getIcons() <em>Icons</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIcons()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList icons = null;
-
-	/**
-	 * The default value of the '{@link #getServiceRefName() <em>Service Ref Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getServiceRefName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SERVICE_REF_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getServiceRefName() <em>Service Ref Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getServiceRefName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String serviceRefName = SERVICE_REF_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getServiceInterface() <em>Service Interface</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getServiceInterface()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SERVICE_INTERFACE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getServiceInterface() <em>Service Interface</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getServiceInterface()
-	 * @generated
-	 * @ordered
-	 */
-	protected String serviceInterface = SERVICE_INTERFACE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getServiceRefType() <em>Service Ref Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getServiceRefType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SERVICE_REF_TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getServiceRefType() <em>Service Ref Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getServiceRefType()
-	 * @generated
-	 * @ordered
-	 */
-	protected String serviceRefType = SERVICE_REF_TYPE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getWsdlFile() <em>Wsdl File</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWsdlFile()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String WSDL_FILE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getWsdlFile() <em>Wsdl File</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWsdlFile()
-	 * @generated
-	 * @ordered
-	 */
-	protected String wsdlFile = WSDL_FILE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getJaxrpcMappingFile() <em>Jaxrpc Mapping File</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getJaxrpcMappingFile()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String JAXRPC_MAPPING_FILE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getJaxrpcMappingFile() <em>Jaxrpc Mapping File</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getJaxrpcMappingFile()
-	 * @generated
-	 * @ordered
-	 */
-	protected String jaxrpcMappingFile = JAXRPC_MAPPING_FILE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getServiceQname() <em>Service Qname</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getServiceQname()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object SERVICE_QNAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getServiceQname() <em>Service Qname</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getServiceQname()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object serviceQname = SERVICE_QNAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getPortComponentRefs() <em>Port Component Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPortComponentRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList portComponentRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getHandlers() <em>Handlers</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHandlers()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList handlers = null;
-
-	/**
-	 * The cached value of the '{@link #getHandlerChains() <em>Handler Chains</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHandlerChains()
-	 * @generated
-	 * @ordered
-	 */
-	protected ServiceRefHandlerChains handlerChains = null;
-
-	/**
-	 * The default value of the '{@link #getMappedName() <em>Mapped Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMappedName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MAPPED_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMappedName() <em>Mapped Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMappedName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String mappedName = MAPPED_NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getInjectionTargets() <em>Injection Targets</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInjectionTargets()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList injectionTargets = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ServiceRefImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JavaeePackage.Literals.SERVICE_REF;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, JavaeePackage.SERVICE_REF__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDisplayNames() {
-		if (displayNames == null) {
-			displayNames = new EObjectContainmentEList(DisplayName.class, this, JavaeePackage.SERVICE_REF__DISPLAY_NAMES);
-		}
-		return displayNames;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getIcons() {
-		if (icons == null) {
-			icons = new EObjectContainmentEList(Icon.class, this, JavaeePackage.SERVICE_REF__ICONS);
-		}
-		return icons;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getServiceRefName() {
-		return serviceRefName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setServiceRefName(String newServiceRefName) {
-		String oldServiceRefName = serviceRefName;
-		serviceRefName = newServiceRefName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.SERVICE_REF__SERVICE_REF_NAME, oldServiceRefName, serviceRefName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getServiceInterface() {
-		return serviceInterface;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setServiceInterface(String newServiceInterface) {
-		String oldServiceInterface = serviceInterface;
-		serviceInterface = newServiceInterface;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.SERVICE_REF__SERVICE_INTERFACE, oldServiceInterface, serviceInterface));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getServiceRefType() {
-		return serviceRefType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setServiceRefType(String newServiceRefType) {
-		String oldServiceRefType = serviceRefType;
-		serviceRefType = newServiceRefType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.SERVICE_REF__SERVICE_REF_TYPE, oldServiceRefType, serviceRefType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getWsdlFile() {
-		return wsdlFile;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setWsdlFile(String newWsdlFile) {
-		String oldWsdlFile = wsdlFile;
-		wsdlFile = newWsdlFile;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.SERVICE_REF__WSDL_FILE, oldWsdlFile, wsdlFile));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getJaxrpcMappingFile() {
-		return jaxrpcMappingFile;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setJaxrpcMappingFile(String newJaxrpcMappingFile) {
-		String oldJaxrpcMappingFile = jaxrpcMappingFile;
-		jaxrpcMappingFile = newJaxrpcMappingFile;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.SERVICE_REF__JAXRPC_MAPPING_FILE, oldJaxrpcMappingFile, jaxrpcMappingFile));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getServiceQname() {
-		return serviceQname;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setServiceQname(Object newServiceQname) {
-		Object oldServiceQname = serviceQname;
-		serviceQname = newServiceQname;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.SERVICE_REF__SERVICE_QNAME, oldServiceQname, serviceQname));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPortComponentRefs() {
-		if (portComponentRefs == null) {
-			portComponentRefs = new EObjectContainmentEList(PortComponentRef.class, this, JavaeePackage.SERVICE_REF__PORT_COMPONENT_REFS);
-		}
-		return portComponentRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getHandlers() {
-		if (handlers == null) {
-			handlers = new EObjectContainmentEList(ServiceRefHandler.class, this, JavaeePackage.SERVICE_REF__HANDLERS);
-		}
-		return handlers;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ServiceRefHandlerChains getHandlerChains() {
-		return handlerChains;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetHandlerChains(ServiceRefHandlerChains newHandlerChains, NotificationChain msgs) {
-		ServiceRefHandlerChains oldHandlerChains = handlerChains;
-		handlerChains = newHandlerChains;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JavaeePackage.SERVICE_REF__HANDLER_CHAINS, oldHandlerChains, newHandlerChains);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHandlerChains(ServiceRefHandlerChains newHandlerChains) {
-		if (newHandlerChains != handlerChains) {
-			NotificationChain msgs = null;
-			if (handlerChains != null)
-				msgs = ((InternalEObject)handlerChains).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JavaeePackage.SERVICE_REF__HANDLER_CHAINS, null, msgs);
-			if (newHandlerChains != null)
-				msgs = ((InternalEObject)newHandlerChains).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JavaeePackage.SERVICE_REF__HANDLER_CHAINS, null, msgs);
-			msgs = basicSetHandlerChains(newHandlerChains, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.SERVICE_REF__HANDLER_CHAINS, newHandlerChains, newHandlerChains));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getMappedName() {
-		return mappedName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMappedName(String newMappedName) {
-		String oldMappedName = mappedName;
-		mappedName = newMappedName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.SERVICE_REF__MAPPED_NAME, oldMappedName, mappedName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getInjectionTargets() {
-		if (injectionTargets == null) {
-			injectionTargets = new EObjectContainmentEList(InjectionTarget.class, this, JavaeePackage.SERVICE_REF__INJECTION_TARGETS);
-		}
-		return injectionTargets;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.SERVICE_REF__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JavaeePackage.SERVICE_REF__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-			case JavaeePackage.SERVICE_REF__DISPLAY_NAMES:
-				return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
-			case JavaeePackage.SERVICE_REF__ICONS:
-				return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
-			case JavaeePackage.SERVICE_REF__PORT_COMPONENT_REFS:
-				return ((InternalEList)getPortComponentRefs()).basicRemove(otherEnd, msgs);
-			case JavaeePackage.SERVICE_REF__HANDLERS:
-				return ((InternalEList)getHandlers()).basicRemove(otherEnd, msgs);
-			case JavaeePackage.SERVICE_REF__HANDLER_CHAINS:
-				return basicSetHandlerChains(null, msgs);
-			case JavaeePackage.SERVICE_REF__INJECTION_TARGETS:
-				return ((InternalEList)getInjectionTargets()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JavaeePackage.SERVICE_REF__DESCRIPTIONS:
-				return getDescriptions();
-			case JavaeePackage.SERVICE_REF__DISPLAY_NAMES:
-				return getDisplayNames();
-			case JavaeePackage.SERVICE_REF__ICONS:
-				return getIcons();
-			case JavaeePackage.SERVICE_REF__SERVICE_REF_NAME:
-				return getServiceRefName();
-			case JavaeePackage.SERVICE_REF__SERVICE_INTERFACE:
-				return getServiceInterface();
-			case JavaeePackage.SERVICE_REF__SERVICE_REF_TYPE:
-				return getServiceRefType();
-			case JavaeePackage.SERVICE_REF__WSDL_FILE:
-				return getWsdlFile();
-			case JavaeePackage.SERVICE_REF__JAXRPC_MAPPING_FILE:
-				return getJaxrpcMappingFile();
-			case JavaeePackage.SERVICE_REF__SERVICE_QNAME:
-				return getServiceQname();
-			case JavaeePackage.SERVICE_REF__PORT_COMPONENT_REFS:
-				return getPortComponentRefs();
-			case JavaeePackage.SERVICE_REF__HANDLERS:
-				return getHandlers();
-			case JavaeePackage.SERVICE_REF__HANDLER_CHAINS:
-				return getHandlerChains();
-			case JavaeePackage.SERVICE_REF__MAPPED_NAME:
-				return getMappedName();
-			case JavaeePackage.SERVICE_REF__INJECTION_TARGETS:
-				return getInjectionTargets();
-			case JavaeePackage.SERVICE_REF__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JavaeePackage.SERVICE_REF__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case JavaeePackage.SERVICE_REF__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				getDisplayNames().addAll((Collection)newValue);
-				return;
-			case JavaeePackage.SERVICE_REF__ICONS:
-				getIcons().clear();
-				getIcons().addAll((Collection)newValue);
-				return;
-			case JavaeePackage.SERVICE_REF__SERVICE_REF_NAME:
-				setServiceRefName((String)newValue);
-				return;
-			case JavaeePackage.SERVICE_REF__SERVICE_INTERFACE:
-				setServiceInterface((String)newValue);
-				return;
-			case JavaeePackage.SERVICE_REF__SERVICE_REF_TYPE:
-				setServiceRefType((String)newValue);
-				return;
-			case JavaeePackage.SERVICE_REF__WSDL_FILE:
-				setWsdlFile((String)newValue);
-				return;
-			case JavaeePackage.SERVICE_REF__JAXRPC_MAPPING_FILE:
-				setJaxrpcMappingFile((String)newValue);
-				return;
-			case JavaeePackage.SERVICE_REF__SERVICE_QNAME:
-				setServiceQname((Object)newValue);
-				return;
-			case JavaeePackage.SERVICE_REF__PORT_COMPONENT_REFS:
-				getPortComponentRefs().clear();
-				getPortComponentRefs().addAll((Collection)newValue);
-				return;
-			case JavaeePackage.SERVICE_REF__HANDLERS:
-				getHandlers().clear();
-				getHandlers().addAll((Collection)newValue);
-				return;
-			case JavaeePackage.SERVICE_REF__HANDLER_CHAINS:
-				setHandlerChains((ServiceRefHandlerChains)newValue);
-				return;
-			case JavaeePackage.SERVICE_REF__MAPPED_NAME:
-				setMappedName((String)newValue);
-				return;
-			case JavaeePackage.SERVICE_REF__INJECTION_TARGETS:
-				getInjectionTargets().clear();
-				getInjectionTargets().addAll((Collection)newValue);
-				return;
-			case JavaeePackage.SERVICE_REF__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.SERVICE_REF__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case JavaeePackage.SERVICE_REF__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				return;
-			case JavaeePackage.SERVICE_REF__ICONS:
-				getIcons().clear();
-				return;
-			case JavaeePackage.SERVICE_REF__SERVICE_REF_NAME:
-				setServiceRefName(SERVICE_REF_NAME_EDEFAULT);
-				return;
-			case JavaeePackage.SERVICE_REF__SERVICE_INTERFACE:
-				setServiceInterface(SERVICE_INTERFACE_EDEFAULT);
-				return;
-			case JavaeePackage.SERVICE_REF__SERVICE_REF_TYPE:
-				setServiceRefType(SERVICE_REF_TYPE_EDEFAULT);
-				return;
-			case JavaeePackage.SERVICE_REF__WSDL_FILE:
-				setWsdlFile(WSDL_FILE_EDEFAULT);
-				return;
-			case JavaeePackage.SERVICE_REF__JAXRPC_MAPPING_FILE:
-				setJaxrpcMappingFile(JAXRPC_MAPPING_FILE_EDEFAULT);
-				return;
-			case JavaeePackage.SERVICE_REF__SERVICE_QNAME:
-				setServiceQname(SERVICE_QNAME_EDEFAULT);
-				return;
-			case JavaeePackage.SERVICE_REF__PORT_COMPONENT_REFS:
-				getPortComponentRefs().clear();
-				return;
-			case JavaeePackage.SERVICE_REF__HANDLERS:
-				getHandlers().clear();
-				return;
-			case JavaeePackage.SERVICE_REF__HANDLER_CHAINS:
-				setHandlerChains((ServiceRefHandlerChains)null);
-				return;
-			case JavaeePackage.SERVICE_REF__MAPPED_NAME:
-				setMappedName(MAPPED_NAME_EDEFAULT);
-				return;
-			case JavaeePackage.SERVICE_REF__INJECTION_TARGETS:
-				getInjectionTargets().clear();
-				return;
-			case JavaeePackage.SERVICE_REF__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.SERVICE_REF__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case JavaeePackage.SERVICE_REF__DISPLAY_NAMES:
-				return displayNames != null && !displayNames.isEmpty();
-			case JavaeePackage.SERVICE_REF__ICONS:
-				return icons != null && !icons.isEmpty();
-			case JavaeePackage.SERVICE_REF__SERVICE_REF_NAME:
-				return SERVICE_REF_NAME_EDEFAULT == null ? serviceRefName != null : !SERVICE_REF_NAME_EDEFAULT.equals(serviceRefName);
-			case JavaeePackage.SERVICE_REF__SERVICE_INTERFACE:
-				return SERVICE_INTERFACE_EDEFAULT == null ? serviceInterface != null : !SERVICE_INTERFACE_EDEFAULT.equals(serviceInterface);
-			case JavaeePackage.SERVICE_REF__SERVICE_REF_TYPE:
-				return SERVICE_REF_TYPE_EDEFAULT == null ? serviceRefType != null : !SERVICE_REF_TYPE_EDEFAULT.equals(serviceRefType);
-			case JavaeePackage.SERVICE_REF__WSDL_FILE:
-				return WSDL_FILE_EDEFAULT == null ? wsdlFile != null : !WSDL_FILE_EDEFAULT.equals(wsdlFile);
-			case JavaeePackage.SERVICE_REF__JAXRPC_MAPPING_FILE:
-				return JAXRPC_MAPPING_FILE_EDEFAULT == null ? jaxrpcMappingFile != null : !JAXRPC_MAPPING_FILE_EDEFAULT.equals(jaxrpcMappingFile);
-			case JavaeePackage.SERVICE_REF__SERVICE_QNAME:
-				return SERVICE_QNAME_EDEFAULT == null ? serviceQname != null : !SERVICE_QNAME_EDEFAULT.equals(serviceQname);
-			case JavaeePackage.SERVICE_REF__PORT_COMPONENT_REFS:
-				return portComponentRefs != null && !portComponentRefs.isEmpty();
-			case JavaeePackage.SERVICE_REF__HANDLERS:
-				return handlers != null && !handlers.isEmpty();
-			case JavaeePackage.SERVICE_REF__HANDLER_CHAINS:
-				return handlerChains != null;
-			case JavaeePackage.SERVICE_REF__MAPPED_NAME:
-				return MAPPED_NAME_EDEFAULT == null ? mappedName != null : !MAPPED_NAME_EDEFAULT.equals(mappedName);
-			case JavaeePackage.SERVICE_REF__INJECTION_TARGETS:
-				return injectionTargets != null && !injectionTargets.isEmpty();
-			case JavaeePackage.SERVICE_REF__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (serviceRefName: "); //$NON-NLS-1$
-		result.append(serviceRefName);
-		result.append(", serviceInterface: "); //$NON-NLS-1$
-		result.append(serviceInterface);
-		result.append(", serviceRefType: "); //$NON-NLS-1$
-		result.append(serviceRefType);
-		result.append(", wsdlFile: "); //$NON-NLS-1$
-		result.append(wsdlFile);
-		result.append(", jaxrpcMappingFile: "); //$NON-NLS-1$
-		result.append(jaxrpcMappingFile);
-		result.append(", serviceQname: "); //$NON-NLS-1$
-		result.append(serviceQname);
-		result.append(", mappedName: "); //$NON-NLS-1$
-		result.append(mappedName);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ServiceRefImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/UrlPatternTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/UrlPatternTypeImpl.java
deleted file mode 100644
index b56ccd1a7..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/UrlPatternTypeImpl.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core.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.core.UrlPatternType;
-
-import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Url Pattern Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.UrlPatternTypeImpl#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class UrlPatternTypeImpl extends EObjectImpl implements UrlPatternType {
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String value = VALUE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected UrlPatternTypeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JavaeePackage.Literals.URL_PATTERN_TYPE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(String newValue) {
-		String oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.URL_PATTERN_TYPE__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JavaeePackage.URL_PATTERN_TYPE__VALUE:
-				return getValue();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JavaeePackage.URL_PATTERN_TYPE__VALUE:
-				setValue((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.URL_PATTERN_TYPE__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JavaeePackage.URL_PATTERN_TYPE__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	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();
-	}
-
-} //UrlPatternTypeImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/metadata/JavaeePackage.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/metadata/JavaeePackage.java
deleted file mode 100644
index 4126e1c8e..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/metadata/JavaeePackage.java
+++ /dev/null
@@ -1,6207 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core.internal.metadata;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.jst.javaee.core.JavaeeFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> 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>
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * 
- *       @(#)javaee_5.xsds	1.65 06/02/17
- *     
- * 
- * 
- *       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.
- * 
- *     
- * 
- * 
- * 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
- *     
- * 
- * 
- *       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.
- * 
- *     
- * 
- * 
- *       (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:
- * 
- *     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.
- *   
- *     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
- *   
- * 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.
- * 
- *         &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.
- *   
- * <!-- end-model-doc -->
- * @see org.eclipse.jst.javaee.core.JavaeeFactory
- * @generated
- */
-public interface JavaeePackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "core"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://java.sun.com/xml/ns/javaee"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "javaee"; //$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	JavaeePackage eINSTANCE = org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.DescriptionImpl <em>Description</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.core.internal.impl.DescriptionImpl
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getDescription()
-	 * @generated
-	 */
-	int DESCRIPTION = 0;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTION__VALUE = 0;
-
-	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTION__LANG = 1;
-
-	/**
-	 * The number of structural features of the '<em>Description</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTION_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.DisplayNameImpl <em>Display Name</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.core.internal.impl.DisplayNameImpl
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getDisplayName()
-	 * @generated
-	 */
-	int DISPLAY_NAME = 1;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISPLAY_NAME__VALUE = 0;
-
-	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISPLAY_NAME__LANG = 1;
-
-	/**
-	 * The number of structural features of the '<em>Display Name</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISPLAY_NAME_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.EjbLocalRefImpl <em>Ejb Local Ref</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.core.internal.impl.EjbLocalRefImpl
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getEjbLocalRef()
-	 * @generated
-	 */
-	int EJB_LOCAL_REF = 2;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_LOCAL_REF__DESCRIPTIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Ejb Ref Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_LOCAL_REF__EJB_REF_NAME = 1;
-
-	/**
-	 * The feature id for the '<em><b>Ejb Ref Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_LOCAL_REF__EJB_REF_TYPE = 2;
-
-	/**
-	 * The feature id for the '<em><b>Local Home</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_LOCAL_REF__LOCAL_HOME = 3;
-
-	/**
-	 * The feature id for the '<em><b>Local</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_LOCAL_REF__LOCAL = 4;
-
-	/**
-	 * The feature id for the '<em><b>Ejb Link</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_LOCAL_REF__EJB_LINK = 5;
-
-	/**
-	 * The feature id for the '<em><b>Mapped Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_LOCAL_REF__MAPPED_NAME = 6;
-
-	/**
-	 * The feature id for the '<em><b>Injection Targets</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_LOCAL_REF__INJECTION_TARGETS = 7;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_LOCAL_REF__ID = 8;
-
-	/**
-	 * The number of structural features of the '<em>Ejb Local Ref</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_LOCAL_REF_FEATURE_COUNT = 9;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.EjbRefImpl <em>Ejb Ref</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.core.internal.impl.EjbRefImpl
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getEjbRef()
-	 * @generated
-	 */
-	int EJB_REF = 3;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_REF__DESCRIPTIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Ejb Ref Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_REF__EJB_REF_NAME = 1;
-
-	/**
-	 * The feature id for the '<em><b>Ejb Ref Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_REF__EJB_REF_TYPE = 2;
-
-	/**
-	 * The feature id for the '<em><b>Home</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_REF__HOME = 3;
-
-	/**
-	 * The feature id for the '<em><b>Remote</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_REF__REMOTE = 4;
-
-	/**
-	 * The feature id for the '<em><b>Ejb Link</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_REF__EJB_LINK = 5;
-
-	/**
-	 * The feature id for the '<em><b>Mapped Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_REF__MAPPED_NAME = 6;
-
-	/**
-	 * The feature id for the '<em><b>Injection Targets</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_REF__INJECTION_TARGETS = 7;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_REF__ID = 8;
-
-	/**
-	 * The number of structural features of the '<em>Ejb Ref</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_REF_FEATURE_COUNT = 9;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.EmptyTypeImpl <em>Empty Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.core.internal.impl.EmptyTypeImpl
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getEmptyType()
-	 * @generated
-	 */
-	int EMPTY_TYPE = 4;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EMPTY_TYPE__ID = 0;
-
-	/**
-	 * The number of structural features of the '<em>Empty Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EMPTY_TYPE_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.EnvEntryImpl <em>Env Entry</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.core.internal.impl.EnvEntryImpl
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getEnvEntry()
-	 * @generated
-	 */
-	int ENV_ENTRY = 5;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENV_ENTRY__DESCRIPTIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Env Entry Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENV_ENTRY__ENV_ENTRY_NAME = 1;
-
-	/**
-	 * The feature id for the '<em><b>Env Entry Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENV_ENTRY__ENV_ENTRY_TYPE = 2;
-
-	/**
-	 * The feature id for the '<em><b>Env Entry Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENV_ENTRY__ENV_ENTRY_VALUE = 3;
-
-	/**
-	 * The feature id for the '<em><b>Mapped Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENV_ENTRY__MAPPED_NAME = 4;
-
-	/**
-	 * The feature id for the '<em><b>Injection Targets</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENV_ENTRY__INJECTION_TARGETS = 5;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENV_ENTRY__ID = 6;
-
-	/**
-	 * The number of structural features of the '<em>Env Entry</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENV_ENTRY_FEATURE_COUNT = 7;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.IconImpl <em>Icon</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.core.internal.impl.IconImpl
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getIcon()
-	 * @generated
-	 */
-	int ICON = 6;
-
-	/**
-	 * The feature id for the '<em><b>Small Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ICON__SMALL_ICON = 0;
-
-	/**
-	 * The feature id for the '<em><b>Large Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ICON__LARGE_ICON = 1;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ICON__ID = 2;
-
-	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ICON__LANG = 3;
-
-	/**
-	 * The number of structural features of the '<em>Icon</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ICON_FEATURE_COUNT = 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.InjectionTargetImpl <em>Injection Target</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.core.internal.impl.InjectionTargetImpl
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getInjectionTarget()
-	 * @generated
-	 */
-	int INJECTION_TARGET = 7;
-
-	/**
-	 * The feature id for the '<em><b>Injection Target Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INJECTION_TARGET__INJECTION_TARGET_CLASS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Injection Target Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INJECTION_TARGET__INJECTION_TARGET_NAME = 1;
-
-	/**
-	 * The number of structural features of the '<em>Injection Target</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INJECTION_TARGET_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.LifecycleCallbackImpl <em>Lifecycle Callback</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.core.internal.impl.LifecycleCallbackImpl
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getLifecycleCallback()
-	 * @generated
-	 */
-	int LIFECYCLE_CALLBACK = 8;
-
-	/**
-	 * The feature id for the '<em><b>Lifecycle Callback Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LIFECYCLE_CALLBACK__LIFECYCLE_CALLBACK_CLASS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Lifecycle Callback Method</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LIFECYCLE_CALLBACK__LIFECYCLE_CALLBACK_METHOD = 1;
-
-	/**
-	 * The number of structural features of the '<em>Lifecycle Callback</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LIFECYCLE_CALLBACK_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.ListenerImpl <em>Listener</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.core.internal.impl.ListenerImpl
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getListener()
-	 * @generated
-	 */
-	int LISTENER = 9;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LISTENER__DESCRIPTIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LISTENER__DISPLAY_NAMES = 1;
-
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LISTENER__ICONS = 2;
-
-	/**
-	 * The feature id for the '<em><b>Listener Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LISTENER__LISTENER_CLASS = 3;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LISTENER__ID = 4;
-
-	/**
-	 * The number of structural features of the '<em>Listener</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LISTENER_FEATURE_COUNT = 5;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.MessageDestinationImpl <em>Message Destination</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.core.internal.impl.MessageDestinationImpl
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getMessageDestination()
-	 * @generated
-	 */
-	int MESSAGE_DESTINATION = 10;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DESTINATION__DESCRIPTIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DESTINATION__DISPLAY_NAMES = 1;
-
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DESTINATION__ICONS = 2;
-
-	/**
-	 * The feature id for the '<em><b>Message Destination Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DESTINATION__MESSAGE_DESTINATION_NAME = 3;
-
-	/**
-	 * The feature id for the '<em><b>Mapped Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DESTINATION__MAPPED_NAME = 4;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DESTINATION__ID = 5;
-
-	/**
-	 * The number of structural features of the '<em>Message Destination</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DESTINATION_FEATURE_COUNT = 6;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.MessageDestinationRefImpl <em>Message Destination Ref</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.core.internal.impl.MessageDestinationRefImpl
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getMessageDestinationRef()
-	 * @generated
-	 */
-	int MESSAGE_DESTINATION_REF = 11;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DESTINATION_REF__DESCRIPTIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Message Destination Ref Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DESTINATION_REF__MESSAGE_DESTINATION_REF_NAME = 1;
-
-	/**
-	 * The feature id for the '<em><b>Message Destination Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DESTINATION_REF__MESSAGE_DESTINATION_TYPE = 2;
-
-	/**
-	 * The feature id for the '<em><b>Message Destination Usage</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DESTINATION_REF__MESSAGE_DESTINATION_USAGE = 3;
-
-	/**
-	 * The feature id for the '<em><b>Message Destination Link</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DESTINATION_REF__MESSAGE_DESTINATION_LINK = 4;
-
-	/**
-	 * The feature id for the '<em><b>Mapped Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DESTINATION_REF__MAPPED_NAME = 5;
-
-	/**
-	 * The feature id for the '<em><b>Injection Targets</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DESTINATION_REF__INJECTION_TARGETS = 6;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DESTINATION_REF__ID = 7;
-
-	/**
-	 * The number of structural features of the '<em>Message Destination Ref</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DESTINATION_REF_FEATURE_COUNT = 8;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.ParamValueImpl <em>Param Value</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.core.internal.impl.ParamValueImpl
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getParamValue()
-	 * @generated
-	 */
-	int PARAM_VALUE = 12;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAM_VALUE__DESCRIPTIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Param Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAM_VALUE__PARAM_NAME = 1;
-
-	/**
-	 * The feature id for the '<em><b>Param Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAM_VALUE__PARAM_VALUE = 2;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAM_VALUE__ID = 3;
-
-	/**
-	 * The number of structural features of the '<em>Param Value</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAM_VALUE_FEATURE_COUNT = 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceContextRefImpl <em>Persistence Context Ref</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.core.internal.impl.PersistenceContextRefImpl
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getPersistenceContextRef()
-	 * @generated
-	 */
-	int PERSISTENCE_CONTEXT_REF = 13;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PERSISTENCE_CONTEXT_REF__DESCRIPTIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Persistence Context Ref Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PERSISTENCE_CONTEXT_REF__PERSISTENCE_CONTEXT_REF_NAME = 1;
-
-	/**
-	 * The feature id for the '<em><b>Persistence Unit Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PERSISTENCE_CONTEXT_REF__PERSISTENCE_UNIT_NAME = 2;
-
-	/**
-	 * The feature id for the '<em><b>Persistence Context Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PERSISTENCE_CONTEXT_REF__PERSISTENCE_CONTEXT_TYPE = 3;
-
-	/**
-	 * The feature id for the '<em><b>Persistence Properties</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PERSISTENCE_CONTEXT_REF__PERSISTENCE_PROPERTIES = 4;
-
-	/**
-	 * The feature id for the '<em><b>Mapped Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PERSISTENCE_CONTEXT_REF__MAPPED_NAME = 5;
-
-	/**
-	 * The feature id for the '<em><b>Injection Targets</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PERSISTENCE_CONTEXT_REF__INJECTION_TARGETS = 6;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PERSISTENCE_CONTEXT_REF__ID = 7;
-
-	/**
-	 * The number of structural features of the '<em>Persistence Context Ref</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PERSISTENCE_CONTEXT_REF_FEATURE_COUNT = 8;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceUnitRefImpl <em>Persistence Unit Ref</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.core.internal.impl.PersistenceUnitRefImpl
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getPersistenceUnitRef()
-	 * @generated
-	 */
-	int PERSISTENCE_UNIT_REF = 14;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PERSISTENCE_UNIT_REF__DESCRIPTIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Persistence Unit Ref Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PERSISTENCE_UNIT_REF__PERSISTENCE_UNIT_REF_NAME = 1;
-
-	/**
-	 * The feature id for the '<em><b>Persistence Unit Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PERSISTENCE_UNIT_REF__PERSISTENCE_UNIT_NAME = 2;
-
-	/**
-	 * The feature id for the '<em><b>Mapped Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PERSISTENCE_UNIT_REF__MAPPED_NAME = 3;
-
-	/**
-	 * The feature id for the '<em><b>Injection Targets</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PERSISTENCE_UNIT_REF__INJECTION_TARGETS = 4;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PERSISTENCE_UNIT_REF__ID = 5;
-
-	/**
-	 * The number of structural features of the '<em>Persistence Unit Ref</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PERSISTENCE_UNIT_REF_FEATURE_COUNT = 6;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.PortComponentRefImpl <em>Port Component Ref</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.core.internal.impl.PortComponentRefImpl
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getPortComponentRef()
-	 * @generated
-	 */
-	int PORT_COMPONENT_REF = 15;
-
-	/**
-	 * The feature id for the '<em><b>Service Endpoint Interface</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT_COMPONENT_REF__SERVICE_ENDPOINT_INTERFACE = 0;
-
-	/**
-	 * The feature id for the '<em><b>Enable Mtom</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT_COMPONENT_REF__ENABLE_MTOM = 1;
-
-	/**
-	 * The feature id for the '<em><b>Port Component Link</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT_COMPONENT_REF__PORT_COMPONENT_LINK = 2;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT_COMPONENT_REF__ID = 3;
-
-	/**
-	 * The number of structural features of the '<em>Port Component Ref</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT_COMPONENT_REF_FEATURE_COUNT = 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.PropertyTypeImpl <em>Property Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.core.internal.impl.PropertyTypeImpl
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getPropertyType()
-	 * @generated
-	 */
-	int PROPERTY_TYPE = 16;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_TYPE__NAME = 0;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_TYPE__VALUE = 1;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_TYPE__ID = 2;
-
-	/**
-	 * The number of structural features of the '<em>Property Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_TYPE_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.ResourceEnvRefImpl <em>Resource Env Ref</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.core.internal.impl.ResourceEnvRefImpl
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getResourceEnvRef()
-	 * @generated
-	 */
-	int RESOURCE_ENV_REF = 17;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE_ENV_REF__DESCRIPTIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Resource Env Ref Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE_ENV_REF__RESOURCE_ENV_REF_NAME = 1;
-
-	/**
-	 * The feature id for the '<em><b>Resource Env Ref Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE_ENV_REF__RESOURCE_ENV_REF_TYPE = 2;
-
-	/**
-	 * The feature id for the '<em><b>Mapped Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE_ENV_REF__MAPPED_NAME = 3;
-
-	/**
-	 * The feature id for the '<em><b>Injection Targets</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE_ENV_REF__INJECTION_TARGETS = 4;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE_ENV_REF__ID = 5;
-
-	/**
-	 * The number of structural features of the '<em>Resource Env Ref</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE_ENV_REF_FEATURE_COUNT = 6;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.ResourceRefImpl <em>Resource Ref</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.core.internal.impl.ResourceRefImpl
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getResourceRef()
-	 * @generated
-	 */
-	int RESOURCE_REF = 18;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE_REF__DESCRIPTIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Res Ref Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE_REF__RES_REF_NAME = 1;
-
-	/**
-	 * The feature id for the '<em><b>Res Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE_REF__RES_TYPE = 2;
-
-	/**
-	 * The feature id for the '<em><b>Res Auth</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE_REF__RES_AUTH = 3;
-
-	/**
-	 * The feature id for the '<em><b>Res Sharing Scope</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE_REF__RES_SHARING_SCOPE = 4;
-
-	/**
-	 * The feature id for the '<em><b>Mapped Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE_REF__MAPPED_NAME = 5;
-
-	/**
-	 * The feature id for the '<em><b>Injection Targets</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE_REF__INJECTION_TARGETS = 6;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE_REF__ID = 7;
-
-	/**
-	 * The number of structural features of the '<em>Resource Ref</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE_REF_FEATURE_COUNT = 8;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.RunAsImpl <em>Run As</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.core.internal.impl.RunAsImpl
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getRunAs()
-	 * @generated
-	 */
-	int RUN_AS = 19;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RUN_AS__DESCRIPTIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Role Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RUN_AS__ROLE_NAME = 1;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RUN_AS__ID = 2;
-
-	/**
-	 * The number of structural features of the '<em>Run As</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RUN_AS_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.SecurityRoleImpl <em>Security Role</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.core.internal.impl.SecurityRoleImpl
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getSecurityRole()
-	 * @generated
-	 */
-	int SECURITY_ROLE = 20;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECURITY_ROLE__DESCRIPTIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Role Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECURITY_ROLE__ROLE_NAME = 1;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECURITY_ROLE__ID = 2;
-
-	/**
-	 * The number of structural features of the '<em>Security Role</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECURITY_ROLE_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.SecurityRoleRefImpl <em>Security Role Ref</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.core.internal.impl.SecurityRoleRefImpl
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getSecurityRoleRef()
-	 * @generated
-	 */
-	int SECURITY_ROLE_REF = 21;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECURITY_ROLE_REF__DESCRIPTIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Role Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECURITY_ROLE_REF__ROLE_NAME = 1;
-
-	/**
-	 * The feature id for the '<em><b>Role Link</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECURITY_ROLE_REF__ROLE_LINK = 2;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECURITY_ROLE_REF__ID = 3;
-
-	/**
-	 * The number of structural features of the '<em>Security Role Ref</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECURITY_ROLE_REF_FEATURE_COUNT = 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefImpl <em>Service Ref</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.core.internal.impl.ServiceRefImpl
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getServiceRef()
-	 * @generated
-	 */
-	int SERVICE_REF = 22;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF__DESCRIPTIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF__DISPLAY_NAMES = 1;
-
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF__ICONS = 2;
-
-	/**
-	 * The feature id for the '<em><b>Service Ref Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF__SERVICE_REF_NAME = 3;
-
-	/**
-	 * The feature id for the '<em><b>Service Interface</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF__SERVICE_INTERFACE = 4;
-
-	/**
-	 * The feature id for the '<em><b>Service Ref Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF__SERVICE_REF_TYPE = 5;
-
-	/**
-	 * The feature id for the '<em><b>Wsdl File</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF__WSDL_FILE = 6;
-
-	/**
-	 * The feature id for the '<em><b>Jaxrpc Mapping File</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF__JAXRPC_MAPPING_FILE = 7;
-
-	/**
-	 * The feature id for the '<em><b>Service Qname</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF__SERVICE_QNAME = 8;
-
-	/**
-	 * The feature id for the '<em><b>Port Component Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF__PORT_COMPONENT_REFS = 9;
-
-	/**
-	 * The feature id for the '<em><b>Handlers</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF__HANDLERS = 10;
-
-	/**
-	 * The feature id for the '<em><b>Handler Chains</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF__HANDLER_CHAINS = 11;
-
-	/**
-	 * The feature id for the '<em><b>Mapped Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF__MAPPED_NAME = 12;
-
-	/**
-	 * The feature id for the '<em><b>Injection Targets</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF__INJECTION_TARGETS = 13;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF__ID = 14;
-
-	/**
-	 * The number of structural features of the '<em>Service Ref</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF_FEATURE_COUNT = 15;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefHandlerImpl <em>Service Ref Handler</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.core.internal.impl.ServiceRefHandlerImpl
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getServiceRefHandler()
-	 * @generated
-	 */
-	int SERVICE_REF_HANDLER = 23;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF_HANDLER__DESCRIPTIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF_HANDLER__DISPLAY_NAMES = 1;
-
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF_HANDLER__ICONS = 2;
-
-	/**
-	 * The feature id for the '<em><b>Handler Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF_HANDLER__HANDLER_NAME = 3;
-
-	/**
-	 * The feature id for the '<em><b>Handler Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF_HANDLER__HANDLER_CLASS = 4;
-
-	/**
-	 * The feature id for the '<em><b>Init Params</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF_HANDLER__INIT_PARAMS = 5;
-
-	/**
-	 * The feature id for the '<em><b>Soap Headers</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF_HANDLER__SOAP_HEADERS = 6;
-
-	/**
-	 * The feature id for the '<em><b>Soap Roles</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF_HANDLER__SOAP_ROLES = 7;
-
-	/**
-	 * The feature id for the '<em><b>Port Names</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF_HANDLER__PORT_NAMES = 8;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF_HANDLER__ID = 9;
-
-	/**
-	 * The number of structural features of the '<em>Service Ref Handler</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF_HANDLER_FEATURE_COUNT = 10;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefHandlerChainImpl <em>Service Ref Handler Chain</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.core.internal.impl.ServiceRefHandlerChainImpl
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getServiceRefHandlerChain()
-	 * @generated
-	 */
-	int SERVICE_REF_HANDLER_CHAIN = 24;
-
-	/**
-	 * The feature id for the '<em><b>Service Name Pattern</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF_HANDLER_CHAIN__SERVICE_NAME_PATTERN = 0;
-
-	/**
-	 * The feature id for the '<em><b>Port Name Pattern</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF_HANDLER_CHAIN__PORT_NAME_PATTERN = 1;
-
-	/**
-	 * The feature id for the '<em><b>Protocol Bindings</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF_HANDLER_CHAIN__PROTOCOL_BINDINGS = 2;
-
-	/**
-	 * The feature id for the '<em><b>Handlers</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF_HANDLER_CHAIN__HANDLERS = 3;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF_HANDLER_CHAIN__ID = 4;
-
-	/**
-	 * The number of structural features of the '<em>Service Ref Handler Chain</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF_HANDLER_CHAIN_FEATURE_COUNT = 5;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefHandlerChainsImpl <em>Service Ref Handler Chains</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.core.internal.impl.ServiceRefHandlerChainsImpl
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getServiceRefHandlerChains()
-	 * @generated
-	 */
-	int SERVICE_REF_HANDLER_CHAINS = 25;
-
-	/**
-	 * The feature id for the '<em><b>Handler Chains</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF_HANDLER_CHAINS__HANDLER_CHAINS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF_HANDLER_CHAINS__ID = 1;
-
-	/**
-	 * The number of structural features of the '<em>Service Ref Handler Chains</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF_HANDLER_CHAINS_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.UrlPatternTypeImpl <em>Url Pattern Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.core.internal.impl.UrlPatternTypeImpl
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getUrlPatternType()
-	 * @generated
-	 */
-	int URL_PATTERN_TYPE = 26;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int URL_PATTERN_TYPE__VALUE = 0;
-
-	/**
-	 * The number of structural features of the '<em>Url Pattern Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int URL_PATTERN_TYPE_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.EjbRefType <em>Ejb Ref Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.core.EjbRefType
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getEjbRefType()
-	 * @generated
-	 */
-	int EJB_REF_TYPE = 27;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.EnvEntryType <em>Env Entry Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.core.EnvEntryType
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getEnvEntryType()
-	 * @generated
-	 */
-	int ENV_ENTRY_TYPE = 28;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.MessageDestinationUsageType <em>Message Destination Usage Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.core.MessageDestinationUsageType
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getMessageDestinationUsageType()
-	 * @generated
-	 */
-	int MESSAGE_DESTINATION_USAGE_TYPE = 29;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.PersistenceContextType <em>Persistence Context Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.core.PersistenceContextType
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getPersistenceContextType()
-	 * @generated
-	 */
-	int PERSISTENCE_CONTEXT_TYPE = 30;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.ResAuthType <em>Res Auth Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.core.ResAuthType
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getResAuthType()
-	 * @generated
-	 */
-	int RES_AUTH_TYPE = 31;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.ResSharingScopeType <em>Res Sharing Scope Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.core.ResSharingScopeType
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getResSharingScopeType()
-	 * @generated
-	 */
-	int RES_SHARING_SCOPE_TYPE = 32;
-
-	/**
-	 * The meta object id for the '<em>Dewey Version Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getDeweyVersionType()
-	 * @generated
-	 */
-	int DEWEY_VERSION_TYPE = 33;
-
-	/**
-	 * The meta object id for the '<em>EJB Link</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getEJBLink()
-	 * @generated
-	 */
-	int EJB_LINK = 34;
-
-	/**
-	 * The meta object id for the '<em>Ejb Ref Name Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getEjbRefNameType()
-	 * @generated
-	 */
-	int EJB_REF_NAME_TYPE = 35;
-
-	/**
-	 * The meta object id for the '<em>Ejb Ref Type Object</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.core.EjbRefType
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getEjbRefTypeObject()
-	 * @generated
-	 */
-	int EJB_REF_TYPE_OBJECT = 36;
-
-	/**
-	 * The meta object id for the '<em>Env Entry Type Object</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.core.EnvEntryType
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getEnvEntryTypeObject()
-	 * @generated
-	 */
-	int ENV_ENTRY_TYPE_OBJECT = 37;
-
-	/**
-	 * The meta object id for the '<em>Fully Qualified Class Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getFullyQualifiedClassType()
-	 * @generated
-	 */
-	int FULLY_QUALIFIED_CLASS_TYPE = 38;
-
-	/**
-	 * The meta object id for the '<em>Home</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getHome()
-	 * @generated
-	 */
-	int HOME = 39;
-
-	/**
-	 * The meta object id for the '<em>Java Identifier</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getJavaIdentifier()
-	 * @generated
-	 */
-	int JAVA_IDENTIFIER = 40;
-
-	/**
-	 * The meta object id for the '<em>Java Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getJavaType()
-	 * @generated
-	 */
-	int JAVA_TYPE = 41;
-
-	/**
-	 * The meta object id for the '<em>JNDI Name</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getJNDIName()
-	 * @generated
-	 */
-	int JNDI_NAME = 42;
-
-	/**
-	 * The meta object id for the '<em>Local</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getLocal()
-	 * @generated
-	 */
-	int LOCAL = 43;
-
-	/**
-	 * The meta object id for the '<em>Local Home</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getLocalHome()
-	 * @generated
-	 */
-	int LOCAL_HOME = 44;
-
-	/**
-	 * The meta object id for the '<em>Message Destination Link</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getMessageDestinationLink()
-	 * @generated
-	 */
-	int MESSAGE_DESTINATION_LINK = 45;
-
-	/**
-	 * The meta object id for the '<em>Message Destination Type Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getMessageDestinationTypeType()
-	 * @generated
-	 */
-	int MESSAGE_DESTINATION_TYPE_TYPE = 46;
-
-	/**
-	 * The meta object id for the '<em>Message Destination Usage Type Object</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.core.MessageDestinationUsageType
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getMessageDestinationUsageTypeObject()
-	 * @generated
-	 */
-	int MESSAGE_DESTINATION_USAGE_TYPE_OBJECT = 47;
-
-	/**
-	 * The meta object id for the '<em>Path Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getPathType()
-	 * @generated
-	 */
-	int PATH_TYPE = 48;
-
-	/**
-	 * The meta object id for the '<em>Persistence Context Type Object</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.core.PersistenceContextType
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getPersistenceContextTypeObject()
-	 * @generated
-	 */
-	int PERSISTENCE_CONTEXT_TYPE_OBJECT = 49;
-
-	/**
-	 * The meta object id for the '<em>Remote</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getRemote()
-	 * @generated
-	 */
-	int REMOTE = 50;
-
-	/**
-	 * The meta object id for the '<em>Res Auth Type Object</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.core.ResAuthType
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getResAuthTypeObject()
-	 * @generated
-	 */
-	int RES_AUTH_TYPE_OBJECT = 51;
-
-	/**
-	 * The meta object id for the '<em>Res Sharing Scope Type Object</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.core.ResSharingScopeType
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getResSharingScopeTypeObject()
-	 * @generated
-	 */
-	int RES_SHARING_SCOPE_TYPE_OBJECT = 52;
-
-	/**
-	 * The meta object id for the '<em>Role Name</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getRoleName()
-	 * @generated
-	 */
-	int ROLE_NAME = 53;
-
-	/**
-	 * The meta object id for the '<em>Service Ref Protocol Binding List Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.util.List
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getServiceRefProtocolBindingListType()
-	 * @generated
-	 */
-	int SERVICE_REF_PROTOCOL_BINDING_LIST_TYPE = 54;
-
-	/**
-	 * The meta object id for the '<em>Service Ref Protocol Binding Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getServiceRefProtocolBindingType()
-	 * @generated
-	 */
-	int SERVICE_REF_PROTOCOL_BINDING_TYPE = 55;
-
-	/**
-	 * The meta object id for the '<em>Service Ref Protocol URI Alias Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getServiceRefProtocolURIAliasType()
-	 * @generated
-	 */
-	int SERVICE_REF_PROTOCOL_URI_ALIAS_TYPE = 56;
-
-	/**
-	 * The meta object id for the '<em>Service Ref Qname Pattern</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getServiceRefQnamePattern()
-	 * @generated
-	 */
-	int SERVICE_REF_QNAME_PATTERN = 57;
-
-	/**
-	 * The meta object id for the '<em>True False Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getTrueFalseType()
-	 * @generated
-	 */
-	int TRUE_FALSE_TYPE = 58;
-
-	/**
-	 * The meta object id for the '<em>True False Type Object</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.Boolean
-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getTrueFalseTypeObject()
-	 * @generated
-	 */
-	int TRUE_FALSE_TYPE_OBJECT = 59;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.core.Description <em>Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Description</em>'.
-	 * @see org.eclipse.jst.javaee.core.Description
-	 * @generated
-	 */
-	EClass getDescription();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.Description#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.jst.javaee.core.Description#getValue()
-	 * @see #getDescription()
-	 * @generated
-	 */
-	EAttribute getDescription_Value();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.Description#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Lang</em>'.
-	 * @see org.eclipse.jst.javaee.core.Description#getLang()
-	 * @see #getDescription()
-	 * @generated
-	 */
-	EAttribute getDescription_Lang();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.core.DisplayName <em>Display Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Display Name</em>'.
-	 * @see org.eclipse.jst.javaee.core.DisplayName
-	 * @generated
-	 */
-	EClass getDisplayName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.DisplayName#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.jst.javaee.core.DisplayName#getValue()
-	 * @see #getDisplayName()
-	 * @generated
-	 */
-	EAttribute getDisplayName_Value();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.DisplayName#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Lang</em>'.
-	 * @see org.eclipse.jst.javaee.core.DisplayName#getLang()
-	 * @see #getDisplayName()
-	 * @generated
-	 */
-	EAttribute getDisplayName_Lang();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.core.EjbLocalRef <em>Ejb Local Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Ejb Local Ref</em>'.
-	 * @see org.eclipse.jst.javaee.core.EjbLocalRef
-	 * @generated
-	 */
-	EClass getEjbLocalRef();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.core.EjbLocalRef#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.javaee.core.EjbLocalRef#getDescriptions()
-	 * @see #getEjbLocalRef()
-	 * @generated
-	 */
-	EReference getEjbLocalRef_Descriptions();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.EjbLocalRef#getEjbRefName <em>Ejb Ref Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Ejb Ref Name</em>'.
-	 * @see org.eclipse.jst.javaee.core.EjbLocalRef#getEjbRefName()
-	 * @see #getEjbLocalRef()
-	 * @generated
-	 */
-	EAttribute getEjbLocalRef_EjbRefName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.EjbLocalRef#getEjbRefType <em>Ejb Ref Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Ejb Ref Type</em>'.
-	 * @see org.eclipse.jst.javaee.core.EjbLocalRef#getEjbRefType()
-	 * @see #getEjbLocalRef()
-	 * @generated
-	 */
-	EAttribute getEjbLocalRef_EjbRefType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.EjbLocalRef#getLocalHome <em>Local Home</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Local Home</em>'.
-	 * @see org.eclipse.jst.javaee.core.EjbLocalRef#getLocalHome()
-	 * @see #getEjbLocalRef()
-	 * @generated
-	 */
-	EAttribute getEjbLocalRef_LocalHome();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.EjbLocalRef#getLocal <em>Local</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Local</em>'.
-	 * @see org.eclipse.jst.javaee.core.EjbLocalRef#getLocal()
-	 * @see #getEjbLocalRef()
-	 * @generated
-	 */
-	EAttribute getEjbLocalRef_Local();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.EjbLocalRef#getEjbLink <em>Ejb Link</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Ejb Link</em>'.
-	 * @see org.eclipse.jst.javaee.core.EjbLocalRef#getEjbLink()
-	 * @see #getEjbLocalRef()
-	 * @generated
-	 */
-	EAttribute getEjbLocalRef_EjbLink();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.EjbLocalRef#getMappedName <em>Mapped Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Mapped Name</em>'.
-	 * @see org.eclipse.jst.javaee.core.EjbLocalRef#getMappedName()
-	 * @see #getEjbLocalRef()
-	 * @generated
-	 */
-	EAttribute getEjbLocalRef_MappedName();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.core.EjbLocalRef#getInjectionTargets <em>Injection Targets</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Injection Targets</em>'.
-	 * @see org.eclipse.jst.javaee.core.EjbLocalRef#getInjectionTargets()
-	 * @see #getEjbLocalRef()
-	 * @generated
-	 */
-	EReference getEjbLocalRef_InjectionTargets();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.EjbLocalRef#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.core.EjbLocalRef#getId()
-	 * @see #getEjbLocalRef()
-	 * @generated
-	 */
-	EAttribute getEjbLocalRef_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.core.EjbRef <em>Ejb Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Ejb Ref</em>'.
-	 * @see org.eclipse.jst.javaee.core.EjbRef
-	 * @generated
-	 */
-	EClass getEjbRef();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.core.EjbRef#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.javaee.core.EjbRef#getDescriptions()
-	 * @see #getEjbRef()
-	 * @generated
-	 */
-	EReference getEjbRef_Descriptions();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.EjbRef#getEjbRefName <em>Ejb Ref Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Ejb Ref Name</em>'.
-	 * @see org.eclipse.jst.javaee.core.EjbRef#getEjbRefName()
-	 * @see #getEjbRef()
-	 * @generated
-	 */
-	EAttribute getEjbRef_EjbRefName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.EjbRef#getEjbRefType <em>Ejb Ref Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Ejb Ref Type</em>'.
-	 * @see org.eclipse.jst.javaee.core.EjbRef#getEjbRefType()
-	 * @see #getEjbRef()
-	 * @generated
-	 */
-	EAttribute getEjbRef_EjbRefType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.EjbRef#getHome <em>Home</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Home</em>'.
-	 * @see org.eclipse.jst.javaee.core.EjbRef#getHome()
-	 * @see #getEjbRef()
-	 * @generated
-	 */
-	EAttribute getEjbRef_Home();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.EjbRef#getRemote <em>Remote</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Remote</em>'.
-	 * @see org.eclipse.jst.javaee.core.EjbRef#getRemote()
-	 * @see #getEjbRef()
-	 * @generated
-	 */
-	EAttribute getEjbRef_Remote();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.EjbRef#getEjbLink <em>Ejb Link</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Ejb Link</em>'.
-	 * @see org.eclipse.jst.javaee.core.EjbRef#getEjbLink()
-	 * @see #getEjbRef()
-	 * @generated
-	 */
-	EAttribute getEjbRef_EjbLink();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.EjbRef#getMappedName <em>Mapped Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Mapped Name</em>'.
-	 * @see org.eclipse.jst.javaee.core.EjbRef#getMappedName()
-	 * @see #getEjbRef()
-	 * @generated
-	 */
-	EAttribute getEjbRef_MappedName();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.core.EjbRef#getInjectionTargets <em>Injection Targets</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Injection Targets</em>'.
-	 * @see org.eclipse.jst.javaee.core.EjbRef#getInjectionTargets()
-	 * @see #getEjbRef()
-	 * @generated
-	 */
-	EReference getEjbRef_InjectionTargets();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.EjbRef#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.core.EjbRef#getId()
-	 * @see #getEjbRef()
-	 * @generated
-	 */
-	EAttribute getEjbRef_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.core.EmptyType <em>Empty Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Empty Type</em>'.
-	 * @see org.eclipse.jst.javaee.core.EmptyType
-	 * @generated
-	 */
-	EClass getEmptyType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.EmptyType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.core.EmptyType#getId()
-	 * @see #getEmptyType()
-	 * @generated
-	 */
-	EAttribute getEmptyType_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.core.EnvEntry <em>Env Entry</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Env Entry</em>'.
-	 * @see org.eclipse.jst.javaee.core.EnvEntry
-	 * @generated
-	 */
-	EClass getEnvEntry();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.core.EnvEntry#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.javaee.core.EnvEntry#getDescriptions()
-	 * @see #getEnvEntry()
-	 * @generated
-	 */
-	EReference getEnvEntry_Descriptions();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.EnvEntry#getEnvEntryName <em>Env Entry Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Env Entry Name</em>'.
-	 * @see org.eclipse.jst.javaee.core.EnvEntry#getEnvEntryName()
-	 * @see #getEnvEntry()
-	 * @generated
-	 */
-	EAttribute getEnvEntry_EnvEntryName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.EnvEntry#getEnvEntryType <em>Env Entry Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Env Entry Type</em>'.
-	 * @see org.eclipse.jst.javaee.core.EnvEntry#getEnvEntryType()
-	 * @see #getEnvEntry()
-	 * @generated
-	 */
-	EAttribute getEnvEntry_EnvEntryType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.EnvEntry#getEnvEntryValue <em>Env Entry Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Env Entry Value</em>'.
-	 * @see org.eclipse.jst.javaee.core.EnvEntry#getEnvEntryValue()
-	 * @see #getEnvEntry()
-	 * @generated
-	 */
-	EAttribute getEnvEntry_EnvEntryValue();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.EnvEntry#getMappedName <em>Mapped Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Mapped Name</em>'.
-	 * @see org.eclipse.jst.javaee.core.EnvEntry#getMappedName()
-	 * @see #getEnvEntry()
-	 * @generated
-	 */
-	EAttribute getEnvEntry_MappedName();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.core.EnvEntry#getInjectionTargets <em>Injection Targets</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Injection Targets</em>'.
-	 * @see org.eclipse.jst.javaee.core.EnvEntry#getInjectionTargets()
-	 * @see #getEnvEntry()
-	 * @generated
-	 */
-	EReference getEnvEntry_InjectionTargets();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.EnvEntry#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.core.EnvEntry#getId()
-	 * @see #getEnvEntry()
-	 * @generated
-	 */
-	EAttribute getEnvEntry_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.core.Icon <em>Icon</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Icon</em>'.
-	 * @see org.eclipse.jst.javaee.core.Icon
-	 * @generated
-	 */
-	EClass getIcon();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.Icon#getSmallIcon <em>Small Icon</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Small Icon</em>'.
-	 * @see org.eclipse.jst.javaee.core.Icon#getSmallIcon()
-	 * @see #getIcon()
-	 * @generated
-	 */
-	EAttribute getIcon_SmallIcon();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.Icon#getLargeIcon <em>Large Icon</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Large Icon</em>'.
-	 * @see org.eclipse.jst.javaee.core.Icon#getLargeIcon()
-	 * @see #getIcon()
-	 * @generated
-	 */
-	EAttribute getIcon_LargeIcon();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.Icon#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.core.Icon#getId()
-	 * @see #getIcon()
-	 * @generated
-	 */
-	EAttribute getIcon_Id();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.Icon#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Lang</em>'.
-	 * @see org.eclipse.jst.javaee.core.Icon#getLang()
-	 * @see #getIcon()
-	 * @generated
-	 */
-	EAttribute getIcon_Lang();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.core.InjectionTarget <em>Injection Target</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Injection Target</em>'.
-	 * @see org.eclipse.jst.javaee.core.InjectionTarget
-	 * @generated
-	 */
-	EClass getInjectionTarget();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.InjectionTarget#getInjectionTargetClass <em>Injection Target Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Injection Target Class</em>'.
-	 * @see org.eclipse.jst.javaee.core.InjectionTarget#getInjectionTargetClass()
-	 * @see #getInjectionTarget()
-	 * @generated
-	 */
-	EAttribute getInjectionTarget_InjectionTargetClass();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.InjectionTarget#getInjectionTargetName <em>Injection Target Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Injection Target Name</em>'.
-	 * @see org.eclipse.jst.javaee.core.InjectionTarget#getInjectionTargetName()
-	 * @see #getInjectionTarget()
-	 * @generated
-	 */
-	EAttribute getInjectionTarget_InjectionTargetName();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.core.LifecycleCallback <em>Lifecycle Callback</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Lifecycle Callback</em>'.
-	 * @see org.eclipse.jst.javaee.core.LifecycleCallback
-	 * @generated
-	 */
-	EClass getLifecycleCallback();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.LifecycleCallback#getLifecycleCallbackClass <em>Lifecycle Callback Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Lifecycle Callback Class</em>'.
-	 * @see org.eclipse.jst.javaee.core.LifecycleCallback#getLifecycleCallbackClass()
-	 * @see #getLifecycleCallback()
-	 * @generated
-	 */
-	EAttribute getLifecycleCallback_LifecycleCallbackClass();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.LifecycleCallback#getLifecycleCallbackMethod <em>Lifecycle Callback Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Lifecycle Callback Method</em>'.
-	 * @see org.eclipse.jst.javaee.core.LifecycleCallback#getLifecycleCallbackMethod()
-	 * @see #getLifecycleCallback()
-	 * @generated
-	 */
-	EAttribute getLifecycleCallback_LifecycleCallbackMethod();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.core.Listener <em>Listener</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Listener</em>'.
-	 * @see org.eclipse.jst.javaee.core.Listener
-	 * @generated
-	 */
-	EClass getListener();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.core.Listener#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.javaee.core.Listener#getDescriptions()
-	 * @see #getListener()
-	 * @generated
-	 */
-	EReference getListener_Descriptions();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.core.Listener#getDisplayNames <em>Display Names</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Display Names</em>'.
-	 * @see org.eclipse.jst.javaee.core.Listener#getDisplayNames()
-	 * @see #getListener()
-	 * @generated
-	 */
-	EReference getListener_DisplayNames();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.core.Listener#getIcons <em>Icons</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Icons</em>'.
-	 * @see org.eclipse.jst.javaee.core.Listener#getIcons()
-	 * @see #getListener()
-	 * @generated
-	 */
-	EReference getListener_Icons();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.Listener#getListenerClass <em>Listener Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Listener Class</em>'.
-	 * @see org.eclipse.jst.javaee.core.Listener#getListenerClass()
-	 * @see #getListener()
-	 * @generated
-	 */
-	EAttribute getListener_ListenerClass();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.Listener#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.core.Listener#getId()
-	 * @see #getListener()
-	 * @generated
-	 */
-	EAttribute getListener_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.core.MessageDestination <em>Message Destination</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Message Destination</em>'.
-	 * @see org.eclipse.jst.javaee.core.MessageDestination
-	 * @generated
-	 */
-	EClass getMessageDestination();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.core.MessageDestination#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.javaee.core.MessageDestination#getDescriptions()
-	 * @see #getMessageDestination()
-	 * @generated
-	 */
-	EReference getMessageDestination_Descriptions();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.core.MessageDestination#getDisplayNames <em>Display Names</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Display Names</em>'.
-	 * @see org.eclipse.jst.javaee.core.MessageDestination#getDisplayNames()
-	 * @see #getMessageDestination()
-	 * @generated
-	 */
-	EReference getMessageDestination_DisplayNames();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.core.MessageDestination#getIcons <em>Icons</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Icons</em>'.
-	 * @see org.eclipse.jst.javaee.core.MessageDestination#getIcons()
-	 * @see #getMessageDestination()
-	 * @generated
-	 */
-	EReference getMessageDestination_Icons();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.MessageDestination#getMessageDestinationName <em>Message Destination Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Message Destination Name</em>'.
-	 * @see org.eclipse.jst.javaee.core.MessageDestination#getMessageDestinationName()
-	 * @see #getMessageDestination()
-	 * @generated
-	 */
-	EAttribute getMessageDestination_MessageDestinationName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.MessageDestination#getMappedName <em>Mapped Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Mapped Name</em>'.
-	 * @see org.eclipse.jst.javaee.core.MessageDestination#getMappedName()
-	 * @see #getMessageDestination()
-	 * @generated
-	 */
-	EAttribute getMessageDestination_MappedName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.MessageDestination#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.core.MessageDestination#getId()
-	 * @see #getMessageDestination()
-	 * @generated
-	 */
-	EAttribute getMessageDestination_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.core.MessageDestinationRef <em>Message Destination Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Message Destination Ref</em>'.
-	 * @see org.eclipse.jst.javaee.core.MessageDestinationRef
-	 * @generated
-	 */
-	EClass getMessageDestinationRef();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.core.MessageDestinationRef#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.javaee.core.MessageDestinationRef#getDescriptions()
-	 * @see #getMessageDestinationRef()
-	 * @generated
-	 */
-	EReference getMessageDestinationRef_Descriptions();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.MessageDestinationRef#getMessageDestinationRefName <em>Message Destination Ref Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Message Destination Ref Name</em>'.
-	 * @see org.eclipse.jst.javaee.core.MessageDestinationRef#getMessageDestinationRefName()
-	 * @see #getMessageDestinationRef()
-	 * @generated
-	 */
-	EAttribute getMessageDestinationRef_MessageDestinationRefName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.MessageDestinationRef#getMessageDestinationType <em>Message Destination Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Message Destination Type</em>'.
-	 * @see org.eclipse.jst.javaee.core.MessageDestinationRef#getMessageDestinationType()
-	 * @see #getMessageDestinationRef()
-	 * @generated
-	 */
-	EAttribute getMessageDestinationRef_MessageDestinationType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.MessageDestinationRef#getMessageDestinationUsage <em>Message Destination Usage</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Message Destination Usage</em>'.
-	 * @see org.eclipse.jst.javaee.core.MessageDestinationRef#getMessageDestinationUsage()
-	 * @see #getMessageDestinationRef()
-	 * @generated
-	 */
-	EAttribute getMessageDestinationRef_MessageDestinationUsage();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.MessageDestinationRef#getMessageDestinationLink <em>Message Destination Link</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Message Destination Link</em>'.
-	 * @see org.eclipse.jst.javaee.core.MessageDestinationRef#getMessageDestinationLink()
-	 * @see #getMessageDestinationRef()
-	 * @generated
-	 */
-	EAttribute getMessageDestinationRef_MessageDestinationLink();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.MessageDestinationRef#getMappedName <em>Mapped Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Mapped Name</em>'.
-	 * @see org.eclipse.jst.javaee.core.MessageDestinationRef#getMappedName()
-	 * @see #getMessageDestinationRef()
-	 * @generated
-	 */
-	EAttribute getMessageDestinationRef_MappedName();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.core.MessageDestinationRef#getInjectionTargets <em>Injection Targets</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Injection Targets</em>'.
-	 * @see org.eclipse.jst.javaee.core.MessageDestinationRef#getInjectionTargets()
-	 * @see #getMessageDestinationRef()
-	 * @generated
-	 */
-	EReference getMessageDestinationRef_InjectionTargets();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.MessageDestinationRef#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.core.MessageDestinationRef#getId()
-	 * @see #getMessageDestinationRef()
-	 * @generated
-	 */
-	EAttribute getMessageDestinationRef_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.core.ParamValue <em>Param Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Param Value</em>'.
-	 * @see org.eclipse.jst.javaee.core.ParamValue
-	 * @generated
-	 */
-	EClass getParamValue();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.core.ParamValue#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.javaee.core.ParamValue#getDescriptions()
-	 * @see #getParamValue()
-	 * @generated
-	 */
-	EReference getParamValue_Descriptions();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.ParamValue#getParamName <em>Param Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Param Name</em>'.
-	 * @see org.eclipse.jst.javaee.core.ParamValue#getParamName()
-	 * @see #getParamValue()
-	 * @generated
-	 */
-	EAttribute getParamValue_ParamName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.ParamValue#getParamValue <em>Param Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Param Value</em>'.
-	 * @see org.eclipse.jst.javaee.core.ParamValue#getParamValue()
-	 * @see #getParamValue()
-	 * @generated
-	 */
-	EAttribute getParamValue_ParamValue();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.ParamValue#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.core.ParamValue#getId()
-	 * @see #getParamValue()
-	 * @generated
-	 */
-	EAttribute getParamValue_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.core.PersistenceContextRef <em>Persistence Context Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Persistence Context Ref</em>'.
-	 * @see org.eclipse.jst.javaee.core.PersistenceContextRef
-	 * @generated
-	 */
-	EClass getPersistenceContextRef();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.javaee.core.PersistenceContextRef#getDescriptions()
-	 * @see #getPersistenceContextRef()
-	 * @generated
-	 */
-	EReference getPersistenceContextRef_Descriptions();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getPersistenceContextRefName <em>Persistence Context Ref Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Persistence Context Ref Name</em>'.
-	 * @see org.eclipse.jst.javaee.core.PersistenceContextRef#getPersistenceContextRefName()
-	 * @see #getPersistenceContextRef()
-	 * @generated
-	 */
-	EAttribute getPersistenceContextRef_PersistenceContextRefName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getPersistenceUnitName <em>Persistence Unit Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Persistence Unit Name</em>'.
-	 * @see org.eclipse.jst.javaee.core.PersistenceContextRef#getPersistenceUnitName()
-	 * @see #getPersistenceContextRef()
-	 * @generated
-	 */
-	EAttribute getPersistenceContextRef_PersistenceUnitName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getPersistenceContextType <em>Persistence Context Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Persistence Context Type</em>'.
-	 * @see org.eclipse.jst.javaee.core.PersistenceContextRef#getPersistenceContextType()
-	 * @see #getPersistenceContextRef()
-	 * @generated
-	 */
-	EAttribute getPersistenceContextRef_PersistenceContextType();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getPersistenceProperties <em>Persistence Properties</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Persistence Properties</em>'.
-	 * @see org.eclipse.jst.javaee.core.PersistenceContextRef#getPersistenceProperties()
-	 * @see #getPersistenceContextRef()
-	 * @generated
-	 */
-	EReference getPersistenceContextRef_PersistenceProperties();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getMappedName <em>Mapped Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Mapped Name</em>'.
-	 * @see org.eclipse.jst.javaee.core.PersistenceContextRef#getMappedName()
-	 * @see #getPersistenceContextRef()
-	 * @generated
-	 */
-	EAttribute getPersistenceContextRef_MappedName();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getInjectionTargets <em>Injection Targets</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Injection Targets</em>'.
-	 * @see org.eclipse.jst.javaee.core.PersistenceContextRef#getInjectionTargets()
-	 * @see #getPersistenceContextRef()
-	 * @generated
-	 */
-	EReference getPersistenceContextRef_InjectionTargets();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.core.PersistenceContextRef#getId()
-	 * @see #getPersistenceContextRef()
-	 * @generated
-	 */
-	EAttribute getPersistenceContextRef_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.core.PersistenceUnitRef <em>Persistence Unit Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Persistence Unit Ref</em>'.
-	 * @see org.eclipse.jst.javaee.core.PersistenceUnitRef
-	 * @generated
-	 */
-	EClass getPersistenceUnitRef();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.javaee.core.PersistenceUnitRef#getDescriptions()
-	 * @see #getPersistenceUnitRef()
-	 * @generated
-	 */
-	EReference getPersistenceUnitRef_Descriptions();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getPersistenceUnitRefName <em>Persistence Unit Ref Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Persistence Unit Ref Name</em>'.
-	 * @see org.eclipse.jst.javaee.core.PersistenceUnitRef#getPersistenceUnitRefName()
-	 * @see #getPersistenceUnitRef()
-	 * @generated
-	 */
-	EAttribute getPersistenceUnitRef_PersistenceUnitRefName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getPersistenceUnitName <em>Persistence Unit Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Persistence Unit Name</em>'.
-	 * @see org.eclipse.jst.javaee.core.PersistenceUnitRef#getPersistenceUnitName()
-	 * @see #getPersistenceUnitRef()
-	 * @generated
-	 */
-	EAttribute getPersistenceUnitRef_PersistenceUnitName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getMappedName <em>Mapped Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Mapped Name</em>'.
-	 * @see org.eclipse.jst.javaee.core.PersistenceUnitRef#getMappedName()
-	 * @see #getPersistenceUnitRef()
-	 * @generated
-	 */
-	EAttribute getPersistenceUnitRef_MappedName();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getInjectionTargets <em>Injection Targets</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Injection Targets</em>'.
-	 * @see org.eclipse.jst.javaee.core.PersistenceUnitRef#getInjectionTargets()
-	 * @see #getPersistenceUnitRef()
-	 * @generated
-	 */
-	EReference getPersistenceUnitRef_InjectionTargets();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.core.PersistenceUnitRef#getId()
-	 * @see #getPersistenceUnitRef()
-	 * @generated
-	 */
-	EAttribute getPersistenceUnitRef_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.core.PortComponentRef <em>Port Component Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Port Component Ref</em>'.
-	 * @see org.eclipse.jst.javaee.core.PortComponentRef
-	 * @generated
-	 */
-	EClass getPortComponentRef();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.PortComponentRef#getServiceEndpointInterface <em>Service Endpoint Interface</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Service Endpoint Interface</em>'.
-	 * @see org.eclipse.jst.javaee.core.PortComponentRef#getServiceEndpointInterface()
-	 * @see #getPortComponentRef()
-	 * @generated
-	 */
-	EAttribute getPortComponentRef_ServiceEndpointInterface();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.PortComponentRef#isEnableMtom <em>Enable Mtom</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Enable Mtom</em>'.
-	 * @see org.eclipse.jst.javaee.core.PortComponentRef#isEnableMtom()
-	 * @see #getPortComponentRef()
-	 * @generated
-	 */
-	EAttribute getPortComponentRef_EnableMtom();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.PortComponentRef#getPortComponentLink <em>Port Component Link</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Port Component Link</em>'.
-	 * @see org.eclipse.jst.javaee.core.PortComponentRef#getPortComponentLink()
-	 * @see #getPortComponentRef()
-	 * @generated
-	 */
-	EAttribute getPortComponentRef_PortComponentLink();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.PortComponentRef#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.core.PortComponentRef#getId()
-	 * @see #getPortComponentRef()
-	 * @generated
-	 */
-	EAttribute getPortComponentRef_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.core.PropertyType <em>Property Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Property Type</em>'.
-	 * @see org.eclipse.jst.javaee.core.PropertyType
-	 * @generated
-	 */
-	EClass getPropertyType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.PropertyType#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jst.javaee.core.PropertyType#getName()
-	 * @see #getPropertyType()
-	 * @generated
-	 */
-	EAttribute getPropertyType_Name();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.PropertyType#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.jst.javaee.core.PropertyType#getValue()
-	 * @see #getPropertyType()
-	 * @generated
-	 */
-	EAttribute getPropertyType_Value();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.PropertyType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.core.PropertyType#getId()
-	 * @see #getPropertyType()
-	 * @generated
-	 */
-	EAttribute getPropertyType_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.core.ResourceEnvRef <em>Resource Env Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Resource Env Ref</em>'.
-	 * @see org.eclipse.jst.javaee.core.ResourceEnvRef
-	 * @generated
-	 */
-	EClass getResourceEnvRef();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.core.ResourceEnvRef#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.javaee.core.ResourceEnvRef#getDescriptions()
-	 * @see #getResourceEnvRef()
-	 * @generated
-	 */
-	EReference getResourceEnvRef_Descriptions();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.ResourceEnvRef#getResourceEnvRefName <em>Resource Env Ref Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Resource Env Ref Name</em>'.
-	 * @see org.eclipse.jst.javaee.core.ResourceEnvRef#getResourceEnvRefName()
-	 * @see #getResourceEnvRef()
-	 * @generated
-	 */
-	EAttribute getResourceEnvRef_ResourceEnvRefName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.ResourceEnvRef#getResourceEnvRefType <em>Resource Env Ref Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Resource Env Ref Type</em>'.
-	 * @see org.eclipse.jst.javaee.core.ResourceEnvRef#getResourceEnvRefType()
-	 * @see #getResourceEnvRef()
-	 * @generated
-	 */
-	EAttribute getResourceEnvRef_ResourceEnvRefType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.ResourceEnvRef#getMappedName <em>Mapped Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Mapped Name</em>'.
-	 * @see org.eclipse.jst.javaee.core.ResourceEnvRef#getMappedName()
-	 * @see #getResourceEnvRef()
-	 * @generated
-	 */
-	EAttribute getResourceEnvRef_MappedName();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.core.ResourceEnvRef#getInjectionTargets <em>Injection Targets</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Injection Targets</em>'.
-	 * @see org.eclipse.jst.javaee.core.ResourceEnvRef#getInjectionTargets()
-	 * @see #getResourceEnvRef()
-	 * @generated
-	 */
-	EReference getResourceEnvRef_InjectionTargets();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.ResourceEnvRef#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.core.ResourceEnvRef#getId()
-	 * @see #getResourceEnvRef()
-	 * @generated
-	 */
-	EAttribute getResourceEnvRef_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.core.ResourceRef <em>Resource Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Resource Ref</em>'.
-	 * @see org.eclipse.jst.javaee.core.ResourceRef
-	 * @generated
-	 */
-	EClass getResourceRef();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.core.ResourceRef#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.javaee.core.ResourceRef#getDescriptions()
-	 * @see #getResourceRef()
-	 * @generated
-	 */
-	EReference getResourceRef_Descriptions();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.ResourceRef#getResRefName <em>Res Ref Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Res Ref Name</em>'.
-	 * @see org.eclipse.jst.javaee.core.ResourceRef#getResRefName()
-	 * @see #getResourceRef()
-	 * @generated
-	 */
-	EAttribute getResourceRef_ResRefName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.ResourceRef#getResType <em>Res Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Res Type</em>'.
-	 * @see org.eclipse.jst.javaee.core.ResourceRef#getResType()
-	 * @see #getResourceRef()
-	 * @generated
-	 */
-	EAttribute getResourceRef_ResType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.ResourceRef#getResAuth <em>Res Auth</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Res Auth</em>'.
-	 * @see org.eclipse.jst.javaee.core.ResourceRef#getResAuth()
-	 * @see #getResourceRef()
-	 * @generated
-	 */
-	EAttribute getResourceRef_ResAuth();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.ResourceRef#getResSharingScope <em>Res Sharing Scope</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Res Sharing Scope</em>'.
-	 * @see org.eclipse.jst.javaee.core.ResourceRef#getResSharingScope()
-	 * @see #getResourceRef()
-	 * @generated
-	 */
-	EAttribute getResourceRef_ResSharingScope();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.ResourceRef#getMappedName <em>Mapped Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Mapped Name</em>'.
-	 * @see org.eclipse.jst.javaee.core.ResourceRef#getMappedName()
-	 * @see #getResourceRef()
-	 * @generated
-	 */
-	EAttribute getResourceRef_MappedName();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.core.ResourceRef#getInjectionTargets <em>Injection Targets</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Injection Targets</em>'.
-	 * @see org.eclipse.jst.javaee.core.ResourceRef#getInjectionTargets()
-	 * @see #getResourceRef()
-	 * @generated
-	 */
-	EReference getResourceRef_InjectionTargets();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.ResourceRef#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.core.ResourceRef#getId()
-	 * @see #getResourceRef()
-	 * @generated
-	 */
-	EAttribute getResourceRef_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.core.RunAs <em>Run As</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Run As</em>'.
-	 * @see org.eclipse.jst.javaee.core.RunAs
-	 * @generated
-	 */
-	EClass getRunAs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.core.RunAs#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.javaee.core.RunAs#getDescriptions()
-	 * @see #getRunAs()
-	 * @generated
-	 */
-	EReference getRunAs_Descriptions();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.RunAs#getRoleName <em>Role Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Role Name</em>'.
-	 * @see org.eclipse.jst.javaee.core.RunAs#getRoleName()
-	 * @see #getRunAs()
-	 * @generated
-	 */
-	EAttribute getRunAs_RoleName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.RunAs#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.core.RunAs#getId()
-	 * @see #getRunAs()
-	 * @generated
-	 */
-	EAttribute getRunAs_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.core.SecurityRole <em>Security Role</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Security Role</em>'.
-	 * @see org.eclipse.jst.javaee.core.SecurityRole
-	 * @generated
-	 */
-	EClass getSecurityRole();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.core.SecurityRole#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.javaee.core.SecurityRole#getDescriptions()
-	 * @see #getSecurityRole()
-	 * @generated
-	 */
-	EReference getSecurityRole_Descriptions();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.SecurityRole#getRoleName <em>Role Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Role Name</em>'.
-	 * @see org.eclipse.jst.javaee.core.SecurityRole#getRoleName()
-	 * @see #getSecurityRole()
-	 * @generated
-	 */
-	EAttribute getSecurityRole_RoleName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.SecurityRole#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.core.SecurityRole#getId()
-	 * @see #getSecurityRole()
-	 * @generated
-	 */
-	EAttribute getSecurityRole_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.core.SecurityRoleRef <em>Security Role Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Security Role Ref</em>'.
-	 * @see org.eclipse.jst.javaee.core.SecurityRoleRef
-	 * @generated
-	 */
-	EClass getSecurityRoleRef();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.core.SecurityRoleRef#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.javaee.core.SecurityRoleRef#getDescriptions()
-	 * @see #getSecurityRoleRef()
-	 * @generated
-	 */
-	EReference getSecurityRoleRef_Descriptions();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.SecurityRoleRef#getRoleName <em>Role Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Role Name</em>'.
-	 * @see org.eclipse.jst.javaee.core.SecurityRoleRef#getRoleName()
-	 * @see #getSecurityRoleRef()
-	 * @generated
-	 */
-	EAttribute getSecurityRoleRef_RoleName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.SecurityRoleRef#getRoleLink <em>Role Link</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Role Link</em>'.
-	 * @see org.eclipse.jst.javaee.core.SecurityRoleRef#getRoleLink()
-	 * @see #getSecurityRoleRef()
-	 * @generated
-	 */
-	EAttribute getSecurityRoleRef_RoleLink();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.SecurityRoleRef#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.core.SecurityRoleRef#getId()
-	 * @see #getSecurityRoleRef()
-	 * @generated
-	 */
-	EAttribute getSecurityRoleRef_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.core.ServiceRef <em>Service Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Service Ref</em>'.
-	 * @see org.eclipse.jst.javaee.core.ServiceRef
-	 * @generated
-	 */
-	EClass getServiceRef();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.core.ServiceRef#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.javaee.core.ServiceRef#getDescriptions()
-	 * @see #getServiceRef()
-	 * @generated
-	 */
-	EReference getServiceRef_Descriptions();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.core.ServiceRef#getDisplayNames <em>Display Names</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Display Names</em>'.
-	 * @see org.eclipse.jst.javaee.core.ServiceRef#getDisplayNames()
-	 * @see #getServiceRef()
-	 * @generated
-	 */
-	EReference getServiceRef_DisplayNames();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.core.ServiceRef#getIcons <em>Icons</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Icons</em>'.
-	 * @see org.eclipse.jst.javaee.core.ServiceRef#getIcons()
-	 * @see #getServiceRef()
-	 * @generated
-	 */
-	EReference getServiceRef_Icons();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.ServiceRef#getServiceRefName <em>Service Ref Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Service Ref Name</em>'.
-	 * @see org.eclipse.jst.javaee.core.ServiceRef#getServiceRefName()
-	 * @see #getServiceRef()
-	 * @generated
-	 */
-	EAttribute getServiceRef_ServiceRefName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.ServiceRef#getServiceInterface <em>Service Interface</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Service Interface</em>'.
-	 * @see org.eclipse.jst.javaee.core.ServiceRef#getServiceInterface()
-	 * @see #getServiceRef()
-	 * @generated
-	 */
-	EAttribute getServiceRef_ServiceInterface();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.ServiceRef#getServiceRefType <em>Service Ref Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Service Ref Type</em>'.
-	 * @see org.eclipse.jst.javaee.core.ServiceRef#getServiceRefType()
-	 * @see #getServiceRef()
-	 * @generated
-	 */
-	EAttribute getServiceRef_ServiceRefType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.ServiceRef#getWsdlFile <em>Wsdl File</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Wsdl File</em>'.
-	 * @see org.eclipse.jst.javaee.core.ServiceRef#getWsdlFile()
-	 * @see #getServiceRef()
-	 * @generated
-	 */
-	EAttribute getServiceRef_WsdlFile();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.ServiceRef#getJaxrpcMappingFile <em>Jaxrpc Mapping File</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Jaxrpc Mapping File</em>'.
-	 * @see org.eclipse.jst.javaee.core.ServiceRef#getJaxrpcMappingFile()
-	 * @see #getServiceRef()
-	 * @generated
-	 */
-	EAttribute getServiceRef_JaxrpcMappingFile();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.ServiceRef#getServiceQname <em>Service Qname</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Service Qname</em>'.
-	 * @see org.eclipse.jst.javaee.core.ServiceRef#getServiceQname()
-	 * @see #getServiceRef()
-	 * @generated
-	 */
-	EAttribute getServiceRef_ServiceQname();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.core.ServiceRef#getPortComponentRefs <em>Port Component Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Port Component Refs</em>'.
-	 * @see org.eclipse.jst.javaee.core.ServiceRef#getPortComponentRefs()
-	 * @see #getServiceRef()
-	 * @generated
-	 */
-	EReference getServiceRef_PortComponentRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.core.ServiceRef#getHandlers <em>Handlers</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Handlers</em>'.
-	 * @see org.eclipse.jst.javaee.core.ServiceRef#getHandlers()
-	 * @see #getServiceRef()
-	 * @generated
-	 */
-	EReference getServiceRef_Handlers();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.core.ServiceRef#getHandlerChains <em>Handler Chains</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Handler Chains</em>'.
-	 * @see org.eclipse.jst.javaee.core.ServiceRef#getHandlerChains()
-	 * @see #getServiceRef()
-	 * @generated
-	 */
-	EReference getServiceRef_HandlerChains();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.ServiceRef#getMappedName <em>Mapped Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Mapped Name</em>'.
-	 * @see org.eclipse.jst.javaee.core.ServiceRef#getMappedName()
-	 * @see #getServiceRef()
-	 * @generated
-	 */
-	EAttribute getServiceRef_MappedName();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.core.ServiceRef#getInjectionTargets <em>Injection Targets</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Injection Targets</em>'.
-	 * @see org.eclipse.jst.javaee.core.ServiceRef#getInjectionTargets()
-	 * @see #getServiceRef()
-	 * @generated
-	 */
-	EReference getServiceRef_InjectionTargets();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.ServiceRef#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.core.ServiceRef#getId()
-	 * @see #getServiceRef()
-	 * @generated
-	 */
-	EAttribute getServiceRef_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.core.ServiceRefHandler <em>Service Ref Handler</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Service Ref Handler</em>'.
-	 * @see org.eclipse.jst.javaee.core.ServiceRefHandler
-	 * @generated
-	 */
-	EClass getServiceRefHandler();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.core.ServiceRefHandler#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.javaee.core.ServiceRefHandler#getDescriptions()
-	 * @see #getServiceRefHandler()
-	 * @generated
-	 */
-	EReference getServiceRefHandler_Descriptions();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.core.ServiceRefHandler#getDisplayNames <em>Display Names</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Display Names</em>'.
-	 * @see org.eclipse.jst.javaee.core.ServiceRefHandler#getDisplayNames()
-	 * @see #getServiceRefHandler()
-	 * @generated
-	 */
-	EReference getServiceRefHandler_DisplayNames();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.core.ServiceRefHandler#getIcons <em>Icons</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Icons</em>'.
-	 * @see org.eclipse.jst.javaee.core.ServiceRefHandler#getIcons()
-	 * @see #getServiceRefHandler()
-	 * @generated
-	 */
-	EReference getServiceRefHandler_Icons();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.ServiceRefHandler#getHandlerName <em>Handler Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Handler Name</em>'.
-	 * @see org.eclipse.jst.javaee.core.ServiceRefHandler#getHandlerName()
-	 * @see #getServiceRefHandler()
-	 * @generated
-	 */
-	EAttribute getServiceRefHandler_HandlerName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.ServiceRefHandler#getHandlerClass <em>Handler Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Handler Class</em>'.
-	 * @see org.eclipse.jst.javaee.core.ServiceRefHandler#getHandlerClass()
-	 * @see #getServiceRefHandler()
-	 * @generated
-	 */
-	EAttribute getServiceRefHandler_HandlerClass();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.core.ServiceRefHandler#getInitParams <em>Init Params</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Init Params</em>'.
-	 * @see org.eclipse.jst.javaee.core.ServiceRefHandler#getInitParams()
-	 * @see #getServiceRefHandler()
-	 * @generated
-	 */
-	EReference getServiceRefHandler_InitParams();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.core.ServiceRefHandler#getSoapHeaders <em>Soap Headers</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Soap Headers</em>'.
-	 * @see org.eclipse.jst.javaee.core.ServiceRefHandler#getSoapHeaders()
-	 * @see #getServiceRefHandler()
-	 * @generated
-	 */
-	EAttribute getServiceRefHandler_SoapHeaders();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.core.ServiceRefHandler#getSoapRoles <em>Soap Roles</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Soap Roles</em>'.
-	 * @see org.eclipse.jst.javaee.core.ServiceRefHandler#getSoapRoles()
-	 * @see #getServiceRefHandler()
-	 * @generated
-	 */
-	EAttribute getServiceRefHandler_SoapRoles();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.core.ServiceRefHandler#getPortNames <em>Port Names</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Port Names</em>'.
-	 * @see org.eclipse.jst.javaee.core.ServiceRefHandler#getPortNames()
-	 * @see #getServiceRefHandler()
-	 * @generated
-	 */
-	EAttribute getServiceRefHandler_PortNames();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.ServiceRefHandler#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.core.ServiceRefHandler#getId()
-	 * @see #getServiceRefHandler()
-	 * @generated
-	 */
-	EAttribute getServiceRefHandler_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.core.ServiceRefHandlerChain <em>Service Ref Handler Chain</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Service Ref Handler Chain</em>'.
-	 * @see org.eclipse.jst.javaee.core.ServiceRefHandlerChain
-	 * @generated
-	 */
-	EClass getServiceRefHandlerChain();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.ServiceRefHandlerChain#getServiceNamePattern <em>Service Name Pattern</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Service Name Pattern</em>'.
-	 * @see org.eclipse.jst.javaee.core.ServiceRefHandlerChain#getServiceNamePattern()
-	 * @see #getServiceRefHandlerChain()
-	 * @generated
-	 */
-	EAttribute getServiceRefHandlerChain_ServiceNamePattern();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.ServiceRefHandlerChain#getPortNamePattern <em>Port Name Pattern</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Port Name Pattern</em>'.
-	 * @see org.eclipse.jst.javaee.core.ServiceRefHandlerChain#getPortNamePattern()
-	 * @see #getServiceRefHandlerChain()
-	 * @generated
-	 */
-	EAttribute getServiceRefHandlerChain_PortNamePattern();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.ServiceRefHandlerChain#getProtocolBindings <em>Protocol Bindings</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Protocol Bindings</em>'.
-	 * @see org.eclipse.jst.javaee.core.ServiceRefHandlerChain#getProtocolBindings()
-	 * @see #getServiceRefHandlerChain()
-	 * @generated
-	 */
-	EAttribute getServiceRefHandlerChain_ProtocolBindings();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.core.ServiceRefHandlerChain#getHandlers <em>Handlers</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Handlers</em>'.
-	 * @see org.eclipse.jst.javaee.core.ServiceRefHandlerChain#getHandlers()
-	 * @see #getServiceRefHandlerChain()
-	 * @generated
-	 */
-	EReference getServiceRefHandlerChain_Handlers();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.ServiceRefHandlerChain#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.core.ServiceRefHandlerChain#getId()
-	 * @see #getServiceRefHandlerChain()
-	 * @generated
-	 */
-	EAttribute getServiceRefHandlerChain_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.core.ServiceRefHandlerChains <em>Service Ref Handler Chains</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Service Ref Handler Chains</em>'.
-	 * @see org.eclipse.jst.javaee.core.ServiceRefHandlerChains
-	 * @generated
-	 */
-	EClass getServiceRefHandlerChains();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.core.ServiceRefHandlerChains#getHandlerChains <em>Handler Chains</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Handler Chains</em>'.
-	 * @see org.eclipse.jst.javaee.core.ServiceRefHandlerChains#getHandlerChains()
-	 * @see #getServiceRefHandlerChains()
-	 * @generated
-	 */
-	EReference getServiceRefHandlerChains_HandlerChains();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.ServiceRefHandlerChains#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.core.ServiceRefHandlerChains#getId()
-	 * @see #getServiceRefHandlerChains()
-	 * @generated
-	 */
-	EAttribute getServiceRefHandlerChains_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.core.UrlPatternType <em>Url Pattern Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Url Pattern Type</em>'.
-	 * @see org.eclipse.jst.javaee.core.UrlPatternType
-	 * @generated
-	 */
-	EClass getUrlPatternType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.UrlPatternType#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.jst.javaee.core.UrlPatternType#getValue()
-	 * @see #getUrlPatternType()
-	 * @generated
-	 */
-	EAttribute getUrlPatternType_Value();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jst.javaee.core.EjbRefType <em>Ejb Ref Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Ejb Ref Type</em>'.
-	 * @see org.eclipse.jst.javaee.core.EjbRefType
-	 * @generated
-	 */
-	EEnum getEjbRefType();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jst.javaee.core.EnvEntryType <em>Env Entry Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Env Entry Type</em>'.
-	 * @see org.eclipse.jst.javaee.core.EnvEntryType
-	 * @generated
-	 */
-	EEnum getEnvEntryType();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jst.javaee.core.MessageDestinationUsageType <em>Message Destination Usage Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Message Destination Usage Type</em>'.
-	 * @see org.eclipse.jst.javaee.core.MessageDestinationUsageType
-	 * @generated
-	 */
-	EEnum getMessageDestinationUsageType();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jst.javaee.core.PersistenceContextType <em>Persistence Context Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Persistence Context Type</em>'.
-	 * @see org.eclipse.jst.javaee.core.PersistenceContextType
-	 * @generated
-	 */
-	EEnum getPersistenceContextType();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jst.javaee.core.ResAuthType <em>Res Auth Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Res Auth Type</em>'.
-	 * @see org.eclipse.jst.javaee.core.ResAuthType
-	 * @generated
-	 */
-	EEnum getResAuthType();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jst.javaee.core.ResSharingScopeType <em>Res Sharing Scope Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Res Sharing Scope Type</em>'.
-	 * @see org.eclipse.jst.javaee.core.ResSharingScopeType
-	 * @generated
-	 */
-	EEnum getResSharingScopeType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Dewey Version Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Dewey Version Type</em>'.
-	 * @see java.lang.String
-	 * @generated
-	 */
-	EDataType getDeweyVersionType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>EJB Link</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>EJB Link</em>'.
-	 * @see java.lang.String
-	 * @generated
-	 */
-	EDataType getEJBLink();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Ejb Ref Name Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Ejb Ref Name Type</em>'.
-	 * @see java.lang.String
-	 * @generated
-	 */
-	EDataType getEjbRefNameType();
-
-	/**
-	 * Returns the meta object for data type '{@link org.eclipse.jst.javaee.core.EjbRefType <em>Ejb Ref Type Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Ejb Ref Type Object</em>'.
-	 * @see org.eclipse.jst.javaee.core.EjbRefType
-	 * @generated
-	 */
-	EDataType getEjbRefTypeObject();
-
-	/**
-	 * Returns the meta object for data type '{@link org.eclipse.jst.javaee.core.EnvEntryType <em>Env Entry Type Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Env Entry Type Object</em>'.
-	 * @see org.eclipse.jst.javaee.core.EnvEntryType
-	 * @generated
-	 */
-	EDataType getEnvEntryTypeObject();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Fully Qualified Class Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Fully Qualified Class Type</em>'.
-	 * @see java.lang.String
-	 * @generated
-	 */
-	EDataType getFullyQualifiedClassType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Home</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Home</em>'.
-	 * @see java.lang.String
-	 * @generated
-	 */
-	EDataType getHome();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Java Identifier</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Java Identifier</em>'.
-	 * @see java.lang.String
-	 * @generated
-	 */
-	EDataType getJavaIdentifier();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Java Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Java Type</em>'.
-	 * @see java.lang.String
-	 * @generated
-	 */
-	EDataType getJavaType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>JNDI Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>JNDI Name</em>'.
-	 * @see java.lang.String
-	 * @generated
-	 */
-	EDataType getJNDIName();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Local</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Local</em>'.
-	 * @see java.lang.String
-	 * @generated
-	 */
-	EDataType getLocal();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Local Home</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Local Home</em>'.
-	 * @see java.lang.String
-	 * @generated
-	 */
-	EDataType getLocalHome();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Message Destination Link</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Message Destination Link</em>'.
-	 * @see java.lang.String
-	 * @generated
-	 */
-	EDataType getMessageDestinationLink();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Message Destination Type Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Message Destination Type Type</em>'.
-	 * @see java.lang.String
-	 * @generated
-	 */
-	EDataType getMessageDestinationTypeType();
-
-	/**
-	 * Returns the meta object for data type '{@link org.eclipse.jst.javaee.core.MessageDestinationUsageType <em>Message Destination Usage Type Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Message Destination Usage Type Object</em>'.
-	 * @see org.eclipse.jst.javaee.core.MessageDestinationUsageType
-	 * @generated
-	 */
-	EDataType getMessageDestinationUsageTypeObject();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Path Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Path Type</em>'.
-	 * @see java.lang.String
-	 * @generated
-	 */
-	EDataType getPathType();
-
-	/**
-	 * Returns the meta object for data type '{@link org.eclipse.jst.javaee.core.PersistenceContextType <em>Persistence Context Type Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Persistence Context Type Object</em>'.
-	 * @see org.eclipse.jst.javaee.core.PersistenceContextType
-	 * @generated
-	 */
-	EDataType getPersistenceContextTypeObject();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Remote</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Remote</em>'.
-	 * @see java.lang.String
-	 * @generated
-	 */
-	EDataType getRemote();
-
-	/**
-	 * Returns the meta object for data type '{@link org.eclipse.jst.javaee.core.ResAuthType <em>Res Auth Type Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Res Auth Type Object</em>'.
-	 * @see org.eclipse.jst.javaee.core.ResAuthType
-	 * @generated
-	 */
-	EDataType getResAuthTypeObject();
-
-	/**
-	 * Returns the meta object for data type '{@link org.eclipse.jst.javaee.core.ResSharingScopeType <em>Res Sharing Scope Type Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Res Sharing Scope Type Object</em>'.
-	 * @see org.eclipse.jst.javaee.core.ResSharingScopeType
-	 * @generated
-	 */
-	EDataType getResSharingScopeTypeObject();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Role Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Role Name</em>'.
-	 * @see java.lang.String
-	 * @generated
-	 */
-	EDataType getRoleName();
-
-	/**
-	 * Returns the meta object for data type '{@link java.util.List <em>Service Ref Protocol Binding List Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Service Ref Protocol Binding List Type</em>'.
-	 * @see java.util.List
-	 * @generated
-	 */
-	EDataType getServiceRefProtocolBindingListType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Service Ref Protocol Binding Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Service Ref Protocol Binding Type</em>'.
-	 * @see java.lang.String
-	 * @generated
-	 */
-	EDataType getServiceRefProtocolBindingType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Service Ref Protocol URI Alias Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Service Ref Protocol URI Alias Type</em>'.
-	 * @see java.lang.String
-	 * @generated
-	 */
-	EDataType getServiceRefProtocolURIAliasType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Service Ref Qname Pattern</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Service Ref Qname Pattern</em>'.
-	 * @see java.lang.String
-	 * @generated
-	 */
-	EDataType getServiceRefQnamePattern();
-
-	/**
-	 * Returns the meta object for data type '<em>True False Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>True False Type</em>'.
-	 * @generated
-	 */
-	EDataType getTrueFalseType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.Boolean <em>True False Type Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>True False Type Object</em>'.
-	 * @see java.lang.Boolean
-	 * @generated
-	 */
-	EDataType getTrueFalseTypeObject();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	JavaeeFactory getJavaeeFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * 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>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals  {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.core.internal.impl.DescriptionImpl <em>Description</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.core.internal.impl.DescriptionImpl
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getDescription()
-		 * @generated
-		 */
-		EClass DESCRIPTION = eINSTANCE.getDescription();
-
-		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DESCRIPTION__VALUE = eINSTANCE.getDescription_Value();
-
-		/**
-		 * The meta object literal for the '<em><b>Lang</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DESCRIPTION__LANG = eINSTANCE.getDescription_Lang();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.core.internal.impl.DisplayNameImpl <em>Display Name</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.core.internal.impl.DisplayNameImpl
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getDisplayName()
-		 * @generated
-		 */
-		EClass DISPLAY_NAME = eINSTANCE.getDisplayName();
-
-		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DISPLAY_NAME__VALUE = eINSTANCE.getDisplayName_Value();
-
-		/**
-		 * The meta object literal for the '<em><b>Lang</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DISPLAY_NAME__LANG = eINSTANCE.getDisplayName_Lang();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.core.internal.impl.EjbLocalRefImpl <em>Ejb Local Ref</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.core.internal.impl.EjbLocalRefImpl
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getEjbLocalRef()
-		 * @generated
-		 */
-		EClass EJB_LOCAL_REF = eINSTANCE.getEjbLocalRef();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EJB_LOCAL_REF__DESCRIPTIONS = eINSTANCE.getEjbLocalRef_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb Ref Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EJB_LOCAL_REF__EJB_REF_NAME = eINSTANCE.getEjbLocalRef_EjbRefName();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb Ref Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EJB_LOCAL_REF__EJB_REF_TYPE = eINSTANCE.getEjbLocalRef_EjbRefType();
-
-		/**
-		 * The meta object literal for the '<em><b>Local Home</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EJB_LOCAL_REF__LOCAL_HOME = eINSTANCE.getEjbLocalRef_LocalHome();
-
-		/**
-		 * The meta object literal for the '<em><b>Local</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EJB_LOCAL_REF__LOCAL = eINSTANCE.getEjbLocalRef_Local();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb Link</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EJB_LOCAL_REF__EJB_LINK = eINSTANCE.getEjbLocalRef_EjbLink();
-
-		/**
-		 * The meta object literal for the '<em><b>Mapped Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EJB_LOCAL_REF__MAPPED_NAME = eINSTANCE.getEjbLocalRef_MappedName();
-
-		/**
-		 * The meta object literal for the '<em><b>Injection Targets</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EJB_LOCAL_REF__INJECTION_TARGETS = eINSTANCE.getEjbLocalRef_InjectionTargets();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EJB_LOCAL_REF__ID = eINSTANCE.getEjbLocalRef_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.core.internal.impl.EjbRefImpl <em>Ejb Ref</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.core.internal.impl.EjbRefImpl
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getEjbRef()
-		 * @generated
-		 */
-		EClass EJB_REF = eINSTANCE.getEjbRef();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EJB_REF__DESCRIPTIONS = eINSTANCE.getEjbRef_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb Ref Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EJB_REF__EJB_REF_NAME = eINSTANCE.getEjbRef_EjbRefName();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb Ref Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EJB_REF__EJB_REF_TYPE = eINSTANCE.getEjbRef_EjbRefType();
-
-		/**
-		 * The meta object literal for the '<em><b>Home</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EJB_REF__HOME = eINSTANCE.getEjbRef_Home();
-
-		/**
-		 * The meta object literal for the '<em><b>Remote</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EJB_REF__REMOTE = eINSTANCE.getEjbRef_Remote();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb Link</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EJB_REF__EJB_LINK = eINSTANCE.getEjbRef_EjbLink();
-
-		/**
-		 * The meta object literal for the '<em><b>Mapped Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EJB_REF__MAPPED_NAME = eINSTANCE.getEjbRef_MappedName();
-
-		/**
-		 * The meta object literal for the '<em><b>Injection Targets</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EJB_REF__INJECTION_TARGETS = eINSTANCE.getEjbRef_InjectionTargets();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EJB_REF__ID = eINSTANCE.getEjbRef_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.core.internal.impl.EmptyTypeImpl <em>Empty Type</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.core.internal.impl.EmptyTypeImpl
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getEmptyType()
-		 * @generated
-		 */
-		EClass EMPTY_TYPE = eINSTANCE.getEmptyType();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EMPTY_TYPE__ID = eINSTANCE.getEmptyType_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.core.internal.impl.EnvEntryImpl <em>Env Entry</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.core.internal.impl.EnvEntryImpl
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getEnvEntry()
-		 * @generated
-		 */
-		EClass ENV_ENTRY = eINSTANCE.getEnvEntry();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ENV_ENTRY__DESCRIPTIONS = eINSTANCE.getEnvEntry_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Env Entry Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ENV_ENTRY__ENV_ENTRY_NAME = eINSTANCE.getEnvEntry_EnvEntryName();
-
-		/**
-		 * The meta object literal for the '<em><b>Env Entry Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ENV_ENTRY__ENV_ENTRY_TYPE = eINSTANCE.getEnvEntry_EnvEntryType();
-
-		/**
-		 * The meta object literal for the '<em><b>Env Entry Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ENV_ENTRY__ENV_ENTRY_VALUE = eINSTANCE.getEnvEntry_EnvEntryValue();
-
-		/**
-		 * The meta object literal for the '<em><b>Mapped Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ENV_ENTRY__MAPPED_NAME = eINSTANCE.getEnvEntry_MappedName();
-
-		/**
-		 * The meta object literal for the '<em><b>Injection Targets</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ENV_ENTRY__INJECTION_TARGETS = eINSTANCE.getEnvEntry_InjectionTargets();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ENV_ENTRY__ID = eINSTANCE.getEnvEntry_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.core.internal.impl.IconImpl <em>Icon</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.core.internal.impl.IconImpl
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getIcon()
-		 * @generated
-		 */
-		EClass ICON = eINSTANCE.getIcon();
-
-		/**
-		 * The meta object literal for the '<em><b>Small Icon</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ICON__SMALL_ICON = eINSTANCE.getIcon_SmallIcon();
-
-		/**
-		 * The meta object literal for the '<em><b>Large Icon</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ICON__LARGE_ICON = eINSTANCE.getIcon_LargeIcon();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ICON__ID = eINSTANCE.getIcon_Id();
-
-		/**
-		 * The meta object literal for the '<em><b>Lang</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ICON__LANG = eINSTANCE.getIcon_Lang();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.core.internal.impl.InjectionTargetImpl <em>Injection Target</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.core.internal.impl.InjectionTargetImpl
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getInjectionTarget()
-		 * @generated
-		 */
-		EClass INJECTION_TARGET = eINSTANCE.getInjectionTarget();
-
-		/**
-		 * The meta object literal for the '<em><b>Injection Target Class</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute INJECTION_TARGET__INJECTION_TARGET_CLASS = eINSTANCE.getInjectionTarget_InjectionTargetClass();
-
-		/**
-		 * The meta object literal for the '<em><b>Injection Target Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute INJECTION_TARGET__INJECTION_TARGET_NAME = eINSTANCE.getInjectionTarget_InjectionTargetName();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.core.internal.impl.LifecycleCallbackImpl <em>Lifecycle Callback</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.core.internal.impl.LifecycleCallbackImpl
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getLifecycleCallback()
-		 * @generated
-		 */
-		EClass LIFECYCLE_CALLBACK = eINSTANCE.getLifecycleCallback();
-
-		/**
-		 * The meta object literal for the '<em><b>Lifecycle Callback Class</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute LIFECYCLE_CALLBACK__LIFECYCLE_CALLBACK_CLASS = eINSTANCE.getLifecycleCallback_LifecycleCallbackClass();
-
-		/**
-		 * The meta object literal for the '<em><b>Lifecycle Callback Method</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute LIFECYCLE_CALLBACK__LIFECYCLE_CALLBACK_METHOD = eINSTANCE.getLifecycleCallback_LifecycleCallbackMethod();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.core.internal.impl.ListenerImpl <em>Listener</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.core.internal.impl.ListenerImpl
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getListener()
-		 * @generated
-		 */
-		EClass LISTENER = eINSTANCE.getListener();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference LISTENER__DESCRIPTIONS = eINSTANCE.getListener_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Display Names</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference LISTENER__DISPLAY_NAMES = eINSTANCE.getListener_DisplayNames();
-
-		/**
-		 * The meta object literal for the '<em><b>Icons</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference LISTENER__ICONS = eINSTANCE.getListener_Icons();
-
-		/**
-		 * The meta object literal for the '<em><b>Listener Class</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute LISTENER__LISTENER_CLASS = eINSTANCE.getListener_ListenerClass();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute LISTENER__ID = eINSTANCE.getListener_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.core.internal.impl.MessageDestinationImpl <em>Message Destination</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.core.internal.impl.MessageDestinationImpl
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getMessageDestination()
-		 * @generated
-		 */
-		EClass MESSAGE_DESTINATION = eINSTANCE.getMessageDestination();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MESSAGE_DESTINATION__DESCRIPTIONS = eINSTANCE.getMessageDestination_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Display Names</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MESSAGE_DESTINATION__DISPLAY_NAMES = eINSTANCE.getMessageDestination_DisplayNames();
-
-		/**
-		 * The meta object literal for the '<em><b>Icons</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MESSAGE_DESTINATION__ICONS = eINSTANCE.getMessageDestination_Icons();
-
-		/**
-		 * The meta object literal for the '<em><b>Message Destination Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MESSAGE_DESTINATION__MESSAGE_DESTINATION_NAME = eINSTANCE.getMessageDestination_MessageDestinationName();
-
-		/**
-		 * The meta object literal for the '<em><b>Mapped Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MESSAGE_DESTINATION__MAPPED_NAME = eINSTANCE.getMessageDestination_MappedName();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MESSAGE_DESTINATION__ID = eINSTANCE.getMessageDestination_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.core.internal.impl.MessageDestinationRefImpl <em>Message Destination Ref</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.core.internal.impl.MessageDestinationRefImpl
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getMessageDestinationRef()
-		 * @generated
-		 */
-		EClass MESSAGE_DESTINATION_REF = eINSTANCE.getMessageDestinationRef();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MESSAGE_DESTINATION_REF__DESCRIPTIONS = eINSTANCE.getMessageDestinationRef_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Message Destination Ref Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MESSAGE_DESTINATION_REF__MESSAGE_DESTINATION_REF_NAME = eINSTANCE.getMessageDestinationRef_MessageDestinationRefName();
-
-		/**
-		 * The meta object literal for the '<em><b>Message Destination Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MESSAGE_DESTINATION_REF__MESSAGE_DESTINATION_TYPE = eINSTANCE.getMessageDestinationRef_MessageDestinationType();
-
-		/**
-		 * The meta object literal for the '<em><b>Message Destination Usage</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MESSAGE_DESTINATION_REF__MESSAGE_DESTINATION_USAGE = eINSTANCE.getMessageDestinationRef_MessageDestinationUsage();
-
-		/**
-		 * The meta object literal for the '<em><b>Message Destination Link</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MESSAGE_DESTINATION_REF__MESSAGE_DESTINATION_LINK = eINSTANCE.getMessageDestinationRef_MessageDestinationLink();
-
-		/**
-		 * The meta object literal for the '<em><b>Mapped Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MESSAGE_DESTINATION_REF__MAPPED_NAME = eINSTANCE.getMessageDestinationRef_MappedName();
-
-		/**
-		 * The meta object literal for the '<em><b>Injection Targets</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MESSAGE_DESTINATION_REF__INJECTION_TARGETS = eINSTANCE.getMessageDestinationRef_InjectionTargets();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MESSAGE_DESTINATION_REF__ID = eINSTANCE.getMessageDestinationRef_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.core.internal.impl.ParamValueImpl <em>Param Value</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.core.internal.impl.ParamValueImpl
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getParamValue()
-		 * @generated
-		 */
-		EClass PARAM_VALUE = eINSTANCE.getParamValue();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PARAM_VALUE__DESCRIPTIONS = eINSTANCE.getParamValue_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Param Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PARAM_VALUE__PARAM_NAME = eINSTANCE.getParamValue_ParamName();
-
-		/**
-		 * The meta object literal for the '<em><b>Param Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PARAM_VALUE__PARAM_VALUE = eINSTANCE.getParamValue_ParamValue();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PARAM_VALUE__ID = eINSTANCE.getParamValue_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceContextRefImpl <em>Persistence Context Ref</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.core.internal.impl.PersistenceContextRefImpl
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getPersistenceContextRef()
-		 * @generated
-		 */
-		EClass PERSISTENCE_CONTEXT_REF = eINSTANCE.getPersistenceContextRef();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PERSISTENCE_CONTEXT_REF__DESCRIPTIONS = eINSTANCE.getPersistenceContextRef_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Persistence Context Ref Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PERSISTENCE_CONTEXT_REF__PERSISTENCE_CONTEXT_REF_NAME = eINSTANCE.getPersistenceContextRef_PersistenceContextRefName();
-
-		/**
-		 * The meta object literal for the '<em><b>Persistence Unit Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PERSISTENCE_CONTEXT_REF__PERSISTENCE_UNIT_NAME = eINSTANCE.getPersistenceContextRef_PersistenceUnitName();
-
-		/**
-		 * The meta object literal for the '<em><b>Persistence Context Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PERSISTENCE_CONTEXT_REF__PERSISTENCE_CONTEXT_TYPE = eINSTANCE.getPersistenceContextRef_PersistenceContextType();
-
-		/**
-		 * The meta object literal for the '<em><b>Persistence Properties</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PERSISTENCE_CONTEXT_REF__PERSISTENCE_PROPERTIES = eINSTANCE.getPersistenceContextRef_PersistenceProperties();
-
-		/**
-		 * The meta object literal for the '<em><b>Mapped Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PERSISTENCE_CONTEXT_REF__MAPPED_NAME = eINSTANCE.getPersistenceContextRef_MappedName();
-
-		/**
-		 * The meta object literal for the '<em><b>Injection Targets</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PERSISTENCE_CONTEXT_REF__INJECTION_TARGETS = eINSTANCE.getPersistenceContextRef_InjectionTargets();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PERSISTENCE_CONTEXT_REF__ID = eINSTANCE.getPersistenceContextRef_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceUnitRefImpl <em>Persistence Unit Ref</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.core.internal.impl.PersistenceUnitRefImpl
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getPersistenceUnitRef()
-		 * @generated
-		 */
-		EClass PERSISTENCE_UNIT_REF = eINSTANCE.getPersistenceUnitRef();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PERSISTENCE_UNIT_REF__DESCRIPTIONS = eINSTANCE.getPersistenceUnitRef_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Persistence Unit Ref Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PERSISTENCE_UNIT_REF__PERSISTENCE_UNIT_REF_NAME = eINSTANCE.getPersistenceUnitRef_PersistenceUnitRefName();
-
-		/**
-		 * The meta object literal for the '<em><b>Persistence Unit Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PERSISTENCE_UNIT_REF__PERSISTENCE_UNIT_NAME = eINSTANCE.getPersistenceUnitRef_PersistenceUnitName();
-
-		/**
-		 * The meta object literal for the '<em><b>Mapped Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PERSISTENCE_UNIT_REF__MAPPED_NAME = eINSTANCE.getPersistenceUnitRef_MappedName();
-
-		/**
-		 * The meta object literal for the '<em><b>Injection Targets</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PERSISTENCE_UNIT_REF__INJECTION_TARGETS = eINSTANCE.getPersistenceUnitRef_InjectionTargets();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PERSISTENCE_UNIT_REF__ID = eINSTANCE.getPersistenceUnitRef_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.core.internal.impl.PortComponentRefImpl <em>Port Component Ref</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.core.internal.impl.PortComponentRefImpl
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getPortComponentRef()
-		 * @generated
-		 */
-		EClass PORT_COMPONENT_REF = eINSTANCE.getPortComponentRef();
-
-		/**
-		 * The meta object literal for the '<em><b>Service Endpoint Interface</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PORT_COMPONENT_REF__SERVICE_ENDPOINT_INTERFACE = eINSTANCE.getPortComponentRef_ServiceEndpointInterface();
-
-		/**
-		 * The meta object literal for the '<em><b>Enable Mtom</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PORT_COMPONENT_REF__ENABLE_MTOM = eINSTANCE.getPortComponentRef_EnableMtom();
-
-		/**
-		 * The meta object literal for the '<em><b>Port Component Link</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PORT_COMPONENT_REF__PORT_COMPONENT_LINK = eINSTANCE.getPortComponentRef_PortComponentLink();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PORT_COMPONENT_REF__ID = eINSTANCE.getPortComponentRef_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.core.internal.impl.PropertyTypeImpl <em>Property Type</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.core.internal.impl.PropertyTypeImpl
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getPropertyType()
-		 * @generated
-		 */
-		EClass PROPERTY_TYPE = eINSTANCE.getPropertyType();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PROPERTY_TYPE__NAME = eINSTANCE.getPropertyType_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PROPERTY_TYPE__VALUE = eINSTANCE.getPropertyType_Value();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PROPERTY_TYPE__ID = eINSTANCE.getPropertyType_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.core.internal.impl.ResourceEnvRefImpl <em>Resource Env Ref</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.core.internal.impl.ResourceEnvRefImpl
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getResourceEnvRef()
-		 * @generated
-		 */
-		EClass RESOURCE_ENV_REF = eINSTANCE.getResourceEnvRef();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference RESOURCE_ENV_REF__DESCRIPTIONS = eINSTANCE.getResourceEnvRef_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Resource Env Ref Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute RESOURCE_ENV_REF__RESOURCE_ENV_REF_NAME = eINSTANCE.getResourceEnvRef_ResourceEnvRefName();
-
-		/**
-		 * The meta object literal for the '<em><b>Resource Env Ref Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute RESOURCE_ENV_REF__RESOURCE_ENV_REF_TYPE = eINSTANCE.getResourceEnvRef_ResourceEnvRefType();
-
-		/**
-		 * The meta object literal for the '<em><b>Mapped Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute RESOURCE_ENV_REF__MAPPED_NAME = eINSTANCE.getResourceEnvRef_MappedName();
-
-		/**
-		 * The meta object literal for the '<em><b>Injection Targets</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference RESOURCE_ENV_REF__INJECTION_TARGETS = eINSTANCE.getResourceEnvRef_InjectionTargets();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute RESOURCE_ENV_REF__ID = eINSTANCE.getResourceEnvRef_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.core.internal.impl.ResourceRefImpl <em>Resource Ref</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.core.internal.impl.ResourceRefImpl
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getResourceRef()
-		 * @generated
-		 */
-		EClass RESOURCE_REF = eINSTANCE.getResourceRef();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference RESOURCE_REF__DESCRIPTIONS = eINSTANCE.getResourceRef_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Res Ref Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute RESOURCE_REF__RES_REF_NAME = eINSTANCE.getResourceRef_ResRefName();
-
-		/**
-		 * The meta object literal for the '<em><b>Res Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute RESOURCE_REF__RES_TYPE = eINSTANCE.getResourceRef_ResType();
-
-		/**
-		 * The meta object literal for the '<em><b>Res Auth</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute RESOURCE_REF__RES_AUTH = eINSTANCE.getResourceRef_ResAuth();
-
-		/**
-		 * The meta object literal for the '<em><b>Res Sharing Scope</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute RESOURCE_REF__RES_SHARING_SCOPE = eINSTANCE.getResourceRef_ResSharingScope();
-
-		/**
-		 * The meta object literal for the '<em><b>Mapped Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute RESOURCE_REF__MAPPED_NAME = eINSTANCE.getResourceRef_MappedName();
-
-		/**
-		 * The meta object literal for the '<em><b>Injection Targets</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference RESOURCE_REF__INJECTION_TARGETS = eINSTANCE.getResourceRef_InjectionTargets();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute RESOURCE_REF__ID = eINSTANCE.getResourceRef_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.core.internal.impl.RunAsImpl <em>Run As</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.core.internal.impl.RunAsImpl
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getRunAs()
-		 * @generated
-		 */
-		EClass RUN_AS = eINSTANCE.getRunAs();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference RUN_AS__DESCRIPTIONS = eINSTANCE.getRunAs_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Role Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute RUN_AS__ROLE_NAME = eINSTANCE.getRunAs_RoleName();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute RUN_AS__ID = eINSTANCE.getRunAs_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.core.internal.impl.SecurityRoleImpl <em>Security Role</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.core.internal.impl.SecurityRoleImpl
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getSecurityRole()
-		 * @generated
-		 */
-		EClass SECURITY_ROLE = eINSTANCE.getSecurityRole();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SECURITY_ROLE__DESCRIPTIONS = eINSTANCE.getSecurityRole_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Role Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SECURITY_ROLE__ROLE_NAME = eINSTANCE.getSecurityRole_RoleName();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SECURITY_ROLE__ID = eINSTANCE.getSecurityRole_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.core.internal.impl.SecurityRoleRefImpl <em>Security Role Ref</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.core.internal.impl.SecurityRoleRefImpl
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getSecurityRoleRef()
-		 * @generated
-		 */
-		EClass SECURITY_ROLE_REF = eINSTANCE.getSecurityRoleRef();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SECURITY_ROLE_REF__DESCRIPTIONS = eINSTANCE.getSecurityRoleRef_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Role Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SECURITY_ROLE_REF__ROLE_NAME = eINSTANCE.getSecurityRoleRef_RoleName();
-
-		/**
-		 * The meta object literal for the '<em><b>Role Link</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SECURITY_ROLE_REF__ROLE_LINK = eINSTANCE.getSecurityRoleRef_RoleLink();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SECURITY_ROLE_REF__ID = eINSTANCE.getSecurityRoleRef_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefImpl <em>Service Ref</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.core.internal.impl.ServiceRefImpl
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getServiceRef()
-		 * @generated
-		 */
-		EClass SERVICE_REF = eINSTANCE.getServiceRef();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SERVICE_REF__DESCRIPTIONS = eINSTANCE.getServiceRef_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Display Names</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SERVICE_REF__DISPLAY_NAMES = eINSTANCE.getServiceRef_DisplayNames();
-
-		/**
-		 * The meta object literal for the '<em><b>Icons</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SERVICE_REF__ICONS = eINSTANCE.getServiceRef_Icons();
-
-		/**
-		 * The meta object literal for the '<em><b>Service Ref Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SERVICE_REF__SERVICE_REF_NAME = eINSTANCE.getServiceRef_ServiceRefName();
-
-		/**
-		 * The meta object literal for the '<em><b>Service Interface</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SERVICE_REF__SERVICE_INTERFACE = eINSTANCE.getServiceRef_ServiceInterface();
-
-		/**
-		 * The meta object literal for the '<em><b>Service Ref Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SERVICE_REF__SERVICE_REF_TYPE = eINSTANCE.getServiceRef_ServiceRefType();
-
-		/**
-		 * The meta object literal for the '<em><b>Wsdl File</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SERVICE_REF__WSDL_FILE = eINSTANCE.getServiceRef_WsdlFile();
-
-		/**
-		 * The meta object literal for the '<em><b>Jaxrpc Mapping File</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SERVICE_REF__JAXRPC_MAPPING_FILE = eINSTANCE.getServiceRef_JaxrpcMappingFile();
-
-		/**
-		 * The meta object literal for the '<em><b>Service Qname</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SERVICE_REF__SERVICE_QNAME = eINSTANCE.getServiceRef_ServiceQname();
-
-		/**
-		 * The meta object literal for the '<em><b>Port Component Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SERVICE_REF__PORT_COMPONENT_REFS = eINSTANCE.getServiceRef_PortComponentRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Handlers</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SERVICE_REF__HANDLERS = eINSTANCE.getServiceRef_Handlers();
-
-		/**
-		 * The meta object literal for the '<em><b>Handler Chains</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SERVICE_REF__HANDLER_CHAINS = eINSTANCE.getServiceRef_HandlerChains();
-
-		/**
-		 * The meta object literal for the '<em><b>Mapped Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SERVICE_REF__MAPPED_NAME = eINSTANCE.getServiceRef_MappedName();
-
-		/**
-		 * The meta object literal for the '<em><b>Injection Targets</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SERVICE_REF__INJECTION_TARGETS = eINSTANCE.getServiceRef_InjectionTargets();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SERVICE_REF__ID = eINSTANCE.getServiceRef_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefHandlerImpl <em>Service Ref Handler</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.core.internal.impl.ServiceRefHandlerImpl
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getServiceRefHandler()
-		 * @generated
-		 */
-		EClass SERVICE_REF_HANDLER = eINSTANCE.getServiceRefHandler();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SERVICE_REF_HANDLER__DESCRIPTIONS = eINSTANCE.getServiceRefHandler_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Display Names</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SERVICE_REF_HANDLER__DISPLAY_NAMES = eINSTANCE.getServiceRefHandler_DisplayNames();
-
-		/**
-		 * The meta object literal for the '<em><b>Icons</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SERVICE_REF_HANDLER__ICONS = eINSTANCE.getServiceRefHandler_Icons();
-
-		/**
-		 * The meta object literal for the '<em><b>Handler Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SERVICE_REF_HANDLER__HANDLER_NAME = eINSTANCE.getServiceRefHandler_HandlerName();
-
-		/**
-		 * The meta object literal for the '<em><b>Handler Class</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SERVICE_REF_HANDLER__HANDLER_CLASS = eINSTANCE.getServiceRefHandler_HandlerClass();
-
-		/**
-		 * The meta object literal for the '<em><b>Init Params</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SERVICE_REF_HANDLER__INIT_PARAMS = eINSTANCE.getServiceRefHandler_InitParams();
-
-		/**
-		 * The meta object literal for the '<em><b>Soap Headers</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SERVICE_REF_HANDLER__SOAP_HEADERS = eINSTANCE.getServiceRefHandler_SoapHeaders();
-
-		/**
-		 * The meta object literal for the '<em><b>Soap Roles</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SERVICE_REF_HANDLER__SOAP_ROLES = eINSTANCE.getServiceRefHandler_SoapRoles();
-
-		/**
-		 * The meta object literal for the '<em><b>Port Names</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SERVICE_REF_HANDLER__PORT_NAMES = eINSTANCE.getServiceRefHandler_PortNames();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SERVICE_REF_HANDLER__ID = eINSTANCE.getServiceRefHandler_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefHandlerChainImpl <em>Service Ref Handler Chain</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.core.internal.impl.ServiceRefHandlerChainImpl
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getServiceRefHandlerChain()
-		 * @generated
-		 */
-		EClass SERVICE_REF_HANDLER_CHAIN = eINSTANCE.getServiceRefHandlerChain();
-
-		/**
-		 * The meta object literal for the '<em><b>Service Name Pattern</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SERVICE_REF_HANDLER_CHAIN__SERVICE_NAME_PATTERN = eINSTANCE.getServiceRefHandlerChain_ServiceNamePattern();
-
-		/**
-		 * The meta object literal for the '<em><b>Port Name Pattern</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SERVICE_REF_HANDLER_CHAIN__PORT_NAME_PATTERN = eINSTANCE.getServiceRefHandlerChain_PortNamePattern();
-
-		/**
-		 * The meta object literal for the '<em><b>Protocol Bindings</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SERVICE_REF_HANDLER_CHAIN__PROTOCOL_BINDINGS = eINSTANCE.getServiceRefHandlerChain_ProtocolBindings();
-
-		/**
-		 * The meta object literal for the '<em><b>Handlers</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SERVICE_REF_HANDLER_CHAIN__HANDLERS = eINSTANCE.getServiceRefHandlerChain_Handlers();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SERVICE_REF_HANDLER_CHAIN__ID = eINSTANCE.getServiceRefHandlerChain_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefHandlerChainsImpl <em>Service Ref Handler Chains</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.core.internal.impl.ServiceRefHandlerChainsImpl
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getServiceRefHandlerChains()
-		 * @generated
-		 */
-		EClass SERVICE_REF_HANDLER_CHAINS = eINSTANCE.getServiceRefHandlerChains();
-
-		/**
-		 * The meta object literal for the '<em><b>Handler Chains</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SERVICE_REF_HANDLER_CHAINS__HANDLER_CHAINS = eINSTANCE.getServiceRefHandlerChains_HandlerChains();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SERVICE_REF_HANDLER_CHAINS__ID = eINSTANCE.getServiceRefHandlerChains_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.core.internal.impl.UrlPatternTypeImpl <em>Url Pattern Type</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.core.internal.impl.UrlPatternTypeImpl
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getUrlPatternType()
-		 * @generated
-		 */
-		EClass URL_PATTERN_TYPE = eINSTANCE.getUrlPatternType();
-
-		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute URL_PATTERN_TYPE__VALUE = eINSTANCE.getUrlPatternType_Value();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.core.EjbRefType <em>Ejb Ref Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.core.EjbRefType
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getEjbRefType()
-		 * @generated
-		 */
-		EEnum EJB_REF_TYPE = eINSTANCE.getEjbRefType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.core.EnvEntryType <em>Env Entry Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.core.EnvEntryType
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getEnvEntryType()
-		 * @generated
-		 */
-		EEnum ENV_ENTRY_TYPE = eINSTANCE.getEnvEntryType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.core.MessageDestinationUsageType <em>Message Destination Usage Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.core.MessageDestinationUsageType
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getMessageDestinationUsageType()
-		 * @generated
-		 */
-		EEnum MESSAGE_DESTINATION_USAGE_TYPE = eINSTANCE.getMessageDestinationUsageType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.core.PersistenceContextType <em>Persistence Context Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.core.PersistenceContextType
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getPersistenceContextType()
-		 * @generated
-		 */
-		EEnum PERSISTENCE_CONTEXT_TYPE = eINSTANCE.getPersistenceContextType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.core.ResAuthType <em>Res Auth Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.core.ResAuthType
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getResAuthType()
-		 * @generated
-		 */
-		EEnum RES_AUTH_TYPE = eINSTANCE.getResAuthType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.core.ResSharingScopeType <em>Res Sharing Scope Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.core.ResSharingScopeType
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getResSharingScopeType()
-		 * @generated
-		 */
-		EEnum RES_SHARING_SCOPE_TYPE = eINSTANCE.getResSharingScopeType();
-
-		/**
-		 * The meta object literal for the '<em>Dewey Version Type</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.lang.String
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getDeweyVersionType()
-		 * @generated
-		 */
-		EDataType DEWEY_VERSION_TYPE = eINSTANCE.getDeweyVersionType();
-
-		/**
-		 * The meta object literal for the '<em>EJB Link</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.lang.String
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getEJBLink()
-		 * @generated
-		 */
-		EDataType EJB_LINK = eINSTANCE.getEJBLink();
-
-		/**
-		 * The meta object literal for the '<em>Ejb Ref Name Type</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.lang.String
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getEjbRefNameType()
-		 * @generated
-		 */
-		EDataType EJB_REF_NAME_TYPE = eINSTANCE.getEjbRefNameType();
-
-		/**
-		 * The meta object literal for the '<em>Ejb Ref Type Object</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.core.EjbRefType
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getEjbRefTypeObject()
-		 * @generated
-		 */
-		EDataType EJB_REF_TYPE_OBJECT = eINSTANCE.getEjbRefTypeObject();
-
-		/**
-		 * The meta object literal for the '<em>Env Entry Type Object</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.core.EnvEntryType
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getEnvEntryTypeObject()
-		 * @generated
-		 */
-		EDataType ENV_ENTRY_TYPE_OBJECT = eINSTANCE.getEnvEntryTypeObject();
-
-		/**
-		 * The meta object literal for the '<em>Fully Qualified Class Type</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.lang.String
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getFullyQualifiedClassType()
-		 * @generated
-		 */
-		EDataType FULLY_QUALIFIED_CLASS_TYPE = eINSTANCE.getFullyQualifiedClassType();
-
-		/**
-		 * The meta object literal for the '<em>Home</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.lang.String
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getHome()
-		 * @generated
-		 */
-		EDataType HOME = eINSTANCE.getHome();
-
-		/**
-		 * The meta object literal for the '<em>Java Identifier</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.lang.String
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getJavaIdentifier()
-		 * @generated
-		 */
-		EDataType JAVA_IDENTIFIER = eINSTANCE.getJavaIdentifier();
-
-		/**
-		 * The meta object literal for the '<em>Java Type</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.lang.String
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getJavaType()
-		 * @generated
-		 */
-		EDataType JAVA_TYPE = eINSTANCE.getJavaType();
-
-		/**
-		 * The meta object literal for the '<em>JNDI Name</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.lang.String
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getJNDIName()
-		 * @generated
-		 */
-		EDataType JNDI_NAME = eINSTANCE.getJNDIName();
-
-		/**
-		 * The meta object literal for the '<em>Local</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.lang.String
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getLocal()
-		 * @generated
-		 */
-		EDataType LOCAL = eINSTANCE.getLocal();
-
-		/**
-		 * The meta object literal for the '<em>Local Home</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.lang.String
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getLocalHome()
-		 * @generated
-		 */
-		EDataType LOCAL_HOME = eINSTANCE.getLocalHome();
-
-		/**
-		 * The meta object literal for the '<em>Message Destination Link</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.lang.String
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getMessageDestinationLink()
-		 * @generated
-		 */
-		EDataType MESSAGE_DESTINATION_LINK = eINSTANCE.getMessageDestinationLink();
-
-		/**
-		 * The meta object literal for the '<em>Message Destination Type Type</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.lang.String
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getMessageDestinationTypeType()
-		 * @generated
-		 */
-		EDataType MESSAGE_DESTINATION_TYPE_TYPE = eINSTANCE.getMessageDestinationTypeType();
-
-		/**
-		 * The meta object literal for the '<em>Message Destination Usage Type Object</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.core.MessageDestinationUsageType
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getMessageDestinationUsageTypeObject()
-		 * @generated
-		 */
-		EDataType MESSAGE_DESTINATION_USAGE_TYPE_OBJECT = eINSTANCE.getMessageDestinationUsageTypeObject();
-
-		/**
-		 * The meta object literal for the '<em>Path Type</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.lang.String
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getPathType()
-		 * @generated
-		 */
-		EDataType PATH_TYPE = eINSTANCE.getPathType();
-
-		/**
-		 * The meta object literal for the '<em>Persistence Context Type Object</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.core.PersistenceContextType
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getPersistenceContextTypeObject()
-		 * @generated
-		 */
-		EDataType PERSISTENCE_CONTEXT_TYPE_OBJECT = eINSTANCE.getPersistenceContextTypeObject();
-
-		/**
-		 * The meta object literal for the '<em>Remote</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.lang.String
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getRemote()
-		 * @generated
-		 */
-		EDataType REMOTE = eINSTANCE.getRemote();
-
-		/**
-		 * The meta object literal for the '<em>Res Auth Type Object</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.core.ResAuthType
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getResAuthTypeObject()
-		 * @generated
-		 */
-		EDataType RES_AUTH_TYPE_OBJECT = eINSTANCE.getResAuthTypeObject();
-
-		/**
-		 * The meta object literal for the '<em>Res Sharing Scope Type Object</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.core.ResSharingScopeType
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getResSharingScopeTypeObject()
-		 * @generated
-		 */
-		EDataType RES_SHARING_SCOPE_TYPE_OBJECT = eINSTANCE.getResSharingScopeTypeObject();
-
-		/**
-		 * The meta object literal for the '<em>Role Name</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.lang.String
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getRoleName()
-		 * @generated
-		 */
-		EDataType ROLE_NAME = eINSTANCE.getRoleName();
-
-		/**
-		 * The meta object literal for the '<em>Service Ref Protocol Binding List Type</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.util.List
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getServiceRefProtocolBindingListType()
-		 * @generated
-		 */
-		EDataType SERVICE_REF_PROTOCOL_BINDING_LIST_TYPE = eINSTANCE.getServiceRefProtocolBindingListType();
-
-		/**
-		 * The meta object literal for the '<em>Service Ref Protocol Binding Type</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.lang.String
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getServiceRefProtocolBindingType()
-		 * @generated
-		 */
-		EDataType SERVICE_REF_PROTOCOL_BINDING_TYPE = eINSTANCE.getServiceRefProtocolBindingType();
-
-		/**
-		 * The meta object literal for the '<em>Service Ref Protocol URI Alias Type</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.lang.String
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getServiceRefProtocolURIAliasType()
-		 * @generated
-		 */
-		EDataType SERVICE_REF_PROTOCOL_URI_ALIAS_TYPE = eINSTANCE.getServiceRefProtocolURIAliasType();
-
-		/**
-		 * The meta object literal for the '<em>Service Ref Qname Pattern</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.lang.String
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getServiceRefQnamePattern()
-		 * @generated
-		 */
-		EDataType SERVICE_REF_QNAME_PATTERN = eINSTANCE.getServiceRefQnamePattern();
-
-		/**
-		 * The meta object literal for the '<em>True False Type</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getTrueFalseType()
-		 * @generated
-		 */
-		EDataType TRUE_FALSE_TYPE = eINSTANCE.getTrueFalseType();
-
-		/**
-		 * The meta object literal for the '<em>True False Type Object</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.lang.Boolean
-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getTrueFalseTypeObject()
-		 * @generated
-		 */
-		EDataType TRUE_FALSE_TYPE_OBJECT = eINSTANCE.getTrueFalseTypeObject();
-
-	}
-
-} //JavaeePackage
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/util/JEEXMLHelperImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/util/JEEXMLHelperImpl.java
deleted file mode 100644
index 500c8dae8..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/util/JEEXMLHelperImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core.internal.util;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.ecore.xmi.impl.XMLHelperImpl;
-import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
-
-public class JEEXMLHelperImpl extends XMLHelperImpl {
-
-	public JEEXMLHelperImpl(XMLResource resource) {
-		super(resource);
-	}
-
-
-
-	public EStructuralFeature getFeature(EClass class1, String namespaceURI,
-			String name, boolean isElement) {
-		// If not found in current namespace package, go to common package
-		EStructuralFeature aFeature =  super.getFeature(class1, namespaceURI, name, isElement);
-		if (aFeature == null)
-			aFeature =  super.getFeature(class1, JavaeePackage.eNS_URI, name, isElement);
-	return aFeature;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/util/JavaeeAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/util/JavaeeAdapterFactory.java
deleted file mode 100644
index f434b0162..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/util/JavaeeAdapterFactory.java
+++ /dev/null
@@ -1,568 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core.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.core.*;
-
-import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage
- * @generated
- */
-public class JavaeeAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static JavaeePackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaeeAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = JavaeePackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected JavaeeSwitch modelSwitch =
-		new JavaeeSwitch() {
-			public Object caseDescription(Description object) {
-				return createDescriptionAdapter();
-			}
-			public Object caseDisplayName(DisplayName object) {
-				return createDisplayNameAdapter();
-			}
-			public Object caseEjbLocalRef(EjbLocalRef object) {
-				return createEjbLocalRefAdapter();
-			}
-			public Object caseEjbRef(EjbRef object) {
-				return createEjbRefAdapter();
-			}
-			public Object caseEmptyType(EmptyType object) {
-				return createEmptyTypeAdapter();
-			}
-			public Object caseEnvEntry(EnvEntry object) {
-				return createEnvEntryAdapter();
-			}
-			public Object caseIcon(Icon object) {
-				return createIconAdapter();
-			}
-			public Object caseInjectionTarget(InjectionTarget object) {
-				return createInjectionTargetAdapter();
-			}
-			public Object caseLifecycleCallback(LifecycleCallback object) {
-				return createLifecycleCallbackAdapter();
-			}
-			public Object caseListener(Listener object) {
-				return createListenerAdapter();
-			}
-			public Object caseMessageDestination(MessageDestination object) {
-				return createMessageDestinationAdapter();
-			}
-			public Object caseMessageDestinationRef(MessageDestinationRef object) {
-				return createMessageDestinationRefAdapter();
-			}
-			public Object caseParamValue(ParamValue object) {
-				return createParamValueAdapter();
-			}
-			public Object casePersistenceContextRef(PersistenceContextRef object) {
-				return createPersistenceContextRefAdapter();
-			}
-			public Object casePersistenceUnitRef(PersistenceUnitRef object) {
-				return createPersistenceUnitRefAdapter();
-			}
-			public Object casePortComponentRef(PortComponentRef object) {
-				return createPortComponentRefAdapter();
-			}
-			public Object casePropertyType(PropertyType object) {
-				return createPropertyTypeAdapter();
-			}
-			public Object caseResourceEnvRef(ResourceEnvRef object) {
-				return createResourceEnvRefAdapter();
-			}
-			public Object caseResourceRef(ResourceRef object) {
-				return createResourceRefAdapter();
-			}
-			public Object caseRunAs(RunAs object) {
-				return createRunAsAdapter();
-			}
-			public Object caseSecurityRole(SecurityRole object) {
-				return createSecurityRoleAdapter();
-			}
-			public Object caseSecurityRoleRef(SecurityRoleRef object) {
-				return createSecurityRoleRefAdapter();
-			}
-			public Object caseServiceRef(ServiceRef object) {
-				return createServiceRefAdapter();
-			}
-			public Object caseServiceRefHandler(ServiceRefHandler object) {
-				return createServiceRefHandlerAdapter();
-			}
-			public Object caseServiceRefHandlerChain(ServiceRefHandlerChain object) {
-				return createServiceRefHandlerChainAdapter();
-			}
-			public Object caseServiceRefHandlerChains(ServiceRefHandlerChains object) {
-				return createServiceRefHandlerChainsAdapter();
-			}
-			public Object caseUrlPatternType(UrlPatternType object) {
-				return createUrlPatternTypeAdapter();
-			}
-			public Object defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	public Adapter createAdapter(Notifier target) {
-		return (Adapter)modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.core.Description <em>Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.core.Description
-	 * @generated
-	 */
-	public Adapter createDescriptionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.core.DisplayName <em>Display Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.core.DisplayName
-	 * @generated
-	 */
-	public Adapter createDisplayNameAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.core.EjbLocalRef <em>Ejb Local Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.core.EjbLocalRef
-	 * @generated
-	 */
-	public Adapter createEjbLocalRefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.core.EjbRef <em>Ejb Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.core.EjbRef
-	 * @generated
-	 */
-	public Adapter createEjbRefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.core.EmptyType <em>Empty Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.core.EmptyType
-	 * @generated
-	 */
-	public Adapter createEmptyTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.core.EnvEntry <em>Env Entry</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.core.EnvEntry
-	 * @generated
-	 */
-	public Adapter createEnvEntryAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.core.Icon <em>Icon</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.core.Icon
-	 * @generated
-	 */
-	public Adapter createIconAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.core.InjectionTarget <em>Injection Target</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.core.InjectionTarget
-	 * @generated
-	 */
-	public Adapter createInjectionTargetAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.core.LifecycleCallback <em>Lifecycle Callback</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.core.LifecycleCallback
-	 * @generated
-	 */
-	public Adapter createLifecycleCallbackAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.core.Listener <em>Listener</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.core.Listener
-	 * @generated
-	 */
-	public Adapter createListenerAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.core.MessageDestination <em>Message Destination</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.core.MessageDestination
-	 * @generated
-	 */
-	public Adapter createMessageDestinationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.core.MessageDestinationRef <em>Message Destination Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.core.MessageDestinationRef
-	 * @generated
-	 */
-	public Adapter createMessageDestinationRefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.core.ParamValue <em>Param Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.core.ParamValue
-	 * @generated
-	 */
-	public Adapter createParamValueAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.core.PersistenceContextRef <em>Persistence Context Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.core.PersistenceContextRef
-	 * @generated
-	 */
-	public Adapter createPersistenceContextRefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.core.PersistenceUnitRef <em>Persistence Unit Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.core.PersistenceUnitRef
-	 * @generated
-	 */
-	public Adapter createPersistenceUnitRefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.core.PortComponentRef <em>Port Component Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.core.PortComponentRef
-	 * @generated
-	 */
-	public Adapter createPortComponentRefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.core.PropertyType <em>Property Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.core.PropertyType
-	 * @generated
-	 */
-	public Adapter createPropertyTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.core.ResourceEnvRef <em>Resource Env Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.core.ResourceEnvRef
-	 * @generated
-	 */
-	public Adapter createResourceEnvRefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.core.ResourceRef <em>Resource Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.core.ResourceRef
-	 * @generated
-	 */
-	public Adapter createResourceRefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.core.RunAs <em>Run As</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.core.RunAs
-	 * @generated
-	 */
-	public Adapter createRunAsAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.core.SecurityRole <em>Security Role</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.core.SecurityRole
-	 * @generated
-	 */
-	public Adapter createSecurityRoleAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.core.SecurityRoleRef <em>Security Role Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.core.SecurityRoleRef
-	 * @generated
-	 */
-	public Adapter createSecurityRoleRefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.core.ServiceRef <em>Service Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.core.ServiceRef
-	 * @generated
-	 */
-	public Adapter createServiceRefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.core.ServiceRefHandler <em>Service Ref Handler</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.core.ServiceRefHandler
-	 * @generated
-	 */
-	public Adapter createServiceRefHandlerAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.core.ServiceRefHandlerChain <em>Service Ref Handler Chain</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.core.ServiceRefHandlerChain
-	 * @generated
-	 */
-	public Adapter createServiceRefHandlerChainAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.core.ServiceRefHandlerChains <em>Service Ref Handler Chains</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.core.ServiceRefHandlerChains
-	 * @generated
-	 */
-	public Adapter createServiceRefHandlerChainsAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.core.UrlPatternType <em>Url Pattern Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.core.UrlPatternType
-	 * @generated
-	 */
-	public Adapter createUrlPatternTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //JavaeeAdapterFactory
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/util/JavaeeResourceFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/util/JavaeeResourceFactoryImpl.java
deleted file mode 100644
index c7b1fcf19..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/util/JavaeeResourceFactoryImpl.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core.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;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource Factory</b> associated with the package.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.javaee.core.internal.util.JavaeeResourceImpl
- * @generated
- */
-public class JavaeeResourceFactoryImpl extends ResourceFactoryImpl {
-	/**
-	 * Creates an instance of the resource factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaeeResourceFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Resource createResource(URI uri) {
-		XMLResource result = new JavaeeResourceImpl(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;
-	}
-
-} //JavaeeResourceFactoryImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/util/JavaeeResourceImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/util/JavaeeResourceImpl.java
deleted file mode 100644
index ad2beffa7..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/util/JavaeeResourceImpl.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core.internal.util;
-
-import java.io.IOException;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.URIConverter;
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
-import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource </b> associated with the package.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.javaee.core.internal.util.JavaeeResourceFactoryImpl
- * @generated
- */
-public class JavaeeResourceImpl extends XMLResourceImpl {
-	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param uri the URI of the new resource.
-	 * @generated
-	 */
-	public JavaeeResourceImpl(URI uri) {
-		super(uri);
-	}
-	
-	public void save(Map options) throws IOException {
-		
-		IFile file = getPlatformFile();
-		
-		if (file == null || !file.exists()) return; // Only save if file existed
-		super.save(options);
-	}
-	
-	/**
-	 * Return the IFile for the <code>uri</code> within the Workspace. This URI is assumed to be
-	 * absolute in the following format: platform:/resource/....
-	 */
-	private IFile getPlatformFile(URI uri) {
-		if (WorkbenchResourceHelperBase.isPlatformResourceURI(uri)) {
-			String fileString = URI.decode(uri.path());
-			fileString = fileString.substring(JEMUtilPlugin.PLATFORM_RESOURCE.length() + 1);
-			return ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(fileString));
-		}
-		return null;
-	}
-
-	private IFile getPlatformFile() {
-		IFile file = null;
-		file = getPlatformFile(getURI());
-		if (file == null) {
-			if (getResourceSet() != null) {
-				URIConverter converter = getResourceSet().getURIConverter();
-				URI convertedUri = converter.normalize(uri);
-				if (!uri.equals(convertedUri))
-					file = getPlatformFile(convertedUri);
-			}
-		}
-		return file;
-	}
-
-	public void save(Map options, boolean force) throws IOException {
-		IFile file = getPlatformFile();
-		if (!force && (file == null || !file.exists())) return; // Only save if file existed
-		super.save(options);
-		if (force) getResourceSet().getResources().remove(this); //Remove initial resource
-	}
-
-} //JavaeeResourceImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/util/JavaeeSwitch.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/util/JavaeeSwitch.java
deleted file mode 100644
index 3d3ef1974..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/util/JavaeeSwitch.java
+++ /dev/null
@@ -1,682 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core.internal.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.jst.javaee.core.*;
-
-import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> 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.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage
- * @generated
- */
-public class JavaeeSwitch {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static JavaeePackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaeeSwitch() {
-		if (modelPackage == null) {
-			modelPackage = JavaeePackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	public Object 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.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage) {
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
-			List eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch((EClass)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.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case JavaeePackage.DESCRIPTION: {
-				Description description = (Description)theEObject;
-				Object result = caseDescription(description);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JavaeePackage.DISPLAY_NAME: {
-				DisplayName displayName = (DisplayName)theEObject;
-				Object result = caseDisplayName(displayName);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JavaeePackage.EJB_LOCAL_REF: {
-				EjbLocalRef ejbLocalRef = (EjbLocalRef)theEObject;
-				Object result = caseEjbLocalRef(ejbLocalRef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JavaeePackage.EJB_REF: {
-				EjbRef ejbRef = (EjbRef)theEObject;
-				Object result = caseEjbRef(ejbRef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JavaeePackage.EMPTY_TYPE: {
-				EmptyType emptyType = (EmptyType)theEObject;
-				Object result = caseEmptyType(emptyType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JavaeePackage.ENV_ENTRY: {
-				EnvEntry envEntry = (EnvEntry)theEObject;
-				Object result = caseEnvEntry(envEntry);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JavaeePackage.ICON: {
-				Icon icon = (Icon)theEObject;
-				Object result = caseIcon(icon);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JavaeePackage.INJECTION_TARGET: {
-				InjectionTarget injectionTarget = (InjectionTarget)theEObject;
-				Object result = caseInjectionTarget(injectionTarget);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JavaeePackage.LIFECYCLE_CALLBACK: {
-				LifecycleCallback lifecycleCallback = (LifecycleCallback)theEObject;
-				Object result = caseLifecycleCallback(lifecycleCallback);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JavaeePackage.LISTENER: {
-				Listener listener = (Listener)theEObject;
-				Object result = caseListener(listener);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JavaeePackage.MESSAGE_DESTINATION: {
-				MessageDestination messageDestination = (MessageDestination)theEObject;
-				Object result = caseMessageDestination(messageDestination);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JavaeePackage.MESSAGE_DESTINATION_REF: {
-				MessageDestinationRef messageDestinationRef = (MessageDestinationRef)theEObject;
-				Object result = caseMessageDestinationRef(messageDestinationRef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JavaeePackage.PARAM_VALUE: {
-				ParamValue paramValue = (ParamValue)theEObject;
-				Object result = caseParamValue(paramValue);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JavaeePackage.PERSISTENCE_CONTEXT_REF: {
-				PersistenceContextRef persistenceContextRef = (PersistenceContextRef)theEObject;
-				Object result = casePersistenceContextRef(persistenceContextRef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JavaeePackage.PERSISTENCE_UNIT_REF: {
-				PersistenceUnitRef persistenceUnitRef = (PersistenceUnitRef)theEObject;
-				Object result = casePersistenceUnitRef(persistenceUnitRef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JavaeePackage.PORT_COMPONENT_REF: {
-				PortComponentRef portComponentRef = (PortComponentRef)theEObject;
-				Object result = casePortComponentRef(portComponentRef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JavaeePackage.PROPERTY_TYPE: {
-				PropertyType propertyType = (PropertyType)theEObject;
-				Object result = casePropertyType(propertyType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JavaeePackage.RESOURCE_ENV_REF: {
-				ResourceEnvRef resourceEnvRef = (ResourceEnvRef)theEObject;
-				Object result = caseResourceEnvRef(resourceEnvRef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JavaeePackage.RESOURCE_REF: {
-				ResourceRef resourceRef = (ResourceRef)theEObject;
-				Object result = caseResourceRef(resourceRef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JavaeePackage.RUN_AS: {
-				RunAs runAs = (RunAs)theEObject;
-				Object result = caseRunAs(runAs);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JavaeePackage.SECURITY_ROLE: {
-				SecurityRole securityRole = (SecurityRole)theEObject;
-				Object result = caseSecurityRole(securityRole);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JavaeePackage.SECURITY_ROLE_REF: {
-				SecurityRoleRef securityRoleRef = (SecurityRoleRef)theEObject;
-				Object result = caseSecurityRoleRef(securityRoleRef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JavaeePackage.SERVICE_REF: {
-				ServiceRef serviceRef = (ServiceRef)theEObject;
-				Object result = caseServiceRef(serviceRef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JavaeePackage.SERVICE_REF_HANDLER: {
-				ServiceRefHandler serviceRefHandler = (ServiceRefHandler)theEObject;
-				Object result = caseServiceRefHandler(serviceRefHandler);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JavaeePackage.SERVICE_REF_HANDLER_CHAIN: {
-				ServiceRefHandlerChain serviceRefHandlerChain = (ServiceRefHandlerChain)theEObject;
-				Object result = caseServiceRefHandlerChain(serviceRefHandlerChain);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JavaeePackage.SERVICE_REF_HANDLER_CHAINS: {
-				ServiceRefHandlerChains serviceRefHandlerChains = (ServiceRefHandlerChains)theEObject;
-				Object result = caseServiceRefHandlerChains(serviceRefHandlerChains);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JavaeePackage.URL_PATTERN_TYPE: {
-				UrlPatternType urlPatternType = (UrlPatternType)theEObject;
-				Object result = caseUrlPatternType(urlPatternType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Description</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDescription(Description object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Display Name</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Display Name</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDisplayName(DisplayName object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Ejb Local Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Ejb Local Ref</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEjbLocalRef(EjbLocalRef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Ejb Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Ejb Ref</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEjbRef(EjbRef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Empty Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Empty Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEmptyType(EmptyType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Env Entry</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Env Entry</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEnvEntry(EnvEntry object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Icon</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Icon</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseIcon(Icon object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Injection Target</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Injection Target</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseInjectionTarget(InjectionTarget object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Lifecycle Callback</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Lifecycle Callback</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseLifecycleCallback(LifecycleCallback object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Listener</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Listener</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseListener(Listener object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Message Destination</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Message Destination</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMessageDestination(MessageDestination object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Message Destination Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Message Destination Ref</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMessageDestinationRef(MessageDestinationRef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Param Value</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Param Value</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseParamValue(ParamValue object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Persistence Context Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Persistence Context Ref</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object casePersistenceContextRef(PersistenceContextRef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Persistence Unit Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Persistence Unit Ref</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object casePersistenceUnitRef(PersistenceUnitRef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Port Component Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Port Component Ref</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object casePortComponentRef(PortComponentRef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Property Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Property Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object casePropertyType(PropertyType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Resource Env Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Resource Env Ref</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseResourceEnvRef(ResourceEnvRef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Resource Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Resource Ref</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseResourceRef(ResourceRef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Run As</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Run As</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseRunAs(RunAs object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Security Role</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Security Role</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseSecurityRole(SecurityRole object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Security Role Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Security Role Ref</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseSecurityRoleRef(SecurityRoleRef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Service Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Service Ref</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseServiceRef(ServiceRef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Service Ref Handler</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Service Ref Handler</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseServiceRefHandler(ServiceRefHandler object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Service Ref Handler Chain</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Service Ref Handler Chain</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseServiceRefHandlerChain(ServiceRefHandlerChain object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Service Ref Handler Chains</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Service Ref Handler Chains</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseServiceRefHandlerChains(ServiceRefHandlerChains object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Url Pattern Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Url Pattern Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseUrlPatternType(UrlPatternType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	public Object defaultCase(EObject object) {
-		return null;
-	}
-
-} //JavaeeSwitch
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/util/JavaeeValidator.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/util/JavaeeValidator.java
deleted file mode 100644
index 7c4ba96fa..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/util/JavaeeValidator.java
+++ /dev/null
@@ -1,978 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core.internal.util;
-
-import java.util.Iterator;
-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.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.util.EObjectValidator;
-
-import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-
-import org.eclipse.emf.ecore.xml.type.util.XMLTypeUtil;
-import org.eclipse.emf.ecore.xml.type.util.XMLTypeValidator;
-
-import org.eclipse.jst.javaee.core.*;
-
-import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Validator</b> for the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage
- * @generated
- */
-public class JavaeeValidator extends EObjectValidator {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final JavaeeValidator INSTANCE = new JavaeeValidator();
-
-	/**
-	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.common.util.Diagnostic#getSource()
-	 * @see org.eclipse.emf.common.util.Diagnostic#getCode()
-	 * @generated
-	 */
-	public static final String DIAGNOSTIC_SOURCE = "org.eclipse.jst.javaee.core"; //$NON-NLS-1$
-
-	/**
-	 * A constant with a fixed name that can be used as the base value for additional hand written constants.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 0;
-
-	/**
-	 * A constant with a fixed name that can be used as the base value for additional hand written constants in a derived class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static final int DIAGNOSTIC_CODE_COUNT = GENERATED_DIAGNOSTIC_CODE_COUNT;
-
-	/**
-	 * The cached base package validator.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XMLTypeValidator xmlTypeValidator;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaeeValidator() {
-		super();
-		xmlTypeValidator = XMLTypeValidator.INSTANCE;
-	}
-
-	/**
-	 * Returns the package of this validator switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EPackage getEPackage() {
-	  return JavaeePackage.eINSTANCE;
-	}
-
-	/**
-	 * Calls <code>validateXXX</code> for the corresonding classifier of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map context) {
-		switch (classifierID) {
-			case JavaeePackage.DESCRIPTION:
-				return validateDescription((Description)value, diagnostics, context);
-			case JavaeePackage.DISPLAY_NAME:
-				return validateDisplayName((DisplayName)value, diagnostics, context);
-			case JavaeePackage.EJB_LOCAL_REF:
-				return validateEjbLocalRef((EjbLocalRef)value, diagnostics, context);
-			case JavaeePackage.EJB_REF:
-				return validateEjbRef((EjbRef)value, diagnostics, context);
-			case JavaeePackage.EMPTY_TYPE:
-				return validateEmptyType((EmptyType)value, diagnostics, context);
-			case JavaeePackage.ENV_ENTRY:
-				return validateEnvEntry((EnvEntry)value, diagnostics, context);
-			case JavaeePackage.ICON:
-				return validateIcon((Icon)value, diagnostics, context);
-			case JavaeePackage.INJECTION_TARGET:
-				return validateInjectionTarget((InjectionTarget)value, diagnostics, context);
-			case JavaeePackage.LIFECYCLE_CALLBACK:
-				return validateLifecycleCallback((LifecycleCallback)value, diagnostics, context);
-			case JavaeePackage.LISTENER:
-				return validateListener((Listener)value, diagnostics, context);
-			case JavaeePackage.MESSAGE_DESTINATION:
-				return validateMessageDestination((MessageDestination)value, diagnostics, context);
-			case JavaeePackage.MESSAGE_DESTINATION_REF:
-				return validateMessageDestinationRef((MessageDestinationRef)value, diagnostics, context);
-			case JavaeePackage.PARAM_VALUE:
-				return validateParamValue((ParamValue)value, diagnostics, context);
-			case JavaeePackage.PERSISTENCE_CONTEXT_REF:
-				return validatePersistenceContextRef((PersistenceContextRef)value, diagnostics, context);
-			case JavaeePackage.PERSISTENCE_UNIT_REF:
-				return validatePersistenceUnitRef((PersistenceUnitRef)value, diagnostics, context);
-			case JavaeePackage.PORT_COMPONENT_REF:
-				return validatePortComponentRef((PortComponentRef)value, diagnostics, context);
-			case JavaeePackage.PROPERTY_TYPE:
-				return validatePropertyType((PropertyType)value, diagnostics, context);
-			case JavaeePackage.RESOURCE_ENV_REF:
-				return validateResourceEnvRef((ResourceEnvRef)value, diagnostics, context);
-			case JavaeePackage.RESOURCE_REF:
-				return validateResourceRef((ResourceRef)value, diagnostics, context);
-			case JavaeePackage.RUN_AS:
-				return validateRunAs((RunAs)value, diagnostics, context);
-			case JavaeePackage.SECURITY_ROLE:
-				return validateSecurityRole((SecurityRole)value, diagnostics, context);
-			case JavaeePackage.SECURITY_ROLE_REF:
-				return validateSecurityRoleRef((SecurityRoleRef)value, diagnostics, context);
-			case JavaeePackage.SERVICE_REF:
-				return validateServiceRef((ServiceRef)value, diagnostics, context);
-			case JavaeePackage.SERVICE_REF_HANDLER:
-				return validateServiceRefHandler((ServiceRefHandler)value, diagnostics, context);
-			case JavaeePackage.SERVICE_REF_HANDLER_CHAIN:
-				return validateServiceRefHandlerChain((ServiceRefHandlerChain)value, diagnostics, context);
-			case JavaeePackage.SERVICE_REF_HANDLER_CHAINS:
-				return validateServiceRefHandlerChains((ServiceRefHandlerChains)value, diagnostics, context);
-			case JavaeePackage.URL_PATTERN_TYPE:
-				return validateUrlPatternType((UrlPatternType)value, diagnostics, context);
-			case JavaeePackage.EJB_REF_TYPE:
-				return validateEjbRefType((EjbRefType)value, diagnostics, context);
-			case JavaeePackage.ENV_ENTRY_TYPE:
-				return validateEnvEntryType((EnvEntryType)value, diagnostics, context);
-			case JavaeePackage.MESSAGE_DESTINATION_USAGE_TYPE:
-				return validateMessageDestinationUsageType((MessageDestinationUsageType)value, diagnostics, context);
-			case JavaeePackage.PERSISTENCE_CONTEXT_TYPE:
-				return validatePersistenceContextType((PersistenceContextType)value, diagnostics, context);
-			case JavaeePackage.RES_AUTH_TYPE:
-				return validateResAuthType((ResAuthType)value, diagnostics, context);
-			case JavaeePackage.RES_SHARING_SCOPE_TYPE:
-				return validateResSharingScopeType((ResSharingScopeType)value, diagnostics, context);
-			case JavaeePackage.DEWEY_VERSION_TYPE:
-				return validateDeweyVersionType((String)value, diagnostics, context);
-			case JavaeePackage.EJB_LINK:
-				return validateEJBLink((String)value, diagnostics, context);
-			case JavaeePackage.EJB_REF_NAME_TYPE:
-				return validateEjbRefNameType((String)value, diagnostics, context);
-			case JavaeePackage.EJB_REF_TYPE_OBJECT:
-				return validateEjbRefTypeObject((EjbRefType)value, diagnostics, context);
-			case JavaeePackage.ENV_ENTRY_TYPE_OBJECT:
-				return validateEnvEntryTypeObject((EnvEntryType)value, diagnostics, context);
-			case JavaeePackage.FULLY_QUALIFIED_CLASS_TYPE:
-				return validateFullyQualifiedClassType((String)value, diagnostics, context);
-			case JavaeePackage.HOME:
-				return validateHome((String)value, diagnostics, context);
-			case JavaeePackage.JAVA_IDENTIFIER:
-				return validateJavaIdentifier((String)value, diagnostics, context);
-			case JavaeePackage.JAVA_TYPE:
-				return validateJavaType((String)value, diagnostics, context);
-			case JavaeePackage.JNDI_NAME:
-				return validateJNDIName((String)value, diagnostics, context);
-			case JavaeePackage.LOCAL:
-				return validateLocal((String)value, diagnostics, context);
-			case JavaeePackage.LOCAL_HOME:
-				return validateLocalHome((String)value, diagnostics, context);
-			case JavaeePackage.MESSAGE_DESTINATION_LINK:
-				return validateMessageDestinationLink((String)value, diagnostics, context);
-			case JavaeePackage.MESSAGE_DESTINATION_TYPE_TYPE:
-				return validateMessageDestinationTypeType((String)value, diagnostics, context);
-			case JavaeePackage.MESSAGE_DESTINATION_USAGE_TYPE_OBJECT:
-				return validateMessageDestinationUsageTypeObject((MessageDestinationUsageType)value, diagnostics, context);
-			case JavaeePackage.PATH_TYPE:
-				return validatePathType((String)value, diagnostics, context);
-			case JavaeePackage.PERSISTENCE_CONTEXT_TYPE_OBJECT:
-				return validatePersistenceContextTypeObject((PersistenceContextType)value, diagnostics, context);
-			case JavaeePackage.REMOTE:
-				return validateRemote((String)value, diagnostics, context);
-			case JavaeePackage.RES_AUTH_TYPE_OBJECT:
-				return validateResAuthTypeObject((ResAuthType)value, diagnostics, context);
-			case JavaeePackage.RES_SHARING_SCOPE_TYPE_OBJECT:
-				return validateResSharingScopeTypeObject((ResSharingScopeType)value, diagnostics, context);
-			case JavaeePackage.ROLE_NAME:
-				return validateRoleName((String)value, diagnostics, context);
-			case JavaeePackage.SERVICE_REF_PROTOCOL_BINDING_LIST_TYPE:
-				return validateServiceRefProtocolBindingListType((List)value, diagnostics, context);
-			case JavaeePackage.SERVICE_REF_PROTOCOL_BINDING_TYPE:
-				return validateServiceRefProtocolBindingType((String)value, diagnostics, context);
-			case JavaeePackage.SERVICE_REF_PROTOCOL_URI_ALIAS_TYPE:
-				return validateServiceRefProtocolURIAliasType((String)value, diagnostics, context);
-			case JavaeePackage.SERVICE_REF_QNAME_PATTERN:
-				return validateServiceRefQnamePattern((String)value, diagnostics, context);
-			case JavaeePackage.TRUE_FALSE_TYPE:
-				return validateTrueFalseType(((Boolean)value).booleanValue(), diagnostics, context);
-			case JavaeePackage.TRUE_FALSE_TYPE_OBJECT:
-				return validateTrueFalseTypeObject((Boolean)value, diagnostics, context);
-			default: 
-				return true;
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateDescription(Description description, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)description, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateDisplayName(DisplayName displayName, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)displayName, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateEjbLocalRef(EjbLocalRef ejbLocalRef, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)ejbLocalRef, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateEjbRef(EjbRef ejbRef, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)ejbRef, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateEmptyType(EmptyType emptyType, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)emptyType, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateEnvEntry(EnvEntry envEntry, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)envEntry, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateIcon(Icon icon, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)icon, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateInjectionTarget(InjectionTarget injectionTarget, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)injectionTarget, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateLifecycleCallback(LifecycleCallback lifecycleCallback, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)lifecycleCallback, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateListener(Listener listener, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)listener, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateMessageDestination(MessageDestination messageDestination, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)messageDestination, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateMessageDestinationRef(MessageDestinationRef messageDestinationRef, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)messageDestinationRef, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateParamValue(ParamValue paramValue, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)paramValue, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validatePersistenceContextRef(PersistenceContextRef persistenceContextRef, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)persistenceContextRef, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validatePersistenceUnitRef(PersistenceUnitRef persistenceUnitRef, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)persistenceUnitRef, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validatePortComponentRef(PortComponentRef portComponentRef, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)portComponentRef, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validatePropertyType(PropertyType propertyType, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)propertyType, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateResourceEnvRef(ResourceEnvRef resourceEnvRef, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)resourceEnvRef, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateResourceRef(ResourceRef resourceRef, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)resourceRef, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateRunAs(RunAs runAs, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)runAs, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateSecurityRole(SecurityRole securityRole, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)securityRole, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateSecurityRoleRef(SecurityRoleRef securityRoleRef, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)securityRoleRef, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateServiceRef(ServiceRef serviceRef, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)serviceRef, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateServiceRefHandler(ServiceRefHandler serviceRefHandler, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)serviceRefHandler, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateServiceRefHandlerChain(ServiceRefHandlerChain serviceRefHandlerChain, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)serviceRefHandlerChain, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateServiceRefHandlerChains(ServiceRefHandlerChains serviceRefHandlerChains, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)serviceRefHandlerChains, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateUrlPatternType(UrlPatternType urlPatternType, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)urlPatternType, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateEjbRefType(EjbRefType ejbRefType, DiagnosticChain diagnostics, Map context) {
-		return true;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateEnvEntryType(EnvEntryType envEntryType, DiagnosticChain diagnostics, Map context) {
-		return true;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateMessageDestinationUsageType(MessageDestinationUsageType messageDestinationUsageType, DiagnosticChain diagnostics, Map context) {
-		return true;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validatePersistenceContextType(PersistenceContextType persistenceContextType, DiagnosticChain diagnostics, Map context) {
-		return true;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateResAuthType(ResAuthType resAuthType, DiagnosticChain diagnostics, Map context) {
-		return true;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateResSharingScopeType(ResSharingScopeType resSharingScopeType, DiagnosticChain diagnostics, Map context) {
-		return true;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateDeweyVersionType(String deweyVersionType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateDeweyVersionType_Pattern(deweyVersionType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateDeweyVersionType_Pattern
-	 */
-	public static final  PatternMatcher [][] DEWEY_VERSION_TYPE__PATTERN__VALUES =
-		new PatternMatcher [][] {
-			new PatternMatcher [] {
-				XMLTypeUtil.createPatternMatcher("\\.?[0-9]+(\\.[0-9]+)*")
-			}
-		};
-
-	/**
-	 * Validates the Pattern constraint of '<em>Dewey Version Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateDeweyVersionType_Pattern(String deweyVersionType, DiagnosticChain diagnostics, Map context) {
-		return validatePattern(JavaeePackage.Literals.DEWEY_VERSION_TYPE, deweyVersionType, DEWEY_VERSION_TYPE__PATTERN__VALUES, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateEJBLink(String ejbLink, DiagnosticChain diagnostics, Map context) {
-		return true;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateEjbRefNameType(String ejbRefNameType, DiagnosticChain diagnostics, Map context) {
-		return true;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateEjbRefTypeObject(EjbRefType ejbRefTypeObject, DiagnosticChain diagnostics, Map context) {
-		return true;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateEnvEntryTypeObject(EnvEntryType envEntryTypeObject, DiagnosticChain diagnostics, Map context) {
-		return true;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateFullyQualifiedClassType(String fullyQualifiedClassType, DiagnosticChain diagnostics, Map context) {
-		return true;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateHome(String home, DiagnosticChain diagnostics, Map context) {
-		return true;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateJavaIdentifier(String javaIdentifier, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateJavaIdentifier_Pattern(javaIdentifier, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateJavaIdentifier_Pattern
-	 */
-	public static final  PatternMatcher [][] JAVA_IDENTIFIER__PATTERN__VALUES =
-		new PatternMatcher [][] {
-			new PatternMatcher [] {
-				XMLTypeUtil.createPatternMatcher("($|_|\\p{L})(\\p{L}|\\p{Nd}|_|$)*")
-			}
-		};
-
-	/**
-	 * Validates the Pattern constraint of '<em>Java Identifier</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateJavaIdentifier_Pattern(String javaIdentifier, DiagnosticChain diagnostics, Map context) {
-		return validatePattern(JavaeePackage.Literals.JAVA_IDENTIFIER, javaIdentifier, JAVA_IDENTIFIER__PATTERN__VALUES, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateJavaType(String javaType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateJavaType_Pattern(javaType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateJavaType_Pattern
-	 */
-	public static final  PatternMatcher [][] JAVA_TYPE__PATTERN__VALUES =
-		new PatternMatcher [][] {
-			new PatternMatcher [] {
-				XMLTypeUtil.createPatternMatcher("[^\\p{Z}]*")
-			}
-		};
-
-	/**
-	 * Validates the Pattern constraint of '<em>Java Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateJavaType_Pattern(String javaType, DiagnosticChain diagnostics, Map context) {
-		return validatePattern(JavaeePackage.Literals.JAVA_TYPE, javaType, JAVA_TYPE__PATTERN__VALUES, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateJNDIName(String jndiName, DiagnosticChain diagnostics, Map context) {
-		return true;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateLocal(String local, DiagnosticChain diagnostics, Map context) {
-		return true;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateLocalHome(String localHome, DiagnosticChain diagnostics, Map context) {
-		return true;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateMessageDestinationLink(String messageDestinationLink, DiagnosticChain diagnostics, Map context) {
-		return true;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateMessageDestinationTypeType(String messageDestinationTypeType, DiagnosticChain diagnostics, Map context) {
-		return true;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateMessageDestinationUsageTypeObject(MessageDestinationUsageType messageDestinationUsageTypeObject, DiagnosticChain diagnostics, Map context) {
-		return true;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validatePathType(String pathType, DiagnosticChain diagnostics, Map context) {
-		return true;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validatePersistenceContextTypeObject(PersistenceContextType persistenceContextTypeObject, DiagnosticChain diagnostics, Map context) {
-		return true;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateRemote(String remote, DiagnosticChain diagnostics, Map context) {
-		return true;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateResAuthTypeObject(ResAuthType resAuthTypeObject, DiagnosticChain diagnostics, Map context) {
-		return true;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateResSharingScopeTypeObject(ResSharingScopeType resSharingScopeTypeObject, DiagnosticChain diagnostics, Map context) {
-		return true;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateRoleName(String roleName, DiagnosticChain diagnostics, Map context) {
-		return true;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateServiceRefProtocolBindingListType(List serviceRefProtocolBindingListType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateServiceRefProtocolBindingListType_ItemType(serviceRefProtocolBindingListType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * Validates the ItemType constraint of '<em>Service Ref Protocol Binding List Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateServiceRefProtocolBindingListType_ItemType(List serviceRefProtocolBindingListType, DiagnosticChain diagnostics, Map context) {
-		boolean result = true;
-		for (Iterator i = serviceRefProtocolBindingListType.iterator(); i.hasNext() && (result || diagnostics != null); ) {
-			Object item = i.next();
-			if (JavaeePackage.Literals.SERVICE_REF_PROTOCOL_BINDING_TYPE.isInstance(item)) {
-				result &= validateServiceRefProtocolBindingType((String)item, diagnostics, context);
-			}
-			else {
-				result = false;
-				reportDataValueTypeViolation(JavaeePackage.Literals.SERVICE_REF_PROTOCOL_BINDING_TYPE, item, diagnostics, context);
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateServiceRefProtocolBindingType(String serviceRefProtocolBindingType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateServiceRefProtocolBindingType_MemberTypes(serviceRefProtocolBindingType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * Validates the MemberTypes constraint of '<em>Service Ref Protocol Binding Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateServiceRefProtocolBindingType_MemberTypes(String serviceRefProtocolBindingType, DiagnosticChain diagnostics, Map context) {
-		if (diagnostics != null) {
-			BasicDiagnostic tempDiagnostics = new BasicDiagnostic();
-			if (XMLTypePackage.Literals.ANY_URI.isInstance(serviceRefProtocolBindingType)) {
-				if (xmlTypeValidator.validateAnyURI((String)serviceRefProtocolBindingType, tempDiagnostics, context)) return true;
-			}
-			if (JavaeePackage.Literals.SERVICE_REF_PROTOCOL_URI_ALIAS_TYPE.isInstance(serviceRefProtocolBindingType)) {
-				if (validateServiceRefProtocolURIAliasType((String)serviceRefProtocolBindingType, tempDiagnostics, context)) return true;
-			}
-			List children = tempDiagnostics.getChildren();
-			for (int i = 0; i < children.size(); i++) {
-				diagnostics.add((Diagnostic)children.get(i));
-			}
-		}
-		else {
-			if (XMLTypePackage.Literals.ANY_URI.isInstance(serviceRefProtocolBindingType)) {
-				if (xmlTypeValidator.validateAnyURI((String)serviceRefProtocolBindingType, null, context)) return true;
-			}
-			if (JavaeePackage.Literals.SERVICE_REF_PROTOCOL_URI_ALIAS_TYPE.isInstance(serviceRefProtocolBindingType)) {
-				if (validateServiceRefProtocolURIAliasType((String)serviceRefProtocolBindingType, null, context)) return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateServiceRefProtocolURIAliasType(String serviceRefProtocolURIAliasType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateServiceRefProtocolURIAliasType_Pattern(serviceRefProtocolURIAliasType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateServiceRefProtocolURIAliasType_Pattern
-	 */
-	public static final  PatternMatcher [][] SERVICE_REF_PROTOCOL_URI_ALIAS_TYPE__PATTERN__VALUES =
-		new PatternMatcher [][] {
-			new PatternMatcher [] {
-				XMLTypeUtil.createPatternMatcher("##.+")
-			}
-		};
-
-	/**
-	 * Validates the Pattern constraint of '<em>Service Ref Protocol URI Alias Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateServiceRefProtocolURIAliasType_Pattern(String serviceRefProtocolURIAliasType, DiagnosticChain diagnostics, Map context) {
-		return validatePattern(JavaeePackage.Literals.SERVICE_REF_PROTOCOL_URI_ALIAS_TYPE, serviceRefProtocolURIAliasType, SERVICE_REF_PROTOCOL_URI_ALIAS_TYPE__PATTERN__VALUES, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateServiceRefQnamePattern(String serviceRefQnamePattern, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateServiceRefQnamePattern_Pattern(serviceRefQnamePattern, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateServiceRefQnamePattern_Pattern
-	 */
-	public static final  PatternMatcher [][] SERVICE_REF_QNAME_PATTERN__PATTERN__VALUES =
-		new PatternMatcher [][] {
-			new PatternMatcher [] {
-				XMLTypeUtil.createPatternMatcher("\\*|([\\i-[:]][\\c-[:]]*:)?[\\i-[:]][\\c-[:]]*\\*?")
-			}
-		};
-
-	/**
-	 * Validates the Pattern constraint of '<em>Service Ref Qname Pattern</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateServiceRefQnamePattern_Pattern(String serviceRefQnamePattern, DiagnosticChain diagnostics, Map context) {
-		return validatePattern(JavaeePackage.Literals.SERVICE_REF_QNAME_PATTERN, serviceRefQnamePattern, SERVICE_REF_QNAME_PATTERN__PATTERN__VALUES, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateTrueFalseType(boolean trueFalseType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateTrueFalseType_Pattern(trueFalseType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateTrueFalseType_Pattern
-	 */
-	public static final  PatternMatcher [][] TRUE_FALSE_TYPE__PATTERN__VALUES =
-		new PatternMatcher [][] {
-			new PatternMatcher [] {
-				XMLTypeUtil.createPatternMatcher("(true|false)")
-			}
-		};
-
-	/**
-	 * Validates the Pattern constraint of '<em>True False Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateTrueFalseType_Pattern(boolean trueFalseType, DiagnosticChain diagnostics, Map context) {
-		return validatePattern(JavaeePackage.Literals.TRUE_FALSE_TYPE, new Boolean(trueFalseType), TRUE_FALSE_TYPE__PATTERN__VALUES, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateTrueFalseTypeObject(Boolean trueFalseTypeObject, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateTrueFalseType_Pattern(trueFalseTypeObject.booleanValue(), diagnostics, context);
-		return result;
-	}
-
-} //JavaeeValidator
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/util/JavaeeXMLProcessor.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/util/JavaeeXMLProcessor.java
deleted file mode 100644
index ce887ca74..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/util/JavaeeXMLProcessor.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.core.internal.util;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
-import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
-
-/**
- * This class contains helper methods to serialize and deserialize XML documents
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class JavaeeXMLProcessor extends XMLProcessor {
-	/**
-	 * Public constructor to instantiate the helper.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaeeXMLProcessor() {
-		super((EPackage.Registry.INSTANCE));
-		JavaeePackage.eINSTANCE.eClass();
-	}
-	
-	/**
-	 * Register for "*" and "xml" file extensions the JavaeeResourceFactoryImpl factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Map getRegistrations() {
-		if (registrations == null) {
-			super.getRegistrations();
-			registrations.put(XML_EXTENSION, new JavaeeResourceFactoryImpl());
-			registrations.put(STAR_EXTENSION, new JavaeeResourceFactoryImpl());
-		}
-		return registrations;
-	}
-
-} //JavaeeXMLProcessor
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/ActivationConfig.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/ActivationConfig.java
deleted file mode 100644
index 3d48502e8..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/ActivationConfig.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb;
-
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Activation Config</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The activation-configType defines information about the
- * 	expected configuration properties of the message-driven bean
- * 	in its operational environment. This may include information
- * 	about message acknowledgement, message selector, expected
- * 	destination type, etc.
- * 
- * 	The configuration information is expressed in terms of
- * 	name/value configuration properties.
- * 
- * 	The properties that are recognized for a particular
- * 	message-driven bean are determined by the messaging type.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.ActivationConfig#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.ActivationConfig#getActivationConfigProperties <em>Activation Config Properties</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.ActivationConfig#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getActivationConfig()
- * @extends JavaEEObject
- * @generated
- */
-public interface ActivationConfig extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getActivationConfig_Descriptions()
-	 * @generated
-	 */
-	List getDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>Activation Config Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.ejb.ActivationConfigProperty}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Activation Config Properties</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Activation Config Properties</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getActivationConfig_ActivationConfigProperties()
-	 * @generated
-	 */
-	List getActivationConfigProperties();
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getActivationConfig_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.ActivationConfig#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // ActivationConfig
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/ActivationConfigProperty.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/ActivationConfigProperty.java
deleted file mode 100644
index 1e20f8f91..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/ActivationConfigProperty.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Activation Config Property</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The activation-config-propertyType contains a name/value
- * 	configuration property pair for a message-driven bean.
- * 
- * 	The properties that are recognized for a particular
- * 	message-driven bean are determined by the messaging type.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.ActivationConfigProperty#getActivationConfigPropertyName <em>Activation Config Property Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.ActivationConfigProperty#getActivationConfigPropertyValue <em>Activation Config Property Value</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.ActivationConfigProperty#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getActivationConfigProperty()
- * @extends JavaEEObject
- * @generated
- */
-public interface ActivationConfigProperty extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Activation Config Property Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The activation-config-property-name element contains
-	 * 	    the name for an activation configuration property of
-	 * 	    a message-driven bean.
-	 * 
-	 * 	    For JMS message-driven beans, the following property
-	 * 	    names are recognized: acknowledgeMode,
-	 * 	    messageSelector, destinationType, subscriptionDurability
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Activation Config Property Name</em>' attribute.
-	 * @see #setActivationConfigPropertyName(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getActivationConfigProperty_ActivationConfigPropertyName()
-	 * @generated
-	 */
-	String getActivationConfigPropertyName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.ActivationConfigProperty#getActivationConfigPropertyName <em>Activation Config Property Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Activation Config Property Name</em>' attribute.
-	 * @see #getActivationConfigPropertyName()
-	 * @generated
-	 */
-	void setActivationConfigPropertyName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Activation Config Property Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The activation-config-property-value element
-	 * 	    contains the value for an activation configuration
-	 * 	    property of a message-driven bean.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Activation Config Property Value</em>' attribute.
-	 * @see #setActivationConfigPropertyValue(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getActivationConfigProperty_ActivationConfigPropertyValue()
-	 * @generated
-	 */
-	String getActivationConfigPropertyValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.ActivationConfigProperty#getActivationConfigPropertyValue <em>Activation Config Property Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Activation Config Property Value</em>' attribute.
-	 * @see #getActivationConfigPropertyValue()
-	 * @generated
-	 */
-	void setActivationConfigPropertyValue(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getActivationConfigProperty_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.ActivationConfigProperty#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // ActivationConfigProperty
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/ApplicationException.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/ApplicationException.java
deleted file mode 100644
index ba067e68e..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/ApplicationException.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Application Exception</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- *         The application-exceptionType declares an application
- *         exception. The declaration consists of:
- * 
- *             - the exception class. When the container receives
- *               an exception of this type, it is required to
- *               forward this exception as an applcation exception
- *               to the client regardless of whether it is a checked
- *               or unchecked exception.
- *             - an optional rollback element. If this element is
- *               set to true, the container must rollback the current
- *               transaction before forwarding the exception to the
- *               client.  If not specified, it defaults to false.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.ApplicationException#getExceptionClass <em>Exception Class</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.ApplicationException#isRollback <em>Rollback</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.ApplicationException#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getApplicationException()
- * @extends JavaEEObject
- * @generated
- */
-public interface ApplicationException extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Exception Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Exception Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Exception Class</em>' attribute.
-	 * @see #setExceptionClass(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getApplicationException_ExceptionClass()
-	 * @generated
-	 */
-	String getExceptionClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.ApplicationException#getExceptionClass <em>Exception Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Exception Class</em>' attribute.
-	 * @see #getExceptionClass()
-	 * @generated
-	 */
-	void setExceptionClass(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Rollback</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Rollback</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Rollback</em>' attribute.
-	 * @see #isSetRollback()
-	 * @see #unsetRollback()
-	 * @see #setRollback(boolean)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getApplicationException_Rollback()
-	 * @generated
-	 */
-	boolean isRollback();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.ApplicationException#isRollback <em>Rollback</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Rollback</em>' attribute.
-	 * @see #isSetRollback()
-	 * @see #unsetRollback()
-	 * @see #isRollback()
-	 * @generated
-	 */
-	void setRollback(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.javaee.ejb.ApplicationException#isRollback <em>Rollback</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetRollback()
-	 * @see #isRollback()
-	 * @see #setRollback(boolean)
-	 * @generated
-	 */
-	void unsetRollback();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.ejb.ApplicationException#isRollback <em>Rollback</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Rollback</em>' attribute is set.
-	 * @see #unsetRollback()
-	 * @see #isRollback()
-	 * @see #setRollback(boolean)
-	 * @generated
-	 */
-	boolean isSetRollback();
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getApplicationException_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.ApplicationException#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // ApplicationException
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/AroundInvokeType.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/AroundInvokeType.java
deleted file mode 100644
index 9222082cd..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/AroundInvokeType.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Around Invoke Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- *         The around-invoke type specifies a method on a
- *         class to be called during the around invoke portion of an
- *         ejb invocation.  Note that each class may have only one
- *         around invoke method and that the method may not be
- *         overloaded.
- * 
- *         If the class element is missing then
- *         the class defining the callback is assumed to be the
- *         interceptor class or component class in scope at the
- *         location in the descriptor in which the around invoke
- *         definition appears.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.AroundInvokeType#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.AroundInvokeType#getMethodName <em>Method Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getAroundInvokeType()
- * @extends JavaEEObject
- * @generated
- */
-public interface AroundInvokeType extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Class</em>' attribute.
-	 * @see #setClass(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getAroundInvokeType_Class()
-	 * @generated
-	 */
-	String getClass_();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.AroundInvokeType#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
-	 * @see #getClass_()
-	 * @generated
-	 */
-	void setClass(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Method Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Method Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Method Name</em>' attribute.
-	 * @see #setMethodName(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getAroundInvokeType_MethodName()
-	 * @generated
-	 */
-	String getMethodName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.AroundInvokeType#getMethodName <em>Method Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Method Name</em>' attribute.
-	 * @see #getMethodName()
-	 * @generated
-	 */
-	void setMethodName(String value);
-
-} // AroundInvokeType
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/AssemblyDescriptor.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/AssemblyDescriptor.java
deleted file mode 100644
index 1a9113c2c..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/AssemblyDescriptor.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb;
-
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Assembly Descriptor</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The assembly-descriptorType defines
- * 	application-assembly information.
- * 
- * 	The application-assembly information consists of the
- * 	following parts: the definition of security roles, the
- * 	definition of method permissions, the definition of
- * 	transaction attributes for enterprise beans with
- * 	container-managed transaction demarcation, the definition
- *         of interceptor bindings, a list of
- * 	methods to be excluded from being invoked, and a list of
- *         exception types that should be treated as application exceptions.
- * 
- * 	All the parts are optional in the sense that they are
- * 	omitted if the lists represented by them are empty.
- * 
- * 	Providing an assembly-descriptor in the deployment
- * 	descriptor is optional for the ejb-jar file producer.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getSecurityRoles <em>Security Roles</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getMethodPermissions <em>Method Permissions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getContainerTransactions <em>Container Transactions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getInterceptorBindings <em>Interceptor Bindings</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getMessageDestinations <em>Message Destinations</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getExcludeList <em>Exclude List</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getApplicationExceptions <em>Application Exceptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getAssemblyDescriptor()
- * @extends JavaEEObject
- * @generated
- */
-public interface AssemblyDescriptor extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Security Roles</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.SecurityRole}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Security Roles</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Security Roles</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getAssemblyDescriptor_SecurityRoles()
-	 * @generated
-	 */
-	List getSecurityRoles();
-
-	/**
-	 * Returns the value of the '<em><b>Method Permissions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.ejb.MethodPermission}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Method Permissions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Method Permissions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getAssemblyDescriptor_MethodPermissions()
-	 * @generated
-	 */
-	List getMethodPermissions();
-
-	/**
-	 * Returns the value of the '<em><b>Container Transactions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.ejb.ContainerTransactionType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Container Transactions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Container Transactions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getAssemblyDescriptor_ContainerTransactions()
-	 * @generated
-	 */
-	List getContainerTransactions();
-
-	/**
-	 * Returns the value of the '<em><b>Interceptor Bindings</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.ejb.InterceptorBindingType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Interceptor Bindings</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Interceptor Bindings</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getAssemblyDescriptor_InterceptorBindings()
-	 * @generated
-	 */
-	List getInterceptorBindings();
-
-	/**
-	 * Returns the value of the '<em><b>Message Destinations</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.MessageDestination}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Message Destinations</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Message Destinations</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getAssemblyDescriptor_MessageDestinations()
-	 * @generated
-	 */
-	List getMessageDestinations();
-
-	/**
-	 * Returns the value of the '<em><b>Exclude List</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Exclude List</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Exclude List</em>' containment reference.
-	 * @see #setExcludeList(ExcludeList)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getAssemblyDescriptor_ExcludeList()
-	 * @generated
-	 */
-	ExcludeList getExcludeList();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getExcludeList <em>Exclude List</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Exclude List</em>' containment reference.
-	 * @see #getExcludeList()
-	 * @generated
-	 */
-	void setExcludeList(ExcludeList value);
-
-	/**
-	 * Returns the value of the '<em><b>Application Exceptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.ejb.ApplicationException}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Application Exceptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Application Exceptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getAssemblyDescriptor_ApplicationExceptions()
-	 * @generated
-	 */
-	List getApplicationExceptions();
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getAssemblyDescriptor_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // AssemblyDescriptor
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/CMPField.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/CMPField.java
deleted file mode 100644
index 569b823d7..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/CMPField.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb;
-
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>CMP Field</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The cmp-fieldType describes a container-managed field. The
- * 	cmp-fieldType contains an optional description of the field,
- * 	and the name of the field.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.CMPField#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.CMPField#getFieldName <em>Field Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.CMPField#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getCMPField()
- * @extends JavaEEObject
- * @generated
- */
-public interface CMPField extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getCMPField_Descriptions()
-	 * @generated
-	 */
-	List getDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>Field Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The field-name element specifies the name of a
-	 * 	    container managed field.
-	 * 
-	 * 	    The name of the cmp-field of an entity bean with
-	 * 	    cmp-version 2.x must begin with a lowercase
-	 * 	    letter. This field is accessed by methods whose
-	 * 	    names consists of the name of the field specified by
-	 * 	    field-name in which the first letter is uppercased,
-	 * 	    prefixed by "get" or "set".
-	 * 
-	 * 	    The name of the cmp-field of an entity bean with
-	 * 	    cmp-version 1.x must denote a public field of the
-	 * 	    enterprise bean class or one of its superclasses.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Field Name</em>' attribute.
-	 * @see #setFieldName(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getCMPField_FieldName()
-	 * @generated
-	 */
-	String getFieldName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.CMPField#getFieldName <em>Field Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Field Name</em>' attribute.
-	 * @see #getFieldName()
-	 * @generated
-	 */
-	void setFieldName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getCMPField_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.CMPField#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // CMPField
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/CMRField.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/CMRField.java
deleted file mode 100644
index fffd3e31b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/CMRField.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb;
-
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>CMR Field</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The cmr-fieldType describes the bean provider's view of
- * 	a relationship. It consists of an optional description, and
- * 	the name and the class type of a field in the source of a
- * 	role of a relationship. The cmr-field-name element
- * 	corresponds to the name used for the get and set accessor
- * 	methods for the relationship. The cmr-field-type element is
- * 	used only for collection-valued cmr-fields. It specifies the
- * 	type of the collection that is used.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.CMRField#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.CMRField#getCmrFieldName <em>Cmr Field Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.CMRField#getCmrFieldType <em>Cmr Field Type</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.CMRField#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getCMRField()
- * @extends JavaEEObject
- * @generated
- */
-public interface CMRField extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getCMRField_Descriptions()
-	 * @generated
-	 */
-	List getDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>Cmr Field Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The cmr-field-name element specifies the name of a
-	 * 	    logical relationship field in the entity bean
-	 * 	    class. The name of the cmr-field must begin with a
-	 * 	    lowercase letter. This field is accessed by methods
-	 * 	    whose names consist of the name of the field
-	 * 	    specified by cmr-field-name in which the first
-	 * 	    letter is uppercased, prefixed by "get" or "set".
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Cmr Field Name</em>' attribute.
-	 * @see #setCmrFieldName(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getCMRField_CmrFieldName()
-	 * @generated
-	 */
-	String getCmrFieldName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.CMRField#getCmrFieldName <em>Cmr Field Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cmr Field Name</em>' attribute.
-	 * @see #getCmrFieldName()
-	 * @generated
-	 */
-	void setCmrFieldName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Cmr Field Type</b></em>' attribute.
-	 * The default value is <code>"java.util.Collection"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.ejb.CMRFieldType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cmr Field Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Cmr Field Type</em>' attribute.
-	 * @see org.eclipse.jst.javaee.ejb.CMRFieldType
-	 * @see #isSetCmrFieldType()
-	 * @see #unsetCmrFieldType()
-	 * @see #setCmrFieldType(CMRFieldType)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getCMRField_CmrFieldType()
-	 * @generated
-	 */
-	CMRFieldType getCmrFieldType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.CMRField#getCmrFieldType <em>Cmr Field Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cmr Field Type</em>' attribute.
-	 * @see org.eclipse.jst.javaee.ejb.CMRFieldType
-	 * @see #isSetCmrFieldType()
-	 * @see #unsetCmrFieldType()
-	 * @see #getCmrFieldType()
-	 * @generated
-	 */
-	void setCmrFieldType(CMRFieldType value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.javaee.ejb.CMRField#getCmrFieldType <em>Cmr Field Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetCmrFieldType()
-	 * @see #getCmrFieldType()
-	 * @see #setCmrFieldType(CMRFieldType)
-	 * @generated
-	 */
-	void unsetCmrFieldType();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.ejb.CMRField#getCmrFieldType <em>Cmr Field Type</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Cmr Field Type</em>' attribute is set.
-	 * @see #unsetCmrFieldType()
-	 * @see #getCmrFieldType()
-	 * @see #setCmrFieldType(CMRFieldType)
-	 * @generated
-	 */
-	boolean isSetCmrFieldType();
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getCMRField_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.CMRField#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // CMRField
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/CMRFieldType.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/CMRFieldType.java
deleted file mode 100644
index d4528fdce..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/CMRFieldType.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>CMR Field Type</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The cmr-field-type element specifies the class of a
- * 	collection-valued logical relationship field in the entity
- * 	bean class. The value of an element using cmr-field-typeType
- * 	must be either: java.util.Collection or java.util.Set.
- * 
- *       
- * <!-- end-model-doc -->
- * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getCMRFieldType()
- * @generated
- */
-public final class CMRFieldType extends AbstractEnumerator {
-	/**
-	 * The '<em><b>Java Util Collection</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Java Util Collection</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #JAVA_UTIL_COLLECTION_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int JAVA_UTIL_COLLECTION = 0;
-
-	/**
-	 * The '<em><b>Java Util Set</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Java Util Set</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #JAVA_UTIL_SET_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int JAVA_UTIL_SET = 1;
-
-	/**
-	 * The '<em><b>Java Util Collection</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #JAVA_UTIL_COLLECTION
-	 * @generated
-	 * @ordered
-	 */
-	public static final CMRFieldType JAVA_UTIL_COLLECTION_LITERAL = new CMRFieldType(JAVA_UTIL_COLLECTION, "javaUtilCollection", "java.util.Collection"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Java Util Set</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #JAVA_UTIL_SET
-	 * @generated
-	 * @ordered
-	 */
-	public static final CMRFieldType JAVA_UTIL_SET_LITERAL = new CMRFieldType(JAVA_UTIL_SET, "javaUtilSet", "java.util.Set"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * An array of all the '<em><b>CMR Field Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final CMRFieldType[] VALUES_ARRAY =
-		new CMRFieldType[] {
-			JAVA_UTIL_COLLECTION_LITERAL,
-			JAVA_UTIL_SET_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>CMR Field Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>CMR Field Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static CMRFieldType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			CMRFieldType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>CMR Field Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static CMRFieldType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			CMRFieldType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>CMR Field Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static CMRFieldType get(int value) {
-		switch (value) {
-			case JAVA_UTIL_COLLECTION: return JAVA_UTIL_COLLECTION_LITERAL;
-			case JAVA_UTIL_SET: return JAVA_UTIL_SET_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private CMRFieldType(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //CMRFieldType
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/CmpVersionType.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/CmpVersionType.java
deleted file mode 100644
index d937855dd..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/CmpVersionType.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Cmp Version Type</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The cmp-versionType specifies the version of an entity bean
- * 	with container-managed persistence. It is used by
- * 	cmp-version elements.
- * 
- * 	The value must be one of the two following:
- * 
- * 	    1.x
- * 	    2.x
- * 
- *       
- * <!-- end-model-doc -->
- * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getCmpVersionType()
- * @generated
- */
-public final class CmpVersionType extends AbstractEnumerator {
-	/**
-	 * The '<em><b>1X</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>1X</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #_1X_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int _1X = 0;
-
-	/**
-	 * The '<em><b>2X</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>2X</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #_2X_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int _2X = 1;
-
-	/**
-	 * The '<em><b>1X</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #_1X
-	 * @generated
-	 * @ordered
-	 */
-	public static final CmpVersionType _1X_LITERAL = new CmpVersionType(_1X, "_1X", "1.x"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>2X</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #_2X
-	 * @generated
-	 * @ordered
-	 */
-	public static final CmpVersionType _2X_LITERAL = new CmpVersionType(_2X, "_2X", "2.x"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * An array of all the '<em><b>Cmp Version Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final CmpVersionType[] VALUES_ARRAY =
-		new CmpVersionType[] {
-			_1X_LITERAL,
-			_2X_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Cmp Version Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Cmp Version Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static CmpVersionType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			CmpVersionType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Cmp Version Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static CmpVersionType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			CmpVersionType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Cmp Version Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static CmpVersionType get(int value) {
-		switch (value) {
-			case _1X: return _1X_LITERAL;
-			case _2X: return _2X_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private CmpVersionType(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //CmpVersionType
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/ContainerTransactionType.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/ContainerTransactionType.java
deleted file mode 100644
index 2d422ac76..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/ContainerTransactionType.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb;
-
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Container Transaction Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The container-transactionType specifies how the container
- * 	must manage transaction scopes for the enterprise bean's
- * 	method invocations. It defines an optional description, a
- * 	list of method elements, and a transaction attribute. The
- * 	transaction attribute is to be applied to all the specified
- * 	methods.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.ContainerTransactionType#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.ContainerTransactionType#getMethods <em>Methods</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.ContainerTransactionType#getTransAttribute <em>Trans Attribute</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.ContainerTransactionType#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getContainerTransactionType()
- * @extends JavaEEObject
- * @generated
- */
-public interface ContainerTransactionType extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getContainerTransactionType_Descriptions()
-	 * @generated
-	 */
-	List getDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>Methods</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.ejb.MethodType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Methods</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Methods</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getContainerTransactionType_Methods()
-	 * @generated
-	 */
-	List getMethods();
-
-	/**
-	 * Returns the value of the '<em><b>Trans Attribute</b></em>' attribute.
-	 * The default value is <code>"NotSupported"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.ejb.TransactionAttributeType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Trans Attribute</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Trans Attribute</em>' attribute.
-	 * @see org.eclipse.jst.javaee.ejb.TransactionAttributeType
-	 * @see #isSetTransAttribute()
-	 * @see #unsetTransAttribute()
-	 * @see #setTransAttribute(TransactionAttributeType)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getContainerTransactionType_TransAttribute()
-	 * @generated
-	 */
-	TransactionAttributeType getTransAttribute();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.ContainerTransactionType#getTransAttribute <em>Trans Attribute</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Trans Attribute</em>' attribute.
-	 * @see org.eclipse.jst.javaee.ejb.TransactionAttributeType
-	 * @see #isSetTransAttribute()
-	 * @see #unsetTransAttribute()
-	 * @see #getTransAttribute()
-	 * @generated
-	 */
-	void setTransAttribute(TransactionAttributeType value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.javaee.ejb.ContainerTransactionType#getTransAttribute <em>Trans Attribute</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetTransAttribute()
-	 * @see #getTransAttribute()
-	 * @see #setTransAttribute(TransactionAttributeType)
-	 * @generated
-	 */
-	void unsetTransAttribute();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.ejb.ContainerTransactionType#getTransAttribute <em>Trans Attribute</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Trans Attribute</em>' attribute is set.
-	 * @see #unsetTransAttribute()
-	 * @see #getTransAttribute()
-	 * @see #setTransAttribute(TransactionAttributeType)
-	 * @generated
-	 */
-	boolean isSetTransAttribute();
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getContainerTransactionType_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.ContainerTransactionType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // ContainerTransactionType
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/EJBJar.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/EJBJar.java
deleted file mode 100644
index 4611ca0a6..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/EJBJar.java
+++ /dev/null
@@ -1,412 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb;
-
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>EJB Jar</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The ejb-jarType defines the root element of the EJB
- * 	deployment descriptor. It contains
- * 
- * 	    - an optional description of the ejb-jar file
- * 	    - an optional display name
- * 	    - an optional icon that contains a small and a large
- * 	      icon file name
- * 	    - structural information about all included
- * 	      enterprise beans that is not specified through
- *               annotations
- *             - structural information about interceptor classes
- * 	    - a descriptor for container managed relationships,
- * 	      if any.
- * 	    - an optional application-assembly descriptor
- * 	    - an optional name of an ejb-client-jar file for the
- * 	      ejb-jar.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EJBJar#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EJBJar#getDisplayNames <em>Display Names</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EJBJar#getIcons <em>Icons</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EJBJar#getEnterpriseBeans <em>Enterprise Beans</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EJBJar#getInterceptors <em>Interceptors</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EJBJar#getRelationships <em>Relationships</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EJBJar#getAssemblyDescriptor <em>Assembly Descriptor</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EJBJar#getEjbClientJar <em>Ejb Client Jar</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EJBJar#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EJBJar#isMetadataComplete <em>Metadata Complete</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EJBJar#getVersion <em>Version</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEJBJar()
- * @extends JavaEEObject
- * @generated
- */
-public interface EJBJar extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEJBJar_Descriptions()
-	 * @generated
-	 */
-	List getDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>Display Names</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.DisplayName}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Names</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Names</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEJBJar_DisplayNames()
-	 * @generated
-	 */
-	List getDisplayNames();
-
-	/**
-	 * Returns the value of the '<em><b>Icons</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Icon}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Icons</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Icons</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEJBJar_Icons()
-	 * @generated
-	 */
-	List getIcons();
-
-	/**
-	 * Returns the value of the '<em><b>Enterprise Beans</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Enterprise Beans</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Enterprise Beans</em>' containment reference.
-	 * @see #setEnterpriseBeans(EnterpriseBeans)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEJBJar_EnterpriseBeans()
-	 * @generated
-	 */
-	EnterpriseBeans getEnterpriseBeans();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.EJBJar#getEnterpriseBeans <em>Enterprise Beans</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Enterprise Beans</em>' containment reference.
-	 * @see #getEnterpriseBeans()
-	 * @generated
-	 */
-	void setEnterpriseBeans(EnterpriseBeans value);
-
-	/**
-	 * Returns the value of the '<em><b>Interceptors</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Interceptors</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Interceptors</em>' containment reference.
-	 * @see #setInterceptors(InterceptorsType)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEJBJar_Interceptors()
-	 * @generated
-	 */
-	InterceptorsType getInterceptors();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.EJBJar#getInterceptors <em>Interceptors</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Interceptors</em>' containment reference.
-	 * @see #getInterceptors()
-	 * @generated
-	 */
-	void setInterceptors(InterceptorsType value);
-
-	/**
-	 * Returns the value of the '<em><b>Relationships</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Relationships</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Relationships</em>' containment reference.
-	 * @see #setRelationships(Relationships)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEJBJar_Relationships()
-	 * @generated
-	 */
-	Relationships getRelationships();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.EJBJar#getRelationships <em>Relationships</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Relationships</em>' containment reference.
-	 * @see #getRelationships()
-	 * @generated
-	 */
-	void setRelationships(Relationships value);
-
-	/**
-	 * Returns the value of the '<em><b>Assembly Descriptor</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    Providing an assembly-descriptor in the deployment
-	 * 	    descriptor is optional for the ejb-jar file
-	 * 	    producer.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Assembly Descriptor</em>' containment reference.
-	 * @see #setAssemblyDescriptor(AssemblyDescriptor)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEJBJar_AssemblyDescriptor()
-	 * @generated
-	 */
-	AssemblyDescriptor getAssemblyDescriptor();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.EJBJar#getAssemblyDescriptor <em>Assembly Descriptor</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Assembly Descriptor</em>' containment reference.
-	 * @see #getAssemblyDescriptor()
-	 * @generated
-	 */
-	void setAssemblyDescriptor(AssemblyDescriptor value);
-
-	/**
-	 * Returns the value of the '<em><b>Ejb Client Jar</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 	    
-	 * 
-	 * 	      The optional ejb-client-jar element specifies a JAR
-	 * 	      file that contains the class files necessary for a
-	 * 	      client program to access the
-	 * 	      enterprise beans in the ejb-jar file.
-	 * 
-	 * 	      Example:
-	 * 
-	 * 		  &lt;ejb-client-jar&gt;employee_service_client.jar
-	 * 		  &lt;/ejb-client-jar&gt;
-	 * 
-	 * 	      
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Ejb Client Jar</em>' attribute.
-	 * @see #setEjbClientJar(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEJBJar_EjbClientJar()
-	 * @generated
-	 */
-	String getEjbClientJar();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.EJBJar#getEjbClientJar <em>Ejb Client Jar</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Ejb Client Jar</em>' attribute.
-	 * @see #getEjbClientJar()
-	 * @generated
-	 */
-	void setEjbClientJar(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEJBJar_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.EJBJar#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Metadata Complete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	  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.
-	 * 
-	 * 	
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Metadata Complete</em>' attribute.
-	 * @see #isSetMetadataComplete()
-	 * @see #unsetMetadataComplete()
-	 * @see #setMetadataComplete(boolean)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEJBJar_MetadataComplete()
-	 * @generated
-	 */
-	boolean isMetadataComplete();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.EJBJar#isMetadataComplete <em>Metadata Complete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Metadata Complete</em>' attribute.
-	 * @see #isSetMetadataComplete()
-	 * @see #unsetMetadataComplete()
-	 * @see #isMetadataComplete()
-	 * @generated
-	 */
-	void setMetadataComplete(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.javaee.ejb.EJBJar#isMetadataComplete <em>Metadata Complete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetMetadataComplete()
-	 * @see #isMetadataComplete()
-	 * @see #setMetadataComplete(boolean)
-	 * @generated
-	 */
-	void unsetMetadataComplete();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.ejb.EJBJar#isMetadataComplete <em>Metadata Complete</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Metadata Complete</em>' attribute is set.
-	 * @see #unsetMetadataComplete()
-	 * @see #isMetadataComplete()
-	 * @see #setMetadataComplete(boolean)
-	 * @generated
-	 */
-	boolean isSetMetadataComplete();
-
-	/**
-	 * Returns the value of the '<em><b>Version</b></em>' attribute.
-	 * The default value is <code>"3.0"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	  The version specifies the version of the
-	 * 	  EJB specification that the instance document must
-	 * 	  comply with. This information enables deployment tools
-	 * 	  to validate a particular EJB Deployment
-	 * 	  Descriptor with respect to a specific version of the EJB
-	 * 	  schema.
-	 * 
-	 * 	
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Version</em>' attribute.
-	 * @see #isSetVersion()
-	 * @see #unsetVersion()
-	 * @see #setVersion(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEJBJar_Version()
-	 * @generated
-	 */
-	String getVersion();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.EJBJar#getVersion <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Version</em>' attribute.
-	 * @see #isSetVersion()
-	 * @see #unsetVersion()
-	 * @see #getVersion()
-	 * @generated
-	 */
-	void setVersion(String value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.javaee.ejb.EJBJar#getVersion <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetVersion()
-	 * @see #getVersion()
-	 * @see #setVersion(String)
-	 * @generated
-	 */
-	void unsetVersion();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.ejb.EJBJar#getVersion <em>Version</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Version</em>' attribute is set.
-	 * @see #unsetVersion()
-	 * @see #getVersion()
-	 * @see #setVersion(String)
-	 * @generated
-	 */
-	boolean isSetVersion();
-
-} // EJBJar
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/EJBJarDeploymentDescriptor.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/EJBJarDeploymentDescriptor.java
deleted file mode 100644
index fc3b76916..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/EJBJarDeploymentDescriptor.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>EJB Jar Deployment Descriptor</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EJBJarDeploymentDescriptor#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EJBJarDeploymentDescriptor#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EJBJarDeploymentDescriptor#getXSISchemaLocation <em>XSI Schema Location</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EJBJarDeploymentDescriptor#getEjbJar <em>Ejb Jar</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEJBJarDeploymentDescriptor()
- * @extends JavaEEObject
- * @generated
- */
-public interface EJBJarDeploymentDescriptor extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Mixed</em>' attribute list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEJBJarDeploymentDescriptor_Mixed()
-	 * @generated
-	 */
-	FeatureMap getMixed();
-
-	/**
-	 * Returns the value of the '<em><b>XMLNS Prefix Map</b></em>' map.
-	 * The key is of type {@link java.lang.String},
-	 * and the value is of type {@link java.lang.String},
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>XMLNS Prefix Map</em>' map isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>XMLNS Prefix Map</em>' map.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEJBJarDeploymentDescriptor_XMLNSPrefixMap()
-	 * @generated
-	 */
-	Map getXMLNSPrefixMap();
-
-	/**
-	 * Returns the value of the '<em><b>XSI Schema Location</b></em>' map.
-	 * The key is of type {@link java.lang.String},
-	 * and the value is of type {@link java.lang.String},
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>XSI Schema Location</em>' map isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>XSI Schema Location</em>' map.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEJBJarDeploymentDescriptor_XSISchemaLocation()
-	 * @generated
-	 */
-	Map getXSISchemaLocation();
-
-	/**
-	 * Returns the value of the '<em><b>Ejb Jar</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	This is the root of the ejb-jar deployment descriptor.
-	 * 
-	 *       
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Ejb Jar</em>' containment reference.
-	 * @see #setEjbJar(EJBJar)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEJBJarDeploymentDescriptor_EjbJar()
-	 * @generated
-	 */
-	EJBJar getEjbJar();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.EJBJarDeploymentDescriptor#getEjbJar <em>Ejb Jar</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Ejb Jar</em>' containment reference.
-	 * @see #getEjbJar()
-	 * @generated
-	 */
-	void setEjbJar(EJBJar value);
-
-} // EJBJarDeploymentDescriptor
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/EJBRelation.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/EJBRelation.java
deleted file mode 100644
index 9d3c2e8a4..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/EJBRelation.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb;
-
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>EJB Relation</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The ejb-relationType describes a relationship between two
- * 	entity beans with container-managed persistence.  It is used
- * 	by ejb-relation elements. It contains a description; an
- * 	optional ejb-relation-name element; and exactly two
- * 	relationship role declarations, defined by the
- * 	ejb-relationship-role elements. The name of the
- * 	relationship, if specified, is unique within the ejb-jar
- * 	file.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EJBRelation#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EJBRelation#getEjbRelationName <em>Ejb Relation Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EJBRelation#getEjbRelationshipRoles <em>Ejb Relationship Roles</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EJBRelation#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEJBRelation()
- * @extends JavaEEObject
- * @generated
- */
-public interface EJBRelation extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEJBRelation_Descriptions()
-	 * @generated
-	 */
-	List getDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>Ejb Relation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The ejb-relation-name element provides a unique name
-	 * 	    within the ejb-jar file for a relationship.
-	 * 
-	 * 	      
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Ejb Relation Name</em>' attribute.
-	 * @see #setEjbRelationName(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEJBRelation_EjbRelationName()
-	 * @generated
-	 */
-	String getEjbRelationName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.EJBRelation#getEjbRelationName <em>Ejb Relation Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Ejb Relation Name</em>' attribute.
-	 * @see #getEjbRelationName()
-	 * @generated
-	 */
-	void setEjbRelationName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Ejb Relationship Roles</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.ejb.EJBRelationshipRole}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ejb Relationship Roles</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ejb Relationship Roles</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEJBRelation_EjbRelationshipRoles()
-	 * @generated
-	 */
-	List getEjbRelationshipRoles();
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEJBRelation_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.EJBRelation#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // EJBRelation
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/EJBRelationshipRole.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/EJBRelationshipRole.java
deleted file mode 100644
index 0298ec214..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/EJBRelationshipRole.java
+++ /dev/null
@@ -1,298 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb;
-
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.EmptyType;
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>EJB Relationship Role</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 	
- * 
- * 	  The ejb-relationship-roleType describes a role within a
- * 	  relationship. There are two roles in each relationship.
- * 
- * 	  The ejb-relationship-roleType contains an optional
- * 	  description; an optional name for the relationship role; a
- * 	  specification of the multiplicity of the role; an optional
- * 	  specification of cascade-delete functionality for the role;
- * 	  the role source; and a declaration of the cmr-field, if any,
- * 	  by means of which the other side of the relationship is
- * 	  accessed from the perspective of the role source.
- * 
- * 	  The multiplicity and role-source element are mandatory.
- * 
- * 	  The relationship-role-source element designates an entity
- * 	  bean by means of an ejb-name element. For bidirectional
- * 	  relationships, both roles of a relationship must declare a
- * 	  relationship-role-source element that specifies a cmr-field
- * 	  in terms of which the relationship is accessed. The lack of
- * 	  a cmr-field element in an ejb-relationship-role specifies
- * 	  that the relationship is unidirectional in navigability and
- * 	  the entity bean that participates in the relationship is
- * 	  "not aware" of the relationship.
- * 
- * 	  Example:
- * 
- * 	  &lt;ejb-relation&gt;
- * 	      &lt;ejb-relation-name&gt;Product-LineItem&lt;/ejb-relation-name&gt;
- * 	      &lt;ejb-relationship-role&gt;
- * 		  &lt;ejb-relationship-role-name&gt;product-has-lineitems
- * 		  &lt;/ejb-relationship-role-name&gt;
- * 		  &lt;multiplicity&gt;One&lt;/multiplicity&gt;
- * 		  &lt;relationship-role-source&gt;
- * 		  &lt;ejb-name&gt;ProductEJB&lt;/ejb-name&gt;
- * 		  &lt;/relationship-role-source&gt;
- * 	       &lt;/ejb-relationship-role&gt;
- * 	  &lt;/ejb-relation&gt;
- * 
- * 	  
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getEjbRelationshipRoleName <em>Ejb Relationship Role Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getMultiplicity <em>Multiplicity</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getCascadeDelete <em>Cascade Delete</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getRelationshipRoleSource <em>Relationship Role Source</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getCmrField <em>Cmr Field</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEJBRelationshipRole()
- * @extends JavaEEObject
- * @generated
- */
-public interface EJBRelationshipRole extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEJBRelationshipRole_Descriptions()
-	 * @generated
-	 */
-	List getDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>Ejb Relationship Role Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The ejb-relationship-role-name element defines a
-	 * 	    name for a role that is unique within an
-	 * 	    ejb-relation. Different relationships can use the
-	 * 	    same name for a role.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Ejb Relationship Role Name</em>' attribute.
-	 * @see #setEjbRelationshipRoleName(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEJBRelationshipRole_EjbRelationshipRoleName()
-	 * @generated
-	 */
-	String getEjbRelationshipRoleName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getEjbRelationshipRoleName <em>Ejb Relationship Role Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Ejb Relationship Role Name</em>' attribute.
-	 * @see #getEjbRelationshipRoleName()
-	 * @generated
-	 */
-	void setEjbRelationshipRoleName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Multiplicity</b></em>' attribute.
-	 * The default value is <code>"One"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.ejb.MultiplicityType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Multiplicity</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Multiplicity</em>' attribute.
-	 * @see org.eclipse.jst.javaee.ejb.MultiplicityType
-	 * @see #isSetMultiplicity()
-	 * @see #unsetMultiplicity()
-	 * @see #setMultiplicity(MultiplicityType)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEJBRelationshipRole_Multiplicity()
-	 * @generated
-	 */
-	MultiplicityType getMultiplicity();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getMultiplicity <em>Multiplicity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Multiplicity</em>' attribute.
-	 * @see org.eclipse.jst.javaee.ejb.MultiplicityType
-	 * @see #isSetMultiplicity()
-	 * @see #unsetMultiplicity()
-	 * @see #getMultiplicity()
-	 * @generated
-	 */
-	void setMultiplicity(MultiplicityType value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getMultiplicity <em>Multiplicity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetMultiplicity()
-	 * @see #getMultiplicity()
-	 * @see #setMultiplicity(MultiplicityType)
-	 * @generated
-	 */
-	void unsetMultiplicity();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getMultiplicity <em>Multiplicity</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Multiplicity</em>' attribute is set.
-	 * @see #unsetMultiplicity()
-	 * @see #getMultiplicity()
-	 * @see #setMultiplicity(MultiplicityType)
-	 * @generated
-	 */
-	boolean isSetMultiplicity();
-
-	/**
-	 * Returns the value of the '<em><b>Cascade Delete</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The cascade-delete element specifies that, within a
-	 * 	    particular relationship, the lifetime of one or more
-	 * 	    entity beans is dependent upon the lifetime of
-	 * 	    another entity bean. The cascade-delete element can
-	 * 	    only be specified for an ejb-relationship-role
-	 * 	    element contained in an ejb-relation element in
-	 * 	    which the other ejb-relationship-role
-	 * 	    element specifies a multiplicity of One.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Cascade Delete</em>' containment reference.
-	 * @see #setCascadeDelete(EmptyType)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEJBRelationshipRole_CascadeDelete()
-	 * @generated
-	 */
-	EmptyType getCascadeDelete();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getCascadeDelete <em>Cascade Delete</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cascade Delete</em>' containment reference.
-	 * @see #getCascadeDelete()
-	 * @generated
-	 */
-	void setCascadeDelete(EmptyType value);
-
-	/**
-	 * Returns the value of the '<em><b>Relationship Role Source</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Relationship Role Source</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Relationship Role Source</em>' containment reference.
-	 * @see #setRelationshipRoleSource(RelationshipRoleSourceType)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEJBRelationshipRole_RelationshipRoleSource()
-	 * @generated
-	 */
-	RelationshipRoleSourceType getRelationshipRoleSource();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getRelationshipRoleSource <em>Relationship Role Source</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Relationship Role Source</em>' containment reference.
-	 * @see #getRelationshipRoleSource()
-	 * @generated
-	 */
-	void setRelationshipRoleSource(RelationshipRoleSourceType value);
-
-	/**
-	 * Returns the value of the '<em><b>Cmr Field</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cmr Field</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Cmr Field</em>' containment reference.
-	 * @see #setCmrField(CMRField)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEJBRelationshipRole_CmrField()
-	 * @generated
-	 */
-	CMRField getCmrField();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getCmrField <em>Cmr Field</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cmr Field</em>' containment reference.
-	 * @see #getCmrField()
-	 * @generated
-	 */
-	void setCmrField(CMRField value);
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEJBRelationshipRole_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // EJBRelationshipRole
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/EjbFactory.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/EjbFactory.java
deleted file mode 100644
index 40a2224c2..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/EjbFactory.java
+++ /dev/null
@@ -1,330 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb;
-
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage
- * @generated
- */
-public interface EjbFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	EjbFactory eINSTANCE = org.eclipse.jst.javaee.ejb.internal.impl.EjbFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Activation Config</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Activation Config</em>'.
-	 * @generated
-	 */
-	ActivationConfig createActivationConfig();
-
-	/**
-	 * Returns a new object of class '<em>Activation Config Property</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Activation Config Property</em>'.
-	 * @generated
-	 */
-	ActivationConfigProperty createActivationConfigProperty();
-
-	/**
-	 * Returns a new object of class '<em>Application Exception</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Application Exception</em>'.
-	 * @generated
-	 */
-	ApplicationException createApplicationException();
-
-	/**
-	 * Returns a new object of class '<em>Around Invoke Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Around Invoke Type</em>'.
-	 * @generated
-	 */
-	AroundInvokeType createAroundInvokeType();
-
-	/**
-	 * Returns a new object of class '<em>Assembly Descriptor</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Assembly Descriptor</em>'.
-	 * @generated
-	 */
-	AssemblyDescriptor createAssemblyDescriptor();
-
-	/**
-	 * Returns a new object of class '<em>CMP Field</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>CMP Field</em>'.
-	 * @generated
-	 */
-	CMPField createCMPField();
-
-	/**
-	 * Returns a new object of class '<em>CMR Field</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>CMR Field</em>'.
-	 * @generated
-	 */
-	CMRField createCMRField();
-
-	/**
-	 * Returns a new object of class '<em>Container Transaction Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Container Transaction Type</em>'.
-	 * @generated
-	 */
-	ContainerTransactionType createContainerTransactionType();
-
-	/**
-	 * Returns a new object of class '<em>EJB Jar</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>EJB Jar</em>'.
-	 * @generated
-	 */
-	EJBJar createEJBJar();
-
-	/**
-	 * Returns a new object of class '<em>EJB Jar Deployment Descriptor</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>EJB Jar Deployment Descriptor</em>'.
-	 * @generated
-	 */
-	EJBJarDeploymentDescriptor createEJBJarDeploymentDescriptor();
-
-	/**
-	 * Returns a new object of class '<em>EJB Relation</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>EJB Relation</em>'.
-	 * @generated
-	 */
-	EJBRelation createEJBRelation();
-
-	/**
-	 * Returns a new object of class '<em>EJB Relationship Role</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>EJB Relationship Role</em>'.
-	 * @generated
-	 */
-	EJBRelationshipRole createEJBRelationshipRole();
-
-	/**
-	 * Returns a new object of class '<em>Enterprise Beans</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Enterprise Beans</em>'.
-	 * @generated
-	 */
-	EnterpriseBeans createEnterpriseBeans();
-
-	/**
-	 * Returns a new object of class '<em>Entity Bean</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Entity Bean</em>'.
-	 * @generated
-	 */
-	EntityBean createEntityBean();
-
-	/**
-	 * Returns a new object of class '<em>Exclude List</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Exclude List</em>'.
-	 * @generated
-	 */
-	ExcludeList createExcludeList();
-
-	/**
-	 * Returns a new object of class '<em>Init Method Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Init Method Type</em>'.
-	 * @generated
-	 */
-	InitMethodType createInitMethodType();
-
-	/**
-	 * Returns a new object of class '<em>Interceptor Binding Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Interceptor Binding Type</em>'.
-	 * @generated
-	 */
-	InterceptorBindingType createInterceptorBindingType();
-
-	/**
-	 * Returns a new object of class '<em>Interceptor Order Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Interceptor Order Type</em>'.
-	 * @generated
-	 */
-	InterceptorOrderType createInterceptorOrderType();
-
-	/**
-	 * Returns a new object of class '<em>Interceptors Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Interceptors Type</em>'.
-	 * @generated
-	 */
-	InterceptorsType createInterceptorsType();
-
-	/**
-	 * Returns a new object of class '<em>Interceptor Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Interceptor Type</em>'.
-	 * @generated
-	 */
-	InterceptorType createInterceptorType();
-
-	/**
-	 * Returns a new object of class '<em>Message Driven Bean</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Message Driven Bean</em>'.
-	 * @generated
-	 */
-	MessageDrivenBean createMessageDrivenBean();
-
-	/**
-	 * Returns a new object of class '<em>Method Params</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Method Params</em>'.
-	 * @generated
-	 */
-	MethodParams createMethodParams();
-
-	/**
-	 * Returns a new object of class '<em>Method Permission</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Method Permission</em>'.
-	 * @generated
-	 */
-	MethodPermission createMethodPermission();
-
-	/**
-	 * Returns a new object of class '<em>Method Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Method Type</em>'.
-	 * @generated
-	 */
-	MethodType createMethodType();
-
-	/**
-	 * Returns a new object of class '<em>Named Method Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Named Method Type</em>'.
-	 * @generated
-	 */
-	NamedMethodType createNamedMethodType();
-
-	/**
-	 * Returns a new object of class '<em>Query</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Query</em>'.
-	 * @generated
-	 */
-	Query createQuery();
-
-	/**
-	 * Returns a new object of class '<em>Query Method</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Query Method</em>'.
-	 * @generated
-	 */
-	QueryMethod createQueryMethod();
-
-	/**
-	 * Returns a new object of class '<em>Relationship Role Source Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Relationship Role Source Type</em>'.
-	 * @generated
-	 */
-	RelationshipRoleSourceType createRelationshipRoleSourceType();
-
-	/**
-	 * Returns a new object of class '<em>Relationships</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Relationships</em>'.
-	 * @generated
-	 */
-	Relationships createRelationships();
-
-	/**
-	 * Returns a new object of class '<em>Remove Method Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Remove Method Type</em>'.
-	 * @generated
-	 */
-	RemoveMethodType createRemoveMethodType();
-
-	/**
-	 * Returns a new object of class '<em>Security Identity Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Security Identity Type</em>'.
-	 * @generated
-	 */
-	SecurityIdentityType createSecurityIdentityType();
-
-	/**
-	 * Returns a new object of class '<em>Session Bean</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Session Bean</em>'.
-	 * @generated
-	 */
-	SessionBean createSessionBean();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	EjbPackage getEjbPackage();
-
-} //EjbFactory
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/EnterpriseBeans.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/EnterpriseBeans.java
deleted file mode 100644
index faddb97f4..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/EnterpriseBeans.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Enterprise Beans</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The enterprise-beansType declares one or more enterprise
- * 	beans. Each bean can be a session, entity or message-driven
- * 	bean.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EnterpriseBeans#getGroup <em>Group</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EnterpriseBeans#getSessionBeans <em>Session Beans</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EnterpriseBeans#getEntityBeans <em>Entity Beans</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EnterpriseBeans#getMessageDrivenBeans <em>Message Driven Beans</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EnterpriseBeans#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEnterpriseBeans()
- * @extends JavaEEObject
- * @generated
- */
-public interface EnterpriseBeans extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Group</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Group</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Group</em>' attribute list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEnterpriseBeans_Group()
-	 * @generated
-	 */
-	FeatureMap getGroup();
-
-	/**
-	 * Returns the value of the '<em><b>Session Beans</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.ejb.SessionBean}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Session Beans</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Session Beans</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEnterpriseBeans_SessionBeans()
-	 * @generated
-	 */
-	List getSessionBeans();
-
-	/**
-	 * Returns the value of the '<em><b>Entity Beans</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.ejb.EntityBean}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Entity Beans</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Entity Beans</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEnterpriseBeans_EntityBeans()
-	 * @generated
-	 */
-	List getEntityBeans();
-
-	/**
-	 * Returns the value of the '<em><b>Message Driven Beans</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.ejb.MessageDrivenBean}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Message Driven Beans</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Message Driven Beans</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEnterpriseBeans_MessageDrivenBeans()
-	 * @generated
-	 */
-	List getMessageDrivenBeans();
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEnterpriseBeans_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.EnterpriseBeans#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // EnterpriseBeans
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/EntityBean.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/EntityBean.java
deleted file mode 100644
index 4fda52997..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/EntityBean.java
+++ /dev/null
@@ -1,921 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb;
-
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Entity Bean</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The entity-beanType declares an entity bean. The declaration
- * 	consists of:
- * 
- * 	    - an optional description
- * 	    - an optional display name
- * 	    - an optional icon element that contains a small and a large
- * 	      icon file name
- * 	    - a unique name assigned to the enterprise bean
- * 	      in the deployment descriptor
- *             - an optional mapped-name element that can be used to provide
- *               vendor-specific deployment information such as the physical
- *               jndi-name of the entity bean's remote home interface. This
- *               element is not required to be supported by all implementations.
- *               Any use of this element is non-portable.
- * 	    - the names of the entity bean's remote home
- * 	      and remote interfaces, if any
- * 	    - the names of the entity bean's local home and local
- * 	      interfaces, if any
- * 	    - the entity bean's implementation class
- * 	    - the optional entity bean's persistence management type. If
- *               this element is not specified it is defaulted to Container.
- * 	    - the entity bean's primary key class name
- * 	    - an indication of the entity bean's reentrancy
- * 	    - an optional specification of the
- * 	      entity bean's cmp-version
- * 	    - an optional specification of the entity bean's
- * 	      abstract schema name
- * 	    - an optional list of container-managed fields
- * 	    - an optional specification of the primary key
- * 	      field
- * 	    - an optional declaration of the bean's environment
- * 	      entries
- * 	    - an optional declaration of the bean's EJB
- * 	      references
- * 	    - an optional declaration of the bean's local
- * 	      EJB references
- * 	    - an optional declaration of the bean's web
- * 	      service references
- * 	    - an optional declaration of the security role
- * 	      references
- * 	    - an optional declaration of the security identity
- * 	      to be used for the execution of the bean's methods
- * 	    - an optional declaration of the bean's
- * 	      resource manager connection factory references
- * 	    - an optional declaration of the bean's
- * 	      resource environment references
- * 	    - an optional declaration of the bean's message
- * 	      destination references
- * 	    - an optional set of query declarations
- * 	      for finder and select methods for an entity
- * 	      bean with cmp-version 2.x.
- * 
- * 	The optional abstract-schema-name element must be specified
- * 	for an entity bean with container-managed persistence and
- * 	cmp-version 2.x.
- * 
- * 	The optional primkey-field may be present in the descriptor
- * 	if the entity's persistence-type is Container.
- * 
- * 	The optional cmp-version element may be present in the
- * 	descriptor if the entity's persistence-type is Container. If
- * 	the persistence-type is Container and the cmp-version
- * 	element is not specified, its value defaults to 2.x.
- * 
- * 	The optional home and remote elements must be specified if
- * 	the entity bean cmp-version is 1.x.
- * 
- * 	The optional home and remote elements must be specified if
- * 	the entity bean has a remote home and remote interface.
- * 
- * 	The optional local-home and local elements must be specified
- * 	if the entity bean has a local home and local interface.
- * 
- * 	Either both the local-home and the local elements or both
- * 	the home and the remote elements must be specified.
- * 
- * 	The optional query elements must be present if the
- * 	persistence-type is Container and the cmp-version is 2.x and
- * 	query methods other than findByPrimaryKey have been defined
- * 	for the entity bean.
- * 
- * 	The other elements that are optional are "optional" in the
- * 	sense that they are omitted if the lists represented by them
- * 	are empty.
- * 
- * 	At least one cmp-field element must be present in the
- * 	descriptor if the entity's persistence-type is Container and
- * 	the cmp-version is 1.x, and none must not be present if the
- * 	entity's persistence-type is Bean.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EntityBean#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EntityBean#getDisplayNames <em>Display Names</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EntityBean#getIcons <em>Icons</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EntityBean#getEjbName <em>Ejb Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EntityBean#getMappedName <em>Mapped Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EntityBean#getHome <em>Home</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EntityBean#getRemote <em>Remote</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EntityBean#getLocalHome <em>Local Home</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EntityBean#getLocal <em>Local</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EntityBean#getEjbClass <em>Ejb Class</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EntityBean#getPersistenceType <em>Persistence Type</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EntityBean#getPrimKeyClass <em>Prim Key Class</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EntityBean#isReentrant <em>Reentrant</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EntityBean#getCmpVersion <em>Cmp Version</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EntityBean#getAbstractSchemaName <em>Abstract Schema Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EntityBean#getCmpFields <em>Cmp Fields</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EntityBean#getPrimkeyField <em>Primkey Field</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EntityBean#getEnvEntries <em>Env Entries</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EntityBean#getEjbRefs <em>Ejb Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EntityBean#getEjbLocalRefs <em>Ejb Local Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EntityBean#getServiceRefs <em>Service Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EntityBean#getResourceRefs <em>Resource Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EntityBean#getResourceEnvRefs <em>Resource Env Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EntityBean#getMessageDestinationRefs <em>Message Destination Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EntityBean#getPersistenceContextRefs <em>Persistence Context Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EntityBean#getPersistenceUnitRefs <em>Persistence Unit Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EntityBean#getPostConstructs <em>Post Constructs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EntityBean#getPreDestroys <em>Pre Destroys</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EntityBean#getSecurityRoleRefs <em>Security Role Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EntityBean#getSecurityIdentity <em>Security Identity</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EntityBean#getQueries <em>Queries</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.EntityBean#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean()
- * @extends JavaEEObject
- * @generated
- */
-public interface EntityBean extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_Descriptions()
-	 * @generated
-	 */
-	List getDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>Display Names</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.DisplayName}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Names</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Names</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_DisplayNames()
-	 * @generated
-	 */
-	List getDisplayNames();
-
-	/**
-	 * Returns the value of the '<em><b>Icons</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Icon}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Icons</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Icons</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_Icons()
-	 * @generated
-	 */
-	List getIcons();
-
-	/**
-	 * Returns the value of the '<em><b>Ejb Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ejb Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ejb Name</em>' attribute.
-	 * @see #setEjbName(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_EjbName()
-	 * @generated
-	 */
-	String getEjbName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.EntityBean#getEjbName <em>Ejb Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Ejb Name</em>' attribute.
-	 * @see #getEjbName()
-	 * @generated
-	 */
-	void setEjbName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Mapped Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Mapped Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Mapped Name</em>' attribute.
-	 * @see #setMappedName(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_MappedName()
-	 * @generated
-	 */
-	String getMappedName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.EntityBean#getMappedName <em>Mapped Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Mapped Name</em>' attribute.
-	 * @see #getMappedName()
-	 * @generated
-	 */
-	void setMappedName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Home</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Home</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Home</em>' attribute.
-	 * @see #setHome(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_Home()
-	 * @generated
-	 */
-	String getHome();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.EntityBean#getHome <em>Home</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Home</em>' attribute.
-	 * @see #getHome()
-	 * @generated
-	 */
-	void setHome(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Remote</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Remote</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Remote</em>' attribute.
-	 * @see #setRemote(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_Remote()
-	 * @generated
-	 */
-	String getRemote();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.EntityBean#getRemote <em>Remote</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Remote</em>' attribute.
-	 * @see #getRemote()
-	 * @generated
-	 */
-	void setRemote(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Local Home</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Local Home</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Local Home</em>' attribute.
-	 * @see #setLocalHome(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_LocalHome()
-	 * @generated
-	 */
-	String getLocalHome();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.EntityBean#getLocalHome <em>Local Home</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Local Home</em>' attribute.
-	 * @see #getLocalHome()
-	 * @generated
-	 */
-	void setLocalHome(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Local</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Local</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Local</em>' attribute.
-	 * @see #setLocal(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_Local()
-	 * @generated
-	 */
-	String getLocal();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.EntityBean#getLocal <em>Local</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Local</em>' attribute.
-	 * @see #getLocal()
-	 * @generated
-	 */
-	void setLocal(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Ejb Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ejb Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ejb Class</em>' attribute.
-	 * @see #setEjbClass(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_EjbClass()
-	 * @generated
-	 */
-	String getEjbClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.EntityBean#getEjbClass <em>Ejb Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Ejb Class</em>' attribute.
-	 * @see #getEjbClass()
-	 * @generated
-	 */
-	void setEjbClass(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Persistence Type</b></em>' attribute.
-	 * The default value is <code>"Bean"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.ejb.PersistenceType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Persistence Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Persistence Type</em>' attribute.
-	 * @see org.eclipse.jst.javaee.ejb.PersistenceType
-	 * @see #isSetPersistenceType()
-	 * @see #unsetPersistenceType()
-	 * @see #setPersistenceType(PersistenceType)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_PersistenceType()
-	 * @generated
-	 */
-	PersistenceType getPersistenceType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.EntityBean#getPersistenceType <em>Persistence Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Persistence Type</em>' attribute.
-	 * @see org.eclipse.jst.javaee.ejb.PersistenceType
-	 * @see #isSetPersistenceType()
-	 * @see #unsetPersistenceType()
-	 * @see #getPersistenceType()
-	 * @generated
-	 */
-	void setPersistenceType(PersistenceType value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.javaee.ejb.EntityBean#getPersistenceType <em>Persistence Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetPersistenceType()
-	 * @see #getPersistenceType()
-	 * @see #setPersistenceType(PersistenceType)
-	 * @generated
-	 */
-	void unsetPersistenceType();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.ejb.EntityBean#getPersistenceType <em>Persistence Type</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Persistence Type</em>' attribute is set.
-	 * @see #unsetPersistenceType()
-	 * @see #getPersistenceType()
-	 * @see #setPersistenceType(PersistenceType)
-	 * @generated
-	 */
-	boolean isSetPersistenceType();
-
-	/**
-	 * Returns the value of the '<em><b>Prim Key Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The prim-key-class element contains the
-	 * 	    fully-qualified name of an
-	 * 	    entity bean's primary key class.
-	 * 
-	 * 	    If the definition of the primary key class is
-	 * 	    deferred to deployment time, the prim-key-class
-	 * 	    element should specify java.lang.Object.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Prim Key Class</em>' attribute.
-	 * @see #setPrimKeyClass(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_PrimKeyClass()
-	 * @generated
-	 */
-	String getPrimKeyClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.EntityBean#getPrimKeyClass <em>Prim Key Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Prim Key Class</em>' attribute.
-	 * @see #getPrimKeyClass()
-	 * @generated
-	 */
-	void setPrimKeyClass(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Reentrant</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The reentrant element specifies whether an entity
-	 * 	    bean is reentrant or not.
-	 * 
-	 * 	    The reentrant element must be one of the two
-	 * 	    following: true or false
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Reentrant</em>' attribute.
-	 * @see #isSetReentrant()
-	 * @see #unsetReentrant()
-	 * @see #setReentrant(boolean)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_Reentrant()
-	 * @generated
-	 */
-	boolean isReentrant();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.EntityBean#isReentrant <em>Reentrant</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Reentrant</em>' attribute.
-	 * @see #isSetReentrant()
-	 * @see #unsetReentrant()
-	 * @see #isReentrant()
-	 * @generated
-	 */
-	void setReentrant(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.javaee.ejb.EntityBean#isReentrant <em>Reentrant</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetReentrant()
-	 * @see #isReentrant()
-	 * @see #setReentrant(boolean)
-	 * @generated
-	 */
-	void unsetReentrant();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.ejb.EntityBean#isReentrant <em>Reentrant</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Reentrant</em>' attribute is set.
-	 * @see #unsetReentrant()
-	 * @see #isReentrant()
-	 * @see #setReentrant(boolean)
-	 * @generated
-	 */
-	boolean isSetReentrant();
-
-	/**
-	 * Returns the value of the '<em><b>Cmp Version</b></em>' attribute.
-	 * The default value is <code>"1.x"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.ejb.CmpVersionType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cmp Version</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Cmp Version</em>' attribute.
-	 * @see org.eclipse.jst.javaee.ejb.CmpVersionType
-	 * @see #isSetCmpVersion()
-	 * @see #unsetCmpVersion()
-	 * @see #setCmpVersion(CmpVersionType)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_CmpVersion()
-	 * @generated
-	 */
-	CmpVersionType getCmpVersion();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.EntityBean#getCmpVersion <em>Cmp Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cmp Version</em>' attribute.
-	 * @see org.eclipse.jst.javaee.ejb.CmpVersionType
-	 * @see #isSetCmpVersion()
-	 * @see #unsetCmpVersion()
-	 * @see #getCmpVersion()
-	 * @generated
-	 */
-	void setCmpVersion(CmpVersionType value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.javaee.ejb.EntityBean#getCmpVersion <em>Cmp Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetCmpVersion()
-	 * @see #getCmpVersion()
-	 * @see #setCmpVersion(CmpVersionType)
-	 * @generated
-	 */
-	void unsetCmpVersion();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.ejb.EntityBean#getCmpVersion <em>Cmp Version</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Cmp Version</em>' attribute is set.
-	 * @see #unsetCmpVersion()
-	 * @see #getCmpVersion()
-	 * @see #setCmpVersion(CmpVersionType)
-	 * @generated
-	 */
-	boolean isSetCmpVersion();
-
-	/**
-	 * Returns the value of the '<em><b>Abstract Schema Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The abstract-schema-name element specifies the name
-	 * 	    of the abstract schema type of an entity bean with
-	 * 	    cmp-version 2.x. It is used in EJB QL queries.
-	 * 
-	 * 	    For example, the abstract-schema-name for an entity
-	 * 	    bean whose local interface is
-	 * 	    com.acme.commerce.Order might be Order.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Abstract Schema Name</em>' attribute.
-	 * @see #setAbstractSchemaName(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_AbstractSchemaName()
-	 * @generated
-	 */
-	String getAbstractSchemaName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.EntityBean#getAbstractSchemaName <em>Abstract Schema Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Abstract Schema Name</em>' attribute.
-	 * @see #getAbstractSchemaName()
-	 * @generated
-	 */
-	void setAbstractSchemaName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Cmp Fields</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.ejb.CMPField}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cmp Fields</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Cmp Fields</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_CmpFields()
-	 * @generated
-	 */
-	List getCmpFields();
-
-	/**
-	 * Returns the value of the '<em><b>Primkey Field</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The primkey-field element is used to specify the
-	 * 	    name of the primary key field for an entity with
-	 * 	    container-managed persistence.
-	 * 
-	 * 	    The primkey-field must be one of the fields declared
-	 * 	    in the cmp-field element, and the type of the field
-	 * 	    must be the same as the primary key type.
-	 * 
-	 * 	    The primkey-field element is not used if the primary
-	 * 	    key maps to multiple container-managed fields
-	 * 	    (i.e. the key is a compound key). In this case, the
-	 * 	    fields of the primary key class must be public, and
-	 * 	    their names must correspond to the field names of
-	 * 	    the entity bean class that comprise the key.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Primkey Field</em>' attribute.
-	 * @see #setPrimkeyField(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_PrimkeyField()
-	 * @generated
-	 */
-	String getPrimkeyField();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.EntityBean#getPrimkeyField <em>Primkey Field</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Primkey Field</em>' attribute.
-	 * @see #getPrimkeyField()
-	 * @generated
-	 */
-	void setPrimkeyField(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Env Entries</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.EnvEntry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Env Entries</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Env Entries</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_EnvEntries()
-	 * @generated
-	 */
-	List getEnvEntries();
-
-	/**
-	 * Returns the value of the '<em><b>Ejb Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.EjbRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ejb Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ejb Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_EjbRefs()
-	 * @generated
-	 */
-	List getEjbRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Ejb Local Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.EjbLocalRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ejb Local Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ejb Local Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_EjbLocalRefs()
-	 * @generated
-	 */
-	List getEjbLocalRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Service Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.ServiceRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Service Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Service Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_ServiceRefs()
-	 * @generated
-	 */
-	List getServiceRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Resource Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.ResourceRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Resource Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Resource Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_ResourceRefs()
-	 * @generated
-	 */
-	List getResourceRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Resource Env Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.ResourceEnvRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Resource Env Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Resource Env Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_ResourceEnvRefs()
-	 * @generated
-	 */
-	List getResourceEnvRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Message Destination Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.MessageDestinationRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Message Destination Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Message Destination Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_MessageDestinationRefs()
-	 * @generated
-	 */
-	List getMessageDestinationRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Persistence Context Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.PersistenceContextRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Persistence Context Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Persistence Context Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_PersistenceContextRefs()
-	 * @generated
-	 */
-	List getPersistenceContextRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Persistence Unit Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.PersistenceUnitRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Persistence Unit Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Persistence Unit Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_PersistenceUnitRefs()
-	 * @generated
-	 */
-	List getPersistenceUnitRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Post Constructs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.LifecycleCallback}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Post Constructs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Post Constructs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_PostConstructs()
-	 * @generated
-	 */
-	List getPostConstructs();
-
-	/**
-	 * Returns the value of the '<em><b>Pre Destroys</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.LifecycleCallback}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Pre Destroys</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Pre Destroys</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_PreDestroys()
-	 * @generated
-	 */
-	List getPreDestroys();
-
-	/**
-	 * Returns the value of the '<em><b>Security Role Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.SecurityRoleRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Security Role Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Security Role Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_SecurityRoleRefs()
-	 * @generated
-	 */
-	List getSecurityRoleRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Security Identity</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Security Identity</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Security Identity</em>' containment reference.
-	 * @see #setSecurityIdentity(SecurityIdentityType)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_SecurityIdentity()
-	 * @generated
-	 */
-	SecurityIdentityType getSecurityIdentity();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.EntityBean#getSecurityIdentity <em>Security Identity</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Security Identity</em>' containment reference.
-	 * @see #getSecurityIdentity()
-	 * @generated
-	 */
-	void setSecurityIdentity(SecurityIdentityType value);
-
-	/**
-	 * Returns the value of the '<em><b>Queries</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.ejb.Query}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Queries</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Queries</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_Queries()
-	 * @generated
-	 */
-	List getQueries();
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.EntityBean#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // EntityBean
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/ExcludeList.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/ExcludeList.java
deleted file mode 100644
index eb68d3dfd..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/ExcludeList.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb;
-
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Exclude List</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The exclude-listType specifies one or more methods which
- * 	the Assembler marks to be uncallable.
- * 
- * 	If the method permission relation contains methods that are
- * 	in the exclude list, the Deployer should consider those
- * 	methods to be uncallable.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.ExcludeList#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.ExcludeList#getMethods <em>Methods</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.ExcludeList#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getExcludeList()
- * @extends JavaEEObject
- * @generated
- */
-public interface ExcludeList extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getExcludeList_Descriptions()
-	 * @generated
-	 */
-	List getDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>Methods</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.ejb.MethodType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Methods</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Methods</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getExcludeList_Methods()
-	 * @generated
-	 */
-	List getMethods();
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getExcludeList_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.ExcludeList#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // ExcludeList
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/IEJBResource.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/IEJBResource.java
deleted file mode 100644
index dc0852873..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/IEJBResource.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.eclipse.jst.javaee.ejb;
-
-import org.eclipse.emf.ecore.EObject;
-
-public interface IEJBResource {
-
-	/**
-	 * Return the first element in the EList.
-	 */
-	public abstract EObject getRootObject();
-
-	/**
-	 * Return the jar
-	 */
-	public abstract EJBJar getEjbJar();
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/InitMethodType.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/InitMethodType.java
deleted file mode 100644
index 242e126b8..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/InitMethodType.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Init Method Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.InitMethodType#getCreateMethod <em>Create Method</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.InitMethodType#getBeanMethod <em>Bean Method</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.InitMethodType#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInitMethodType()
- * @extends JavaEEObject
- * @generated
- */
-public interface InitMethodType extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Create Method</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Create Method</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Create Method</em>' containment reference.
-	 * @see #setCreateMethod(NamedMethodType)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInitMethodType_CreateMethod()
-	 * @generated
-	 */
-	NamedMethodType getCreateMethod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.InitMethodType#getCreateMethod <em>Create Method</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Create Method</em>' containment reference.
-	 * @see #getCreateMethod()
-	 * @generated
-	 */
-	void setCreateMethod(NamedMethodType value);
-
-	/**
-	 * Returns the value of the '<em><b>Bean Method</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Bean Method</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Bean Method</em>' containment reference.
-	 * @see #setBeanMethod(NamedMethodType)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInitMethodType_BeanMethod()
-	 * @generated
-	 */
-	NamedMethodType getBeanMethod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.InitMethodType#getBeanMethod <em>Bean Method</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Bean Method</em>' containment reference.
-	 * @see #getBeanMethod()
-	 * @generated
-	 */
-	void setBeanMethod(NamedMethodType value);
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInitMethodType_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.InitMethodType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // InitMethodType
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/InterceptorBindingType.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/InterceptorBindingType.java
deleted file mode 100644
index bafda12fd..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/InterceptorBindingType.java
+++ /dev/null
@@ -1,375 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb;
-
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Interceptor Binding Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- *         The interceptor-bindingType element describes the binding of
- *         interceptor classes to beans within the ejb-jar.
- *         It consists of :
- * 
- *           - An optional description.
- *           - The name of an ejb within the ejb-jar or the wildcard value "*",
- *             which is used to define interceptors that are bound to all
- *             beans in the ejb-jar.
- *           - A list of interceptor classes that are bound to the contents of
- *             the ejb-name element or a specification of the total ordering
- *             over the interceptors defined for the given level and above.
- *           - An optional exclude-default-interceptors element.  If set to true,
- *             specifies that default interceptors are not to be applied to
- *             a bean-class and/or business method.
- *           - An optional exclude-class-interceptors element.  If set to true,
- *             specifies that class interceptors are not to be applied to
- *             a business method.
- *           - An optional set of method elements for describing the name/params
- *             of a method-level interceptor.
- * 
- *          Interceptors bound to all classes using the wildcard syntax
- *          "*" are default interceptors for the components in the ejb-jar.
- *          In addition, interceptors may be bound at the level of the bean
- *          class (class-level interceptors) or business methods (method-level
- *          interceptors ).
- * 
- *          The binding of interceptors to classes is additive.  If interceptors
- *          are bound at the class-level and/or default-level as well as the
- *          method-level, both class-level and/or default-level as well as
- *          method-level will apply.
- * 
- *          There are four possible styles of the interceptor element syntax :
- * 
- *          1.
- *          <interceptor-binding xmlns="http://www.w3.org/2001/XMLSchema">
- *            <ejb-name>*</ejb-name>
- *            <interceptor-class>INTERCEPTOR</interceptor-class>
- *          </interceptor-binding>
- * 
- *          Specifying the ejb-name as the wildcard value "*" designates
- *          default interceptors (interceptors that apply to all session and
- *          message-driven beans contained in the ejb-jar).
- * 
- *          2.
- *          <interceptor-binding xmlns="http://www.w3.org/2001/XMLSchema">
- *            <ejb-name>EJBNAME</ejb-name>
- *            <interceptor-class>INTERCEPTOR</interceptor-class>
- *          </interceptor-binding>
- * 
- *          This style is used to refer to interceptors associated with the
- *          specified enterprise bean(class-level interceptors).
- * 
- *          3.
- *          <interceptor-binding xmlns="http://www.w3.org/2001/XMLSchema">
- *            <ejb-name>EJBNAME</ejb-name>
- *            <interceptor-class>INTERCEPTOR</interceptor-class>
- *            <method>
- *              <method-name>METHOD</method-name>
- *            </method>
- *          </interceptor-binding>
- * 
- *          This style is used to associate a method-level interceptor with
- *          the specified enterprise bean.  If there are multiple methods
- *          with the same overloaded name, the element of this style refers
- *          to all the methods with the overloaded name.  Method-level
- *          interceptors can only be associated with business methods of the
- *          bean class.   Note that the wildcard value "*" cannot be used
- *          to specify method-level interceptors.
- * 
- *          4.
- *          <interceptor-binding xmlns="http://www.w3.org/2001/XMLSchema">
- *            <ejb-name>EJBNAME</ejb-name>
- *            <interceptor-class>INTERCEPTOR</interceptor-class>
- *            <method>
- *              <method-name>METHOD</method-name>
- *              <method-params>
- *                <method-param>PARAM-1</method-param>
- *                <method-param>PARAM-2</method-param>
- *                ...
- *                <method-param>PARAM-N</method-param>
- *              </method-params>
- *            </method>
- *          </interceptor-binding>
- * 
- *          This style is used to associate a method-level interceptor with
- *          the specified method of the specified enterprise bean.  This
- *          style is used to refer to a single method within a set of methods
- *          with an overloaded name.  The values PARAM-1 through PARAM-N
- *          are the fully-qualified Java types of the method's input parameters
- *          (if the method has no input arguments, the method-params element
- *          contains no method-param elements). Arrays are specified by the
- *          array element's type, followed by one or more pair of square
- *          brackets (e.g. int[][]).
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType#getEjbName <em>Ejb Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType#getInterceptorClasses <em>Interceptor Classes</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType#getInterceptorOrder <em>Interceptor Order</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType#isExcludeDefaultInterceptors <em>Exclude Default Interceptors</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType#isExcludeClassInterceptors <em>Exclude Class Interceptors</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType#getMethod <em>Method</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorBindingType()
- * @extends JavaEEObject
- * @generated
- */
-public interface InterceptorBindingType extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorBindingType_Descriptions()
-	 * @generated
-	 */
-	List getDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>Ejb Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ejb Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ejb Name</em>' attribute.
-	 * @see #setEjbName(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorBindingType_EjbName()
-	 * @generated
-	 */
-	String getEjbName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType#getEjbName <em>Ejb Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Ejb Name</em>' attribute.
-	 * @see #getEjbName()
-	 * @generated
-	 */
-	void setEjbName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Interceptor Classes</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Interceptor Classes</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Interceptor Classes</em>' attribute list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorBindingType_InterceptorClasses()
-	 * @generated
-	 */
-	List getInterceptorClasses();
-
-	/**
-	 * Returns the value of the '<em><b>Interceptor Order</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Interceptor Order</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Interceptor Order</em>' containment reference.
-	 * @see #setInterceptorOrder(InterceptorOrderType)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorBindingType_InterceptorOrder()
-	 * @generated
-	 */
-	InterceptorOrderType getInterceptorOrder();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType#getInterceptorOrder <em>Interceptor Order</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Interceptor Order</em>' containment reference.
-	 * @see #getInterceptorOrder()
-	 * @generated
-	 */
-	void setInterceptorOrder(InterceptorOrderType value);
-
-	/**
-	 * Returns the value of the '<em><b>Exclude Default Interceptors</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Exclude Default Interceptors</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Exclude Default Interceptors</em>' attribute.
-	 * @see #isSetExcludeDefaultInterceptors()
-	 * @see #unsetExcludeDefaultInterceptors()
-	 * @see #setExcludeDefaultInterceptors(boolean)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorBindingType_ExcludeDefaultInterceptors()
-	 * @generated
-	 */
-	boolean isExcludeDefaultInterceptors();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType#isExcludeDefaultInterceptors <em>Exclude Default Interceptors</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Exclude Default Interceptors</em>' attribute.
-	 * @see #isSetExcludeDefaultInterceptors()
-	 * @see #unsetExcludeDefaultInterceptors()
-	 * @see #isExcludeDefaultInterceptors()
-	 * @generated
-	 */
-	void setExcludeDefaultInterceptors(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType#isExcludeDefaultInterceptors <em>Exclude Default Interceptors</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetExcludeDefaultInterceptors()
-	 * @see #isExcludeDefaultInterceptors()
-	 * @see #setExcludeDefaultInterceptors(boolean)
-	 * @generated
-	 */
-	void unsetExcludeDefaultInterceptors();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType#isExcludeDefaultInterceptors <em>Exclude Default Interceptors</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Exclude Default Interceptors</em>' attribute is set.
-	 * @see #unsetExcludeDefaultInterceptors()
-	 * @see #isExcludeDefaultInterceptors()
-	 * @see #setExcludeDefaultInterceptors(boolean)
-	 * @generated
-	 */
-	boolean isSetExcludeDefaultInterceptors();
-
-	/**
-	 * Returns the value of the '<em><b>Exclude Class Interceptors</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Exclude Class Interceptors</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Exclude Class Interceptors</em>' attribute.
-	 * @see #isSetExcludeClassInterceptors()
-	 * @see #unsetExcludeClassInterceptors()
-	 * @see #setExcludeClassInterceptors(boolean)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorBindingType_ExcludeClassInterceptors()
-	 * @generated
-	 */
-	boolean isExcludeClassInterceptors();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType#isExcludeClassInterceptors <em>Exclude Class Interceptors</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Exclude Class Interceptors</em>' attribute.
-	 * @see #isSetExcludeClassInterceptors()
-	 * @see #unsetExcludeClassInterceptors()
-	 * @see #isExcludeClassInterceptors()
-	 * @generated
-	 */
-	void setExcludeClassInterceptors(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType#isExcludeClassInterceptors <em>Exclude Class Interceptors</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetExcludeClassInterceptors()
-	 * @see #isExcludeClassInterceptors()
-	 * @see #setExcludeClassInterceptors(boolean)
-	 * @generated
-	 */
-	void unsetExcludeClassInterceptors();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType#isExcludeClassInterceptors <em>Exclude Class Interceptors</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Exclude Class Interceptors</em>' attribute is set.
-	 * @see #unsetExcludeClassInterceptors()
-	 * @see #isExcludeClassInterceptors()
-	 * @see #setExcludeClassInterceptors(boolean)
-	 * @generated
-	 */
-	boolean isSetExcludeClassInterceptors();
-
-	/**
-	 * Returns the value of the '<em><b>Method</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Method</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Method</em>' containment reference.
-	 * @see #setMethod(NamedMethodType)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorBindingType_Method()
-	 * @generated
-	 */
-	NamedMethodType getMethod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType#getMethod <em>Method</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Method</em>' containment reference.
-	 * @see #getMethod()
-	 * @generated
-	 */
-	void setMethod(NamedMethodType value);
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorBindingType_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // InterceptorBindingType
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/InterceptorOrderType.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/InterceptorOrderType.java
deleted file mode 100644
index edca4afd4..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/InterceptorOrderType.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb;
-
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Interceptor Order Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- *         The interceptor-orderType element describes a total ordering
- *         of interceptor classes.
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorOrderType#getInterceptorClasses <em>Interceptor Classes</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorOrderType#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorOrderType()
- * @extends JavaEEObject
- * @generated
- */
-public interface InterceptorOrderType extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Interceptor Classes</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Interceptor Classes</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Interceptor Classes</em>' attribute list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorOrderType_InterceptorClasses()
-	 * @generated
-	 */
-	List getInterceptorClasses();
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorOrderType_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.InterceptorOrderType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // InterceptorOrderType
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/InterceptorType.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/InterceptorType.java
deleted file mode 100644
index 09c10273c..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/InterceptorType.java
+++ /dev/null
@@ -1,345 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb;
-
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Interceptor Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- *         The interceptorType element declares information about a single
- *         interceptor class.  It consists of :
- * 
- *             - An optional description.
- *             - The fully-qualified name of the interceptor class.
- *             - An optional list of around invoke methods declared on the
- *               interceptor class and/or its super-classes.
- *             - An optional list environment dependencies for the interceptor
- *               class and/or its super-classes.
- *             - An optional list of post-activate methods declared on the
- *               interceptor class and/or its super-classes.
- *             - An optional list of pre-passivate methods declared on the
- *               interceptor class and/or its super-classes.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getInterceptorClass <em>Interceptor Class</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getAroundInvokes <em>Around Invokes</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getEnvEntries <em>Env Entries</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getEjbRefs <em>Ejb Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getEjbLocalRefs <em>Ejb Local Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getServiceRefs <em>Service Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getResourceRefs <em>Resource Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getResourceEnvRefs <em>Resource Env Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getMessageDestinationRefs <em>Message Destination Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getPersistenceContextRefs <em>Persistence Context Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getPersistenceUnitRefs <em>Persistence Unit Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getPostConstructs <em>Post Constructs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getPreDestroys <em>Pre Destroys</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getPostActivates <em>Post Activates</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getPrePassivates <em>Pre Passivates</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorType()
- * @extends JavaEEObject
- * @generated
- */
-public interface InterceptorType extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorType_Descriptions()
-	 * @generated
-	 */
-	List getDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>Interceptor Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Interceptor Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Interceptor Class</em>' attribute.
-	 * @see #setInterceptorClass(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorType_InterceptorClass()
-	 * @generated
-	 */
-	String getInterceptorClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getInterceptorClass <em>Interceptor Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Interceptor Class</em>' attribute.
-	 * @see #getInterceptorClass()
-	 * @generated
-	 */
-	void setInterceptorClass(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Around Invokes</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.ejb.AroundInvokeType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Around Invokes</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Around Invokes</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorType_AroundInvokes()
-	 * @generated
-	 */
-	List getAroundInvokes();
-
-	/**
-	 * Returns the value of the '<em><b>Env Entries</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.EnvEntry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Env Entries</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Env Entries</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorType_EnvEntries()
-	 * @generated
-	 */
-	List getEnvEntries();
-
-	/**
-	 * Returns the value of the '<em><b>Ejb Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.EjbRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ejb Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ejb Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorType_EjbRefs()
-	 * @generated
-	 */
-	List getEjbRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Ejb Local Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.EjbLocalRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ejb Local Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ejb Local Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorType_EjbLocalRefs()
-	 * @generated
-	 */
-	List getEjbLocalRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Service Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.ServiceRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Service Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Service Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorType_ServiceRefs()
-	 * @generated
-	 */
-	List getServiceRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Resource Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.ResourceRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Resource Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Resource Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorType_ResourceRefs()
-	 * @generated
-	 */
-	List getResourceRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Resource Env Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.ResourceEnvRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Resource Env Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Resource Env Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorType_ResourceEnvRefs()
-	 * @generated
-	 */
-	List getResourceEnvRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Message Destination Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.MessageDestinationRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Message Destination Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Message Destination Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorType_MessageDestinationRefs()
-	 * @generated
-	 */
-	List getMessageDestinationRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Persistence Context Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.PersistenceContextRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Persistence Context Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Persistence Context Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorType_PersistenceContextRefs()
-	 * @generated
-	 */
-	List getPersistenceContextRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Persistence Unit Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.PersistenceUnitRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Persistence Unit Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Persistence Unit Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorType_PersistenceUnitRefs()
-	 * @generated
-	 */
-	List getPersistenceUnitRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Post Constructs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.LifecycleCallback}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Post Constructs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Post Constructs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorType_PostConstructs()
-	 * @generated
-	 */
-	List getPostConstructs();
-
-	/**
-	 * Returns the value of the '<em><b>Pre Destroys</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.LifecycleCallback}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Pre Destroys</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Pre Destroys</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorType_PreDestroys()
-	 * @generated
-	 */
-	List getPreDestroys();
-
-	/**
-	 * Returns the value of the '<em><b>Post Activates</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.LifecycleCallback}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Post Activates</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Post Activates</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorType_PostActivates()
-	 * @generated
-	 */
-	List getPostActivates();
-
-	/**
-	 * Returns the value of the '<em><b>Pre Passivates</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.LifecycleCallback}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Pre Passivates</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Pre Passivates</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorType_PrePassivates()
-	 * @generated
-	 */
-	List getPrePassivates();
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorType_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // InterceptorType
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/InterceptorsType.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/InterceptorsType.java
deleted file mode 100644
index 285164465..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/InterceptorsType.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb;
-
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Interceptors Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- *         The interceptorsType element declares one or more interceptor
- *         classes used by components within this ejb-jar.  The declaration
- *         consists of :
- * 
- *             - An optional description.
- *             - One or more interceptor elements.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorsType#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorsType#getInterceptors <em>Interceptors</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorsType#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorsType()
- * @extends JavaEEObject
- * @generated
- */
-public interface InterceptorsType extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorsType_Descriptions()
-	 * @generated
-	 */
-	List getDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>Interceptors</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.ejb.InterceptorType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Interceptors</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Interceptors</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorsType_Interceptors()
-	 * @generated
-	 */
-	List getInterceptors();
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorsType_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.InterceptorsType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // InterceptorsType
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/MessageDrivenBean.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/MessageDrivenBean.java
deleted file mode 100644
index 9ef1ff7e6..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/MessageDrivenBean.java
+++ /dev/null
@@ -1,652 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb;
-
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Message Driven Bean</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The message-driven element declares a message-driven
- * 	bean. The declaration consists of:
- * 
- * 	    - an optional description
- * 	    - an optional display name
- * 	    - an optional icon element that contains a small and a large
- * 	      icon file name.
- * 	    - a name assigned to the enterprise bean in
- * 	      the deployment descriptor
- *             - an optional mapped-name element that can be used to provide
- *               vendor-specific deployment information such as the physical
- *               jndi-name of destination from which this message-driven bean
- *               should consume.  This element is not required to be supported
- *               by all implementations.  Any use of this element is non-portable.
- * 	    - the message-driven bean's implementation class
- * 	    - an optional declaration of the bean's messaging
- * 	      type
- *             - an optional declaration of the bean's timeout method.
- * 	    - the optional message-driven bean's transaction management
- *               type. If it is not defined, it is defaulted to Container.
- * 	    - an optional declaration of the bean's
- * 	      message-destination-type
- * 	    - an optional declaration of the bean's
- * 	      message-destination-link
- * 	    - an optional declaration of the message-driven bean's
- * 	      activation configuration properties
- *             - an optional list of the message-driven bean class and/or
- *               superclass around-invoke methods.
- * 	    - an optional declaration of the bean's environment
- * 	      entries
- * 	    - an optional declaration of the bean's EJB references
- * 	    - an optional declaration of the bean's local EJB
- * 	      references
- * 	    - an optional declaration of the bean's web service
- * 	      references
- * 	    - an optional declaration of the security
- * 	      identity to be used for the execution of the bean's
- * 	      methods
- * 	    - an optional declaration of the bean's
- * 	      resource manager connection factory
- * 	      references
- * 	    - an optional declaration of the bean's resource
- * 	      environment references.
- * 	    - an optional declaration of the bean's message
- * 	      destination references
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getDisplayNames <em>Display Names</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getIcons <em>Icons</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getEjbName <em>Ejb Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getMappedName <em>Mapped Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getEjbClass <em>Ejb Class</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getMessagingType <em>Messaging Type</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getTimeoutMethod <em>Timeout Method</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getTransactionType <em>Transaction Type</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getMessageDestinationType <em>Message Destination Type</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getMessageDestinationLink <em>Message Destination Link</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getActivationConfig <em>Activation Config</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getAroundInvokes <em>Around Invokes</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getEnvEntries <em>Env Entries</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getEjbRefs <em>Ejb Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getEjbLocalRefs <em>Ejb Local Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getServiceRefs <em>Service Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getResourceRefs <em>Resource Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getResourceEnvRefs <em>Resource Env Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getMessageDestinationRefs <em>Message Destination Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getPersistenceContextRefs <em>Persistence Context Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getPersistenceUnitRefs <em>Persistence Unit Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getPostConstructs <em>Post Constructs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getPreDestroys <em>Pre Destroys</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getSecurityIdentity <em>Security Identity</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean()
- * @extends JavaEEObject
- * @generated
- */
-public interface MessageDrivenBean extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_Descriptions()
-	 * @generated
-	 */
-	List getDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>Display Names</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.DisplayName}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Names</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Names</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_DisplayNames()
-	 * @generated
-	 */
-	List getDisplayNames();
-
-	/**
-	 * Returns the value of the '<em><b>Icons</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Icon}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Icons</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Icons</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_Icons()
-	 * @generated
-	 */
-	List getIcons();
-
-	/**
-	 * Returns the value of the '<em><b>Ejb Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ejb Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ejb Name</em>' attribute.
-	 * @see #setEjbName(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_EjbName()
-	 * @generated
-	 */
-	String getEjbName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getEjbName <em>Ejb Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Ejb Name</em>' attribute.
-	 * @see #getEjbName()
-	 * @generated
-	 */
-	void setEjbName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Mapped Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Mapped Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Mapped Name</em>' attribute.
-	 * @see #setMappedName(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_MappedName()
-	 * @generated
-	 */
-	String getMappedName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getMappedName <em>Mapped Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Mapped Name</em>' attribute.
-	 * @see #getMappedName()
-	 * @generated
-	 */
-	void setMappedName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Ejb Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 *              The ejb-class element specifies the fully qualified name
-	 *              of the bean class for this ejb.  It is required unless
-	 *              there is a component-defining annotation for the same
-	 *              ejb-name.
-	 * 
-	 *           
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Ejb Class</em>' attribute.
-	 * @see #setEjbClass(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_EjbClass()
-	 * @generated
-	 */
-	String getEjbClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getEjbClass <em>Ejb Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Ejb Class</em>' attribute.
-	 * @see #getEjbClass()
-	 * @generated
-	 */
-	void setEjbClass(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Messaging Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The messaging-type element specifies the message
-	 * 	    listener interface of the message-driven bean.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Messaging Type</em>' attribute.
-	 * @see #setMessagingType(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_MessagingType()
-	 * @generated
-	 */
-	String getMessagingType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getMessagingType <em>Messaging Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Messaging Type</em>' attribute.
-	 * @see #getMessagingType()
-	 * @generated
-	 */
-	void setMessagingType(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Timeout Method</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Timeout Method</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Timeout Method</em>' containment reference.
-	 * @see #setTimeoutMethod(NamedMethodType)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_TimeoutMethod()
-	 * @generated
-	 */
-	NamedMethodType getTimeoutMethod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getTimeoutMethod <em>Timeout Method</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Timeout Method</em>' containment reference.
-	 * @see #getTimeoutMethod()
-	 * @generated
-	 */
-	void setTimeoutMethod(NamedMethodType value);
-
-	/**
-	 * Returns the value of the '<em><b>Transaction Type</b></em>' attribute.
-	 * The default value is <code>"Bean"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.ejb.TransactionType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Transaction Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Transaction Type</em>' attribute.
-	 * @see org.eclipse.jst.javaee.ejb.TransactionType
-	 * @see #isSetTransactionType()
-	 * @see #unsetTransactionType()
-	 * @see #setTransactionType(TransactionType)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_TransactionType()
-	 * @generated
-	 */
-	TransactionType getTransactionType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getTransactionType <em>Transaction Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Transaction Type</em>' attribute.
-	 * @see org.eclipse.jst.javaee.ejb.TransactionType
-	 * @see #isSetTransactionType()
-	 * @see #unsetTransactionType()
-	 * @see #getTransactionType()
-	 * @generated
-	 */
-	void setTransactionType(TransactionType value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getTransactionType <em>Transaction Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetTransactionType()
-	 * @see #getTransactionType()
-	 * @see #setTransactionType(TransactionType)
-	 * @generated
-	 */
-	void unsetTransactionType();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getTransactionType <em>Transaction Type</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Transaction Type</em>' attribute is set.
-	 * @see #unsetTransactionType()
-	 * @see #getTransactionType()
-	 * @see #setTransactionType(TransactionType)
-	 * @generated
-	 */
-	boolean isSetTransactionType();
-
-	/**
-	 * Returns the value of the '<em><b>Message Destination Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Message Destination Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Message Destination Type</em>' attribute.
-	 * @see #setMessageDestinationType(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_MessageDestinationType()
-	 * @generated
-	 */
-	String getMessageDestinationType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getMessageDestinationType <em>Message Destination Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Message Destination Type</em>' attribute.
-	 * @see #getMessageDestinationType()
-	 * @generated
-	 */
-	void setMessageDestinationType(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Message Destination Link</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Message Destination Link</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Message Destination Link</em>' attribute.
-	 * @see #setMessageDestinationLink(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_MessageDestinationLink()
-	 * @generated
-	 */
-	String getMessageDestinationLink();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getMessageDestinationLink <em>Message Destination Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Message Destination Link</em>' attribute.
-	 * @see #getMessageDestinationLink()
-	 * @generated
-	 */
-	void setMessageDestinationLink(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Activation Config</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Activation Config</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Activation Config</em>' containment reference.
-	 * @see #setActivationConfig(ActivationConfig)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_ActivationConfig()
-	 * @generated
-	 */
-	ActivationConfig getActivationConfig();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getActivationConfig <em>Activation Config</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Activation Config</em>' containment reference.
-	 * @see #getActivationConfig()
-	 * @generated
-	 */
-	void setActivationConfig(ActivationConfig value);
-
-	/**
-	 * Returns the value of the '<em><b>Around Invokes</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.ejb.AroundInvokeType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Around Invokes</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Around Invokes</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_AroundInvokes()
-	 * @generated
-	 */
-	List getAroundInvokes();
-
-	/**
-	 * Returns the value of the '<em><b>Env Entries</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.EnvEntry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Env Entries</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Env Entries</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_EnvEntries()
-	 * @generated
-	 */
-	List getEnvEntries();
-
-	/**
-	 * Returns the value of the '<em><b>Ejb Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.EjbRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ejb Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ejb Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_EjbRefs()
-	 * @generated
-	 */
-	List getEjbRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Ejb Local Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.EjbLocalRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ejb Local Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ejb Local Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_EjbLocalRefs()
-	 * @generated
-	 */
-	List getEjbLocalRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Service Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.ServiceRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Service Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Service Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_ServiceRefs()
-	 * @generated
-	 */
-	List getServiceRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Resource Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.ResourceRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Resource Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Resource Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_ResourceRefs()
-	 * @generated
-	 */
-	List getResourceRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Resource Env Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.ResourceEnvRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Resource Env Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Resource Env Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_ResourceEnvRefs()
-	 * @generated
-	 */
-	List getResourceEnvRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Message Destination Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.MessageDestinationRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Message Destination Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Message Destination Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_MessageDestinationRefs()
-	 * @generated
-	 */
-	List getMessageDestinationRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Persistence Context Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.PersistenceContextRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Persistence Context Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Persistence Context Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_PersistenceContextRefs()
-	 * @generated
-	 */
-	List getPersistenceContextRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Persistence Unit Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.PersistenceUnitRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Persistence Unit Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Persistence Unit Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_PersistenceUnitRefs()
-	 * @generated
-	 */
-	List getPersistenceUnitRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Post Constructs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.LifecycleCallback}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Post Constructs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Post Constructs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_PostConstructs()
-	 * @generated
-	 */
-	List getPostConstructs();
-
-	/**
-	 * Returns the value of the '<em><b>Pre Destroys</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.LifecycleCallback}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Pre Destroys</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Pre Destroys</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_PreDestroys()
-	 * @generated
-	 */
-	List getPreDestroys();
-
-	/**
-	 * Returns the value of the '<em><b>Security Identity</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Security Identity</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Security Identity</em>' containment reference.
-	 * @see #setSecurityIdentity(SecurityIdentityType)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_SecurityIdentity()
-	 * @generated
-	 */
-	SecurityIdentityType getSecurityIdentity();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getSecurityIdentity <em>Security Identity</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Security Identity</em>' containment reference.
-	 * @see #getSecurityIdentity()
-	 * @generated
-	 */
-	void setSecurityIdentity(SecurityIdentityType value);
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // MessageDrivenBean
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/MethodInterfaceType.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/MethodInterfaceType.java
deleted file mode 100644
index 05d9c7125..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/MethodInterfaceType.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Method Interface Type</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The method-intf element allows a method element to
- * 	differentiate between the methods with the same name and
- * 	signature that are multiply defined across the home and
- * 	component interfaces (e.g, in both an enterprise bean's
- * 	remote and local interfaces or in both an enterprise bean's
- * 	home and remote interfaces, etc.); the component and web
- * 	service endpoint interfaces, and so on. The Local applies to
- *         both local component interface and local business interface.
- *         Similarly, Remote applies to both remote component interface
- *         and the remote business interface.
- * 
- * 	The method-intf element must be one of the following:
- * 
- * 	    Home
- * 	    Remote
- * 	    LocalHome
- * 	    Local
- * 	    ServiceEndpoint
- * 
- *       
- * <!-- end-model-doc -->
- * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMethodInterfaceType()
- * @generated
- */
-public final class MethodInterfaceType extends AbstractEnumerator {
-	/**
-	 * The '<em><b>Home</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Home</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #HOME_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int HOME = 0;
-
-	/**
-	 * The '<em><b>Remote</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Remote</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #REMOTE_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int REMOTE = 1;
-
-	/**
-	 * The '<em><b>Local Home</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Local Home</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #LOCAL_HOME_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int LOCAL_HOME = 2;
-
-	/**
-	 * The '<em><b>Local</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Local</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #LOCAL_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int LOCAL = 3;
-
-	/**
-	 * The '<em><b>Service Endpoint</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Service Endpoint</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SERVICE_ENDPOINT_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SERVICE_ENDPOINT = 4;
-
-	/**
-	 * The '<em><b>Home</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #HOME
-	 * @generated
-	 * @ordered
-	 */
-	public static final MethodInterfaceType HOME_LITERAL = new MethodInterfaceType(HOME, "Home", "Home"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Remote</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #REMOTE
-	 * @generated
-	 * @ordered
-	 */
-	public static final MethodInterfaceType REMOTE_LITERAL = new MethodInterfaceType(REMOTE, "Remote", "Remote"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Local Home</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #LOCAL_HOME
-	 * @generated
-	 * @ordered
-	 */
-	public static final MethodInterfaceType LOCAL_HOME_LITERAL = new MethodInterfaceType(LOCAL_HOME, "LocalHome", "LocalHome"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Local</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #LOCAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final MethodInterfaceType LOCAL_LITERAL = new MethodInterfaceType(LOCAL, "Local", "Local"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Service Endpoint</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #SERVICE_ENDPOINT
-	 * @generated
-	 * @ordered
-	 */
-	public static final MethodInterfaceType SERVICE_ENDPOINT_LITERAL = new MethodInterfaceType(SERVICE_ENDPOINT, "ServiceEndpoint", "ServiceEndpoint"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * An array of all the '<em><b>Method Interface Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final MethodInterfaceType[] VALUES_ARRAY =
-		new MethodInterfaceType[] {
-			HOME_LITERAL,
-			REMOTE_LITERAL,
-			LOCAL_HOME_LITERAL,
-			LOCAL_LITERAL,
-			SERVICE_ENDPOINT_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Method Interface Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Method Interface Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static MethodInterfaceType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			MethodInterfaceType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Method Interface Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static MethodInterfaceType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			MethodInterfaceType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Method Interface Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static MethodInterfaceType get(int value) {
-		switch (value) {
-			case HOME: return HOME_LITERAL;
-			case REMOTE: return REMOTE_LITERAL;
-			case LOCAL_HOME: return LOCAL_HOME_LITERAL;
-			case LOCAL: return LOCAL_LITERAL;
-			case SERVICE_ENDPOINT: return SERVICE_ENDPOINT_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private MethodInterfaceType(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //MethodInterfaceType
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/MethodParams.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/MethodParams.java
deleted file mode 100644
index 68c568152..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/MethodParams.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb;
-
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Method Params</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The method-paramsType defines a list of the
- * 	fully-qualified Java type names of the method parameters.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.MethodParams#getMethodParams <em>Method Params</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.MethodParams#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMethodParams()
- * @extends JavaEEObject
- * @generated
- */
-public interface MethodParams extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Method Params</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The method-param element contains a primitive
-	 * 	    or a fully-qualified Java type name of a method
-	 * 	    parameter.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Method Params</em>' attribute list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMethodParams_MethodParams()
-	 * @generated
-	 */
-	List getMethodParams();
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMethodParams_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.MethodParams#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // MethodParams
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/MethodPermission.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/MethodPermission.java
deleted file mode 100644
index 6bd986d04..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/MethodPermission.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb;
-
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.EmptyType;
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Method Permission</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The method-permissionType specifies that one or more
- * 	security roles are allowed to invoke one or more enterprise
- * 	bean methods. The method-permissionType consists of an
- * 	optional description, a list of security role names or an
- * 	indicator to state that the method is unchecked for
- * 	authorization, and a list of method elements.
- * 
- * 	The security roles used in the method-permissionType
- * 	must be defined in the security-role elements of the
- * 	deployment descriptor, and the methods must be methods
- * 	defined in the enterprise bean's business, home, component
- *         and/or web service endpoint interfaces.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.MethodPermission#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.MethodPermission#getRoleNames <em>Role Names</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.MethodPermission#getUnchecked <em>Unchecked</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.MethodPermission#getMethods <em>Methods</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.MethodPermission#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMethodPermission()
- * @extends JavaEEObject
- * @generated
- */
-public interface MethodPermission extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMethodPermission_Descriptions()
-	 * @generated
-	 */
-	List getDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>Role Names</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Role Names</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Role Names</em>' attribute list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMethodPermission_RoleNames()
-	 * @generated
-	 */
-	List getRoleNames();
-
-	/**
-	 * Returns the value of the '<em><b>Unchecked</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	      The unchecked element specifies that a method is
-	 * 	      not checked for authorization by the container
-	 * 	      prior to invocation of the method.
-	 * 
-	 * 	    
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Unchecked</em>' containment reference.
-	 * @see #setUnchecked(EmptyType)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMethodPermission_Unchecked()
-	 * @generated
-	 */
-	EmptyType getUnchecked();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.MethodPermission#getUnchecked <em>Unchecked</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Unchecked</em>' containment reference.
-	 * @see #getUnchecked()
-	 * @generated
-	 */
-	void setUnchecked(EmptyType value);
-
-	/**
-	 * Returns the value of the '<em><b>Methods</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.ejb.MethodType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Methods</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Methods</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMethodPermission_Methods()
-	 * @generated
-	 */
-	List getMethods();
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMethodPermission_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.MethodPermission#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // MethodPermission
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/MethodType.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/MethodType.java
deleted file mode 100644
index 40d650cb1..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/MethodType.java
+++ /dev/null
@@ -1,393 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb;
-
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Method Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 	
- * 
- * 	  The methodType is used to denote a method of an enterprise
- * 	  bean's business, home, component, and/or web service endpoint
- * 	  interface, or, in the case of a message-driven bean, the
- * 	  bean's message listener method, or a set of such
- * 	  methods. The ejb-name element must be the name of one of the
- * 	  enterprise beans declared in the deployment descriptor; the
- * 	  optional method-intf element allows to distinguish between a
- * 	  method with the same signature that is multiply defined
- * 	  across the business, home, component, and/or web service
- *           endpoint nterfaces; the method-name element specifies the
- *           method name; and the optional method-params elements identify
- *           a single method among multiple methods with an overloaded
- * 	  method name.
- * 
- * 	  There are three possible styles of using methodType element
- * 	  within a method element:
- * 
- * 	  1.
- * 	  &lt;method&gt;
- * 	      &lt;ejb-name&gt;EJBNAME&lt;/ejb-name&gt;
- * 	      &lt;method-name&gt;*&lt;/method-name&gt;
- * 	  &lt;/method&gt;
- * 
- * 	     This style is used to refer to all the methods of the
- * 	     specified enterprise bean's business, home, component,
- *              and/or web service endpoint interfaces.
- * 
- * 	  2.
- * 	  &lt;method&gt;
- * 	      &lt;ejb-name&gt;EJBNAME&lt;/ejb-name&gt;
- * 	      &lt;method-name&gt;METHOD&lt;/method-name&gt;
- * 	  &lt;/method&gt;
- * 
- * 	     This style is used to refer to the specified method of
- * 	     the specified enterprise bean. If there are multiple
- * 	     methods with the same overloaded name, the element of
- * 	     this style refers to all the methods with the overloaded
- * 	     name.
- * 
- * 	  3.
- * 	  &lt;method&gt;
- * 	      &lt;ejb-name&gt;EJBNAME&lt;/ejb-name&gt;
- * 	      &lt;method-name&gt;METHOD&lt;/method-name&gt;
- * 	      &lt;method-params&gt;
- * 		  &lt;method-param&gt;PARAM-1&lt;/method-param&gt;
- * 		  &lt;method-param&gt;PARAM-2&lt;/method-param&gt;
- * 		  ...
- * 		  &lt;method-param&gt;PARAM-n&lt;/method-param&gt;
- * 	      &lt;/method-params&gt;
- * 	  &lt;/method&gt;
- * 
- * 	     This style is used to refer to a single method within a
- * 	     set of methods with an overloaded name. PARAM-1 through
- * 	     PARAM-n are the fully-qualified Java types of the
- * 	     method's input parameters (if the method has no input
- * 	     arguments, the method-params element contains no
- * 	     method-param elements). Arrays are specified by the
- * 	     array element's type, followed by one or more pair of
- * 	     square brackets (e.g. int[][]). If there are multiple
- * 	     methods with the same overloaded name, this style refers
- * 	     to all of the overloaded methods.
- * 
- * 	  Examples:
- * 
- * 	  Style 1: The following method element refers to all the
- * 	  methods of the EmployeeService bean's business, home,
- *           component, and/or web service endpoint interfaces:
- * 
- * 	  &lt;method&gt;
- * 	      &lt;ejb-name&gt;EmployeeService&lt;/ejb-name&gt;
- * 	      &lt;method-name&gt;*&lt;/method-name&gt;
- * 	  &lt;/method&gt;
- * 
- * 	  Style 2: The following method element refers to all the
- * 	  create methods of the EmployeeService bean's home
- * 	  interface(s).
- * 
- * 	  &lt;method&gt;
- * 	      &lt;ejb-name&gt;EmployeeService&lt;/ejb-name&gt;
- * 	      &lt;method-name&gt;create&lt;/method-name&gt;
- * 	  &lt;/method&gt;
- * 
- * 	  Style 3: The following method element refers to the
- * 	  create(String firstName, String LastName) method of the
- * 	  EmployeeService bean's home interface(s).
- * 
- * 	  &lt;method&gt;
- * 	      &lt;ejb-name&gt;EmployeeService&lt;/ejb-name&gt;
- * 	      &lt;method-name&gt;create&lt;/method-name&gt;
- * 	      &lt;method-params&gt;
- * 		  &lt;method-param&gt;java.lang.String&lt;/method-param&gt;
- * 		  &lt;method-param&gt;java.lang.String&lt;/method-param&gt;
- * 	      &lt;/method-params&gt;
- * 	  &lt;/method&gt;
- * 
- * 	  The following example illustrates a Style 3 element with
- * 	  more complex parameter types. The method
- * 	  foobar(char s, int i, int[] iar, mypackage.MyClass mycl,
- * 	  mypackage.MyClass[][] myclaar) would be specified as:
- * 
- * 	  &lt;method&gt;
- * 	      &lt;ejb-name&gt;EmployeeService&lt;/ejb-name&gt;
- * 	      &lt;method-name&gt;foobar&lt;/method-name&gt;
- * 	      &lt;method-params&gt;
- * 		  &lt;method-param&gt;char&lt;/method-param&gt;
- * 		  &lt;method-param&gt;int&lt;/method-param&gt;
- * 		  &lt;method-param&gt;int[]&lt;/method-param&gt;
- * 		  &lt;method-param&gt;mypackage.MyClass&lt;/method-param&gt;
- * 		  &lt;method-param&gt;mypackage.MyClass[][]&lt;/method-param&gt;
- * 	      &lt;/method-params&gt;
- * 	  &lt;/method&gt;
- * 
- * 	  The optional method-intf element can be used when it becomes
- * 	  necessary to differentiate between a method that is multiply
- * 	  defined across the enterprise bean's business, home, component,
- *           and/or web service endpoint interfaces with the same name and
- * 	  signature. However, if the same method is a method of both the
- *           local business interface, and the local component interface,
- *           the same attribute applies to the method for both interfaces.
- *           Likewise, if the same method is a method of both the remote
- *           business interface and the remote component interface, the same
- *           attribute applies to the method for both interfaces.
- * 
- * 	  For example, the method element
- * 
- * 	  &lt;method&gt;
- * 	      &lt;ejb-name&gt;EmployeeService&lt;/ejb-name&gt;
- * 	      &lt;method-intf&gt;Remote&lt;/method-intf&gt;
- * 	      &lt;method-name&gt;create&lt;/method-name&gt;
- * 	      &lt;method-params&gt;
- * 		  &lt;method-param&gt;java.lang.String&lt;/method-param&gt;
- * 		  &lt;method-param&gt;java.lang.String&lt;/method-param&gt;
- * 	      &lt;/method-params&gt;
- * 	  &lt;/method&gt;
- * 
- * 	  can be used to differentiate the create(String, String)
- * 	  method defined in the remote interface from the
- * 	  create(String, String) method defined in the remote home
- * 	  interface, which would be defined as
- * 
- * 	  &lt;method&gt;
- * 	      &lt;ejb-name&gt;EmployeeService&lt;/ejb-name&gt;
- * 	      &lt;method-intf&gt;Home&lt;/method-intf&gt;
- * 	      &lt;method-name&gt;create&lt;/method-name&gt;
- * 	      &lt;method-params&gt;
- * 		  &lt;method-param&gt;java.lang.String&lt;/method-param&gt;
- * 		  &lt;method-param&gt;java.lang.String&lt;/method-param&gt;
- * 	      &lt;/method-params&gt;
- * 	  &lt;/method&gt;
- * 
- * 	  and the create method that is defined in the local home
- * 	  interface which would be defined as
- * 
- * 	  &lt;method&gt;
- * 	      &lt;ejb-name&gt;EmployeeService&lt;/ejb-name&gt;
- * 	      &lt;method-intf&gt;LocalHome&lt;/method-intf&gt;
- * 	      &lt;method-name&gt;create&lt;/method-name&gt;
- * 	      &lt;method-params&gt;
- * 		  &lt;method-param&gt;java.lang.String&lt;/method-param&gt;
- * 		  &lt;method-param&gt;java.lang.String&lt;/method-param&gt;
- * 	      &lt;/method-params&gt;
- * 	  &lt;/method&gt;
- * 
- * 	  The method-intf element can be used with all three Styles
- * 	  of the method element usage. For example, the following
- * 	  method element example could be used to refer to all the
- * 	  methods of the EmployeeService bean's remote home interface
- *           and the remote business interface.
- * 
- * 	  &lt;method&gt;
- * 	      &lt;ejb-name&gt;EmployeeService&lt;/ejb-name&gt;
- * 	      &lt;method-intf&gt;Home&lt;/method-intf&gt;
- * 	      &lt;method-name&gt;*&lt;/method-name&gt;
- * 	  &lt;/method&gt;
- * 
- * 	  
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.MethodType#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.MethodType#getEjbName <em>Ejb Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.MethodType#getMethodIntf <em>Method Intf</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.MethodType#getMethodName <em>Method Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.MethodType#getMethodParams <em>Method Params</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.MethodType#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMethodType()
- * @extends JavaEEObject
- * @generated
- */
-public interface MethodType extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMethodType_Descriptions()
-	 * @generated
-	 */
-	List getDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>Ejb Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ejb Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ejb Name</em>' attribute.
-	 * @see #setEjbName(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMethodType_EjbName()
-	 * @generated
-	 */
-	String getEjbName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.MethodType#getEjbName <em>Ejb Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Ejb Name</em>' attribute.
-	 * @see #getEjbName()
-	 * @generated
-	 */
-	void setEjbName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Method Intf</b></em>' attribute.
-	 * The default value is <code>"Home"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.ejb.MethodInterfaceType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Method Intf</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Method Intf</em>' attribute.
-	 * @see org.eclipse.jst.javaee.ejb.MethodInterfaceType
-	 * @see #isSetMethodIntf()
-	 * @see #unsetMethodIntf()
-	 * @see #setMethodIntf(MethodInterfaceType)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMethodType_MethodIntf()
-	 * @generated
-	 */
-	MethodInterfaceType getMethodIntf();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.MethodType#getMethodIntf <em>Method Intf</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Method Intf</em>' attribute.
-	 * @see org.eclipse.jst.javaee.ejb.MethodInterfaceType
-	 * @see #isSetMethodIntf()
-	 * @see #unsetMethodIntf()
-	 * @see #getMethodIntf()
-	 * @generated
-	 */
-	void setMethodIntf(MethodInterfaceType value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.javaee.ejb.MethodType#getMethodIntf <em>Method Intf</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetMethodIntf()
-	 * @see #getMethodIntf()
-	 * @see #setMethodIntf(MethodInterfaceType)
-	 * @generated
-	 */
-	void unsetMethodIntf();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.ejb.MethodType#getMethodIntf <em>Method Intf</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Method Intf</em>' attribute is set.
-	 * @see #unsetMethodIntf()
-	 * @see #getMethodIntf()
-	 * @see #setMethodIntf(MethodInterfaceType)
-	 * @generated
-	 */
-	boolean isSetMethodIntf();
-
-	/**
-	 * Returns the value of the '<em><b>Method Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Method Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Method Name</em>' attribute.
-	 * @see #setMethodName(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMethodType_MethodName()
-	 * @generated
-	 */
-	String getMethodName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.MethodType#getMethodName <em>Method Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Method Name</em>' attribute.
-	 * @see #getMethodName()
-	 * @generated
-	 */
-	void setMethodName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Method Params</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Method Params</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Method Params</em>' containment reference.
-	 * @see #setMethodParams(MethodParams)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMethodType_MethodParams()
-	 * @generated
-	 */
-	MethodParams getMethodParams();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.MethodType#getMethodParams <em>Method Params</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Method Params</em>' containment reference.
-	 * @see #getMethodParams()
-	 * @generated
-	 */
-	void setMethodParams(MethodParams value);
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMethodType_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.MethodType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // MethodType
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/MultiplicityType.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/MultiplicityType.java
deleted file mode 100644
index 1980c20d3..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/MultiplicityType.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Multiplicity Type</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The multiplicityType describes the multiplicity of the
- * 	role that participates in a relation.
- * 
- * 	The value must be one of the two following:
- * 
- * 	    One
- * 	    Many
- * 
- *       
- * <!-- end-model-doc -->
- * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMultiplicityType()
- * @generated
- */
-public final class MultiplicityType extends AbstractEnumerator {
-	/**
-	 * The '<em><b>One</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>One</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #ONE_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ONE = 0;
-
-	/**
-	 * The '<em><b>Many</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Many</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #MANY_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int MANY = 1;
-
-	/**
-	 * The '<em><b>One</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #ONE
-	 * @generated
-	 * @ordered
-	 */
-	public static final MultiplicityType ONE_LITERAL = new MultiplicityType(ONE, "One", "One"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Many</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #MANY
-	 * @generated
-	 * @ordered
-	 */
-	public static final MultiplicityType MANY_LITERAL = new MultiplicityType(MANY, "Many", "Many"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * An array of all the '<em><b>Multiplicity Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final MultiplicityType[] VALUES_ARRAY =
-		new MultiplicityType[] {
-			ONE_LITERAL,
-			MANY_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Multiplicity Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Multiplicity Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static MultiplicityType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			MultiplicityType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Multiplicity Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static MultiplicityType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			MultiplicityType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Multiplicity Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static MultiplicityType get(int value) {
-		switch (value) {
-			case ONE: return ONE_LITERAL;
-			case MANY: return MANY_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private MultiplicityType(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //MultiplicityType
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/NamedMethodType.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/NamedMethodType.java
deleted file mode 100644
index 32254df01..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/NamedMethodType.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Named Method Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.NamedMethodType#getMethodName <em>Method Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.NamedMethodType#getMethodParams <em>Method Params</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.NamedMethodType#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getNamedMethodType()
- * @extends JavaEEObject
- * @generated
- */
-public interface NamedMethodType extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Method Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Method Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Method Name</em>' attribute.
-	 * @see #setMethodName(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getNamedMethodType_MethodName()
-	 * @generated
-	 */
-	String getMethodName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.NamedMethodType#getMethodName <em>Method Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Method Name</em>' attribute.
-	 * @see #getMethodName()
-	 * @generated
-	 */
-	void setMethodName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Method Params</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Method Params</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Method Params</em>' containment reference.
-	 * @see #setMethodParams(MethodParams)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getNamedMethodType_MethodParams()
-	 * @generated
-	 */
-	MethodParams getMethodParams();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.NamedMethodType#getMethodParams <em>Method Params</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Method Params</em>' containment reference.
-	 * @see #getMethodParams()
-	 * @generated
-	 */
-	void setMethodParams(MethodParams value);
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getNamedMethodType_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.NamedMethodType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // NamedMethodType
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/PersistenceType.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/PersistenceType.java
deleted file mode 100644
index 05ee6a945..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/PersistenceType.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Persistence Type</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The persistence-typeType specifies an entity bean's persistence
- * 	management type.
- * 
- * 	The persistence-type element must be one of the two following:
- * 
- * 	    Bean
- * 	    Container
- * 
- *       
- * <!-- end-model-doc -->
- * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getPersistenceType()
- * @generated
- */
-public final class PersistenceType extends AbstractEnumerator {
-	/**
-	 * The '<em><b>Bean</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Bean</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #BEAN_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int BEAN = 0;
-
-	/**
-	 * The '<em><b>Container</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Container</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #CONTAINER_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CONTAINER = 1;
-
-	/**
-	 * The '<em><b>Bean</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #BEAN
-	 * @generated
-	 * @ordered
-	 */
-	public static final PersistenceType BEAN_LITERAL = new PersistenceType(BEAN, "Bean", "Bean"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Container</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #CONTAINER
-	 * @generated
-	 * @ordered
-	 */
-	public static final PersistenceType CONTAINER_LITERAL = new PersistenceType(CONTAINER, "Container", "Container"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * An array of all the '<em><b>Persistence Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final PersistenceType[] VALUES_ARRAY =
-		new PersistenceType[] {
-			BEAN_LITERAL,
-			CONTAINER_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Persistence Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Persistence Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static PersistenceType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			PersistenceType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Persistence Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static PersistenceType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			PersistenceType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Persistence Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static PersistenceType get(int value) {
-		switch (value) {
-			case BEAN: return BEAN_LITERAL;
-			case CONTAINER: return CONTAINER_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private PersistenceType(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //PersistenceType
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/Query.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/Query.java
deleted file mode 100644
index 9aa0b43c7..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/Query.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb;
-
-import org.eclipse.jst.javaee.core.Description;
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Query</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The queryType defines a finder or select
- * 	query. It contains
- * 	    - an optional description of the query
- * 	    - the specification of the finder or select
- * 	      method it is used by
- * 		- an optional specification of the result type
- * 		  mapping, if the query is for a select method
- * 		  and entity objects are returned.
- * 		- the EJB QL query string that defines the query.
- * 
- * 	Queries that are expressible in EJB QL must use the ejb-ql
- * 	element to specify the query. If a query is not expressible
- * 	in EJB QL, the description element should be used to
- * 	describe the semantics of the query and the ejb-ql element
- * 	should be empty.
- * 
- * 	The result-type-mapping is an optional element. It can only
- * 	be present if the query-method specifies a select method
- * 	that returns entity objects.  The default value for the
- * 	result-type-mapping element is "Local".
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.Query#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.Query#getQueryMethod <em>Query Method</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.Query#getResultTypeMapping <em>Result Type Mapping</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.Query#getEjbQl <em>Ejb Ql</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.Query#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getQuery()
- * @extends JavaEEObject
- * @generated
- */
-public interface Query extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Description</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Description</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Description</em>' containment reference.
-	 * @see #setDescription(Description)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getQuery_Description()
-	 * @generated
-	 */
-	Description getDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.Query#getDescription <em>Description</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Description</em>' containment reference.
-	 * @see #getDescription()
-	 * @generated
-	 */
-	void setDescription(Description value);
-
-	/**
-	 * Returns the value of the '<em><b>Query Method</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Query Method</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Query Method</em>' containment reference.
-	 * @see #setQueryMethod(QueryMethod)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getQuery_QueryMethod()
-	 * @generated
-	 */
-	QueryMethod getQueryMethod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.Query#getQueryMethod <em>Query Method</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Query Method</em>' containment reference.
-	 * @see #getQueryMethod()
-	 * @generated
-	 */
-	void setQueryMethod(QueryMethod value);
-
-	/**
-	 * Returns the value of the '<em><b>Result Type Mapping</b></em>' attribute.
-	 * The default value is <code>"Local"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.ejb.ResultTypeMappingType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Result Type Mapping</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Result Type Mapping</em>' attribute.
-	 * @see org.eclipse.jst.javaee.ejb.ResultTypeMappingType
-	 * @see #isSetResultTypeMapping()
-	 * @see #unsetResultTypeMapping()
-	 * @see #setResultTypeMapping(ResultTypeMappingType)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getQuery_ResultTypeMapping()
-	 * @generated
-	 */
-	ResultTypeMappingType getResultTypeMapping();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.Query#getResultTypeMapping <em>Result Type Mapping</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Result Type Mapping</em>' attribute.
-	 * @see org.eclipse.jst.javaee.ejb.ResultTypeMappingType
-	 * @see #isSetResultTypeMapping()
-	 * @see #unsetResultTypeMapping()
-	 * @see #getResultTypeMapping()
-	 * @generated
-	 */
-	void setResultTypeMapping(ResultTypeMappingType value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.javaee.ejb.Query#getResultTypeMapping <em>Result Type Mapping</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetResultTypeMapping()
-	 * @see #getResultTypeMapping()
-	 * @see #setResultTypeMapping(ResultTypeMappingType)
-	 * @generated
-	 */
-	void unsetResultTypeMapping();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.ejb.Query#getResultTypeMapping <em>Result Type Mapping</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Result Type Mapping</em>' attribute is set.
-	 * @see #unsetResultTypeMapping()
-	 * @see #getResultTypeMapping()
-	 * @see #setResultTypeMapping(ResultTypeMappingType)
-	 * @generated
-	 */
-	boolean isSetResultTypeMapping();
-
-	/**
-	 * Returns the value of the '<em><b>Ejb Ql</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ejb Ql</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ejb Ql</em>' attribute.
-	 * @see #setEjbQl(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getQuery_EjbQl()
-	 * @generated
-	 */
-	String getEjbQl();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.Query#getEjbQl <em>Ejb Ql</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Ejb Ql</em>' attribute.
-	 * @see #getEjbQl()
-	 * @generated
-	 */
-	void setEjbQl(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getQuery_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.Query#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // Query
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/QueryMethod.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/QueryMethod.java
deleted file mode 100644
index fe5cb137f..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/QueryMethod.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Query Method</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 	
- * 
- * 	  The query-method specifies the method for a finder or select
- * 	  query.
- * 
- * 	  The method-name element specifies the name of a finder or select
- * 	  method in the entity bean's implementation class.
- * 
- * 	  Each method-param must be defined for a query-method using the
- * 	  method-params element.
- * 
- * 	  It is used by the query-method element.
- * 
- * 	  Example:
- * 
- * 	  &lt;query&gt;
- * 	      &lt;description&gt;Method finds large orders&lt;/description&gt;
- * 	      &lt;query-method&gt;
- * 		  &lt;method-name&gt;findLargeOrders&lt;/method-name&gt;
- * 		  &lt;method-params&gt;&lt;/method-params&gt;
- * 	      &lt;/query-method&gt;
- * 	      &lt;ejb-ql&gt;
- * 		SELECT OBJECT(o) FROM Order o
- * 		  WHERE o.amount &amp;gt; 1000
- * 	      &lt;/ejb-ql&gt;
- * 	  &lt;/query&gt;
- * 
- * 	  
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.QueryMethod#getMethodName <em>Method Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.QueryMethod#getMethodParams <em>Method Params</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.QueryMethod#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getQueryMethod()
- * @extends JavaEEObject
- * @generated
- */
-public interface QueryMethod extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Method Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Method Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Method Name</em>' attribute.
-	 * @see #setMethodName(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getQueryMethod_MethodName()
-	 * @generated
-	 */
-	String getMethodName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.QueryMethod#getMethodName <em>Method Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Method Name</em>' attribute.
-	 * @see #getMethodName()
-	 * @generated
-	 */
-	void setMethodName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Method Params</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Method Params</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Method Params</em>' containment reference.
-	 * @see #setMethodParams(MethodParams)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getQueryMethod_MethodParams()
-	 * @generated
-	 */
-	MethodParams getMethodParams();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.QueryMethod#getMethodParams <em>Method Params</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Method Params</em>' containment reference.
-	 * @see #getMethodParams()
-	 * @generated
-	 */
-	void setMethodParams(MethodParams value);
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getQueryMethod_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.QueryMethod#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // QueryMethod
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/RelationshipRoleSourceType.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/RelationshipRoleSourceType.java
deleted file mode 100644
index 4f7d67336..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/RelationshipRoleSourceType.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb;
-
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Relationship Role Source Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The relationship-role-sourceType designates the source of a
- * 	role that participates in a relationship. A
- * 	relationship-role-sourceType is used by
- * 	relationship-role-source elements to uniquely identify an
- * 	entity bean.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.RelationshipRoleSourceType#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.RelationshipRoleSourceType#getEjbName <em>Ejb Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.RelationshipRoleSourceType#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getRelationshipRoleSourceType()
- * @extends JavaEEObject
- * @generated
- */
-public interface RelationshipRoleSourceType extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getRelationshipRoleSourceType_Descriptions()
-	 * @generated
-	 */
-	List getDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>Ejb Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ejb Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ejb Name</em>' attribute.
-	 * @see #setEjbName(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getRelationshipRoleSourceType_EjbName()
-	 * @generated
-	 */
-	String getEjbName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.RelationshipRoleSourceType#getEjbName <em>Ejb Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Ejb Name</em>' attribute.
-	 * @see #getEjbName()
-	 * @generated
-	 */
-	void setEjbName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getRelationshipRoleSourceType_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.RelationshipRoleSourceType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // RelationshipRoleSourceType
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/Relationships.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/Relationships.java
deleted file mode 100644
index af6be4328..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/Relationships.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb;
-
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Relationships</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The relationshipsType describes the relationships in
- * 	which entity beans with container-managed persistence
- * 	participate. The relationshipsType contains an optional
- * 	description; and a list of ejb-relation elements, which
- * 	specify the container managed relationships.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.Relationships#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.Relationships#getEjbRelations <em>Ejb Relations</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.Relationships#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getRelationships()
- * @extends JavaEEObject
- * @generated
- */
-public interface Relationships extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getRelationships_Descriptions()
-	 * @generated
-	 */
-	List getDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>Ejb Relations</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.ejb.EJBRelation}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ejb Relations</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ejb Relations</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getRelationships_EjbRelations()
-	 * @generated
-	 */
-	List getEjbRelations();
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getRelationships_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.Relationships#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // Relationships
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/RemoveMethodType.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/RemoveMethodType.java
deleted file mode 100644
index f42e418c4..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/RemoveMethodType.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Remove Method Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.RemoveMethodType#getBeanMethod <em>Bean Method</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.RemoveMethodType#isRetainIfException <em>Retain If Exception</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.RemoveMethodType#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getRemoveMethodType()
- * @extends JavaEEObject
- * @generated
- */
-public interface RemoveMethodType extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Bean Method</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Bean Method</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Bean Method</em>' containment reference.
-	 * @see #setBeanMethod(NamedMethodType)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getRemoveMethodType_BeanMethod()
-	 * @generated
-	 */
-	NamedMethodType getBeanMethod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.RemoveMethodType#getBeanMethod <em>Bean Method</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Bean Method</em>' containment reference.
-	 * @see #getBeanMethod()
-	 * @generated
-	 */
-	void setBeanMethod(NamedMethodType value);
-
-	/**
-	 * Returns the value of the '<em><b>Retain If Exception</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Retain If Exception</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Retain If Exception</em>' attribute.
-	 * @see #isSetRetainIfException()
-	 * @see #unsetRetainIfException()
-	 * @see #setRetainIfException(boolean)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getRemoveMethodType_RetainIfException()
-	 * @generated
-	 */
-	boolean isRetainIfException();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.RemoveMethodType#isRetainIfException <em>Retain If Exception</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Retain If Exception</em>' attribute.
-	 * @see #isSetRetainIfException()
-	 * @see #unsetRetainIfException()
-	 * @see #isRetainIfException()
-	 * @generated
-	 */
-	void setRetainIfException(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.javaee.ejb.RemoveMethodType#isRetainIfException <em>Retain If Exception</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetRetainIfException()
-	 * @see #isRetainIfException()
-	 * @see #setRetainIfException(boolean)
-	 * @generated
-	 */
-	void unsetRetainIfException();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.ejb.RemoveMethodType#isRetainIfException <em>Retain If Exception</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Retain If Exception</em>' attribute is set.
-	 * @see #unsetRetainIfException()
-	 * @see #isRetainIfException()
-	 * @see #setRetainIfException(boolean)
-	 * @generated
-	 */
-	boolean isSetRetainIfException();
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getRemoveMethodType_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.RemoveMethodType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // RemoveMethodType
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/ResultTypeMappingType.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/ResultTypeMappingType.java
deleted file mode 100644
index 0f8578665..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/ResultTypeMappingType.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Result Type Mapping Type</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The result-type-mappingType is used in the query element to
- * 	specify whether an abstract schema type returned by a query
- * 	for a select method is to be mapped to an EJBLocalObject or
- * 	EJBObject type.
- * 
- * 	The value must be one of the following:
- * 
- * 	    Local
- * 	    Remote
- * 
- *       
- * <!-- end-model-doc -->
- * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getResultTypeMappingType()
- * @generated
- */
-public final class ResultTypeMappingType extends AbstractEnumerator {
-	/**
-	 * The '<em><b>Local</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Local</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #LOCAL_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int LOCAL = 0;
-
-	/**
-	 * The '<em><b>Remote</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Remote</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #REMOTE_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int REMOTE = 1;
-
-	/**
-	 * The '<em><b>Local</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #LOCAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final ResultTypeMappingType LOCAL_LITERAL = new ResultTypeMappingType(LOCAL, "Local", "Local"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Remote</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #REMOTE
-	 * @generated
-	 * @ordered
-	 */
-	public static final ResultTypeMappingType REMOTE_LITERAL = new ResultTypeMappingType(REMOTE, "Remote", "Remote"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * An array of all the '<em><b>Result Type Mapping Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final ResultTypeMappingType[] VALUES_ARRAY =
-		new ResultTypeMappingType[] {
-			LOCAL_LITERAL,
-			REMOTE_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Result Type Mapping Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Result Type Mapping Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ResultTypeMappingType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ResultTypeMappingType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Result Type Mapping Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ResultTypeMappingType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ResultTypeMappingType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Result Type Mapping Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ResultTypeMappingType get(int value) {
-		switch (value) {
-			case LOCAL: return LOCAL_LITERAL;
-			case REMOTE: return REMOTE_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private ResultTypeMappingType(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //ResultTypeMappingType
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/SecurityIdentityType.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/SecurityIdentityType.java
deleted file mode 100644
index f7f584e87..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/SecurityIdentityType.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb;
-
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.EmptyType;
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.javaee.core.RunAs;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Security Identity Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The security-identityType specifies whether the caller's
- * 	security identity is to be used for the execution of the
- * 	methods of the enterprise bean or whether a specific run-as
- * 	identity is to be used. It contains an optional description
- * 	and a specification of the security identity to be used.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.SecurityIdentityType#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.SecurityIdentityType#getUseCallerIdentity <em>Use Caller Identity</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.SecurityIdentityType#getRunAs <em>Run As</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.SecurityIdentityType#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSecurityIdentityType()
- * @extends JavaEEObject
- * @generated
- */
-public interface SecurityIdentityType extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSecurityIdentityType_Descriptions()
-	 * @generated
-	 */
-	List getDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>Use Caller Identity</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	      The use-caller-identity element specifies that
-	 * 	      the caller's security identity be used as the
-	 * 	      security identity for the execution of the
-	 * 	      enterprise bean's methods.
-	 * 
-	 * 	    
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Use Caller Identity</em>' containment reference.
-	 * @see #setUseCallerIdentity(EmptyType)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSecurityIdentityType_UseCallerIdentity()
-	 * @generated
-	 */
-	EmptyType getUseCallerIdentity();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.SecurityIdentityType#getUseCallerIdentity <em>Use Caller Identity</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Use Caller Identity</em>' containment reference.
-	 * @see #getUseCallerIdentity()
-	 * @generated
-	 */
-	void setUseCallerIdentity(EmptyType value);
-
-	/**
-	 * Returns the value of the '<em><b>Run As</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Run As</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Run As</em>' containment reference.
-	 * @see #setRunAs(RunAs)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSecurityIdentityType_RunAs()
-	 * @generated
-	 */
-	RunAs getRunAs();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.SecurityIdentityType#getRunAs <em>Run As</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Run As</em>' containment reference.
-	 * @see #getRunAs()
-	 * @generated
-	 */
-	void setRunAs(RunAs value);
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSecurityIdentityType_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.SecurityIdentityType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // SecurityIdentityType
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/SessionBean.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/SessionBean.java
deleted file mode 100644
index 5df205d61..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/SessionBean.java
+++ /dev/null
@@ -1,875 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb;
-
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Session Bean</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The session-beanType declares an session bean. The
- * 	declaration consists of:
- * 
- * 	    - an optional description
- * 	    - an optional display name
- * 	    - an optional icon element that contains a small and a large
- * 	      icon file name
- * 	    - a name assigned to the enterprise bean
- * 	      in the deployment description
- *             - an optional mapped-name element that can be used to provide
- *               vendor-specific deployment information such as the physical
- *               jndi-name of the session bean's remote home/business interface.
- *               This element is not required to be supported by all
- *               implementations. Any use of this element is non-portable.
- *             - the names of all the remote or local business interfaces,
- *               if any
- * 	    - the names of the session bean's remote home and
- * 	      remote interfaces, if any
- * 	    - the names of the session bean's local home and
- * 	      local interfaces, if any
- * 	    - the name of the session bean's web service endpoint
- * 	      interface, if any
- * 	    - the session bean's implementation class
- * 	    - the session bean's state management type
- *             - an optional declaration of the session bean's timeout method.
- * 	    - the optional session bean's transaction management type.
- *               If it is not present, it is defaulted to Container.
- *             - an optional list of the session bean class and/or
- *               superclass around-invoke methods.
- * 	    - an optional declaration of the bean's
- * 	      environment entries
- * 	    - an optional declaration of the bean's EJB references
- * 	    - an optional declaration of the bean's local
- * 	      EJB references
- * 	    - an optional declaration of the bean's web
- * 	      service references
- * 	    - an optional declaration of the security role
- * 	      references
- * 	    - an optional declaration of the security identity
- * 	      to be used for the execution of the bean's methods
- * 	    - an optional declaration of the bean's resource
- * 	      manager connection factory references
- * 	    - an optional declaration of the bean's resource
- * 	      environment references.
- * 	    - an optional declaration of the bean's message
- * 	      destination references
- * 
- * 	The elements that are optional are "optional" in the sense
- * 	that they are omitted when if lists represented by them are
- * 	empty.
- * 
- * 	Either both the local-home and the local elements or both
- * 	the home and the remote elements must be specified for the
- * 	session bean.
- * 
- * 	The service-endpoint element may only be specified if the
- * 	bean is a stateless session bean.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getDisplayNames <em>Display Names</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getIcons <em>Icons</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getEjbName <em>Ejb Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getMappedName <em>Mapped Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getHome <em>Home</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getRemote <em>Remote</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getLocalHome <em>Local Home</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getLocal <em>Local</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getBusinessLocals <em>Business Locals</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getBusinessRemotes <em>Business Remotes</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getServiceEndpoint <em>Service Endpoint</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getEjbClass <em>Ejb Class</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getSessionType <em>Session Type</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getTimeoutMethod <em>Timeout Method</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getInitMethods <em>Init Methods</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getRemoveMethods <em>Remove Methods</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getTransactionType <em>Transaction Type</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getAroundInvokes <em>Around Invokes</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getEnvEntries <em>Env Entries</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getEjbRefs <em>Ejb Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getEjbLocalRefs <em>Ejb Local Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getServiceRefs <em>Service Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getResourceRefs <em>Resource Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getResourceEnvRefs <em>Resource Env Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getMessageDestinationRefs <em>Message Destination Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getPersistenceContextRefs <em>Persistence Context Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getPersistenceUnitRefs <em>Persistence Unit Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getPostConstructs <em>Post Constructs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getPreDestroys <em>Pre Destroys</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getPostActivates <em>Post Activates</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getPrePassivates <em>Pre Passivates</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getSecurityRoleRefs <em>Security Role Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getSecurityIdentities <em>Security Identities</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean()
- * @extends JavaEEObject
- * @generated
- */
-public interface SessionBean extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_Descriptions()
-	 * @generated
-	 */
-	List getDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>Display Names</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.DisplayName}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Names</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Names</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_DisplayNames()
-	 * @generated
-	 */
-	List getDisplayNames();
-
-	/**
-	 * Returns the value of the '<em><b>Icons</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Icon}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Icons</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Icons</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_Icons()
-	 * @generated
-	 */
-	List getIcons();
-
-	/**
-	 * Returns the value of the '<em><b>Ejb Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ejb Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ejb Name</em>' attribute.
-	 * @see #setEjbName(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_EjbName()
-	 * @generated
-	 */
-	String getEjbName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.SessionBean#getEjbName <em>Ejb Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Ejb Name</em>' attribute.
-	 * @see #getEjbName()
-	 * @generated
-	 */
-	void setEjbName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Mapped Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Mapped Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Mapped Name</em>' attribute.
-	 * @see #setMappedName(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_MappedName()
-	 * @generated
-	 */
-	String getMappedName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.SessionBean#getMappedName <em>Mapped Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Mapped Name</em>' attribute.
-	 * @see #getMappedName()
-	 * @generated
-	 */
-	void setMappedName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Home</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Home</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Home</em>' attribute.
-	 * @see #setHome(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_Home()
-	 * @generated
-	 */
-	String getHome();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.SessionBean#getHome <em>Home</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Home</em>' attribute.
-	 * @see #getHome()
-	 * @generated
-	 */
-	void setHome(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Remote</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Remote</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Remote</em>' attribute.
-	 * @see #setRemote(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_Remote()
-	 * @generated
-	 */
-	String getRemote();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.SessionBean#getRemote <em>Remote</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Remote</em>' attribute.
-	 * @see #getRemote()
-	 * @generated
-	 */
-	void setRemote(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Local Home</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Local Home</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Local Home</em>' attribute.
-	 * @see #setLocalHome(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_LocalHome()
-	 * @generated
-	 */
-	String getLocalHome();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.SessionBean#getLocalHome <em>Local Home</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Local Home</em>' attribute.
-	 * @see #getLocalHome()
-	 * @generated
-	 */
-	void setLocalHome(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Local</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Local</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Local</em>' attribute.
-	 * @see #setLocal(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_Local()
-	 * @generated
-	 */
-	String getLocal();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.SessionBean#getLocal <em>Local</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Local</em>' attribute.
-	 * @see #getLocal()
-	 * @generated
-	 */
-	void setLocal(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Business Locals</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Business Locals</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Business Locals</em>' attribute list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_BusinessLocals()
-	 * @generated
-	 */
-	List getBusinessLocals();
-
-	/**
-	 * Returns the value of the '<em><b>Business Remotes</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Business Remotes</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Business Remotes</em>' attribute list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_BusinessRemotes()
-	 * @generated
-	 */
-	List getBusinessRemotes();
-
-	/**
-	 * Returns the value of the '<em><b>Service Endpoint</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The service-endpoint element contains the
-	 * 	    fully-qualified name of the enterprise bean's web
-	 * 	    service endpoint interface. The service-endpoint
-	 * 	    element may only be specified for a stateless
-	 * 	    session bean. The specified interface must be a
-	 * 	    valid JAX-RPC service endpoint interface.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Service Endpoint</em>' attribute.
-	 * @see #setServiceEndpoint(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_ServiceEndpoint()
-	 * @generated
-	 */
-	String getServiceEndpoint();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.SessionBean#getServiceEndpoint <em>Service Endpoint</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Service Endpoint</em>' attribute.
-	 * @see #getServiceEndpoint()
-	 * @generated
-	 */
-	void setServiceEndpoint(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Ejb Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 *              The ejb-class element specifies the fully qualified name
-	 *              of the bean class for this ejb.  It is required unless
-	 *              there is a component-defining annotation for the same
-	 *              ejb-name.
-	 * 
-	 *           
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Ejb Class</em>' attribute.
-	 * @see #setEjbClass(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_EjbClass()
-	 * @generated
-	 */
-	String getEjbClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.SessionBean#getEjbClass <em>Ejb Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Ejb Class</em>' attribute.
-	 * @see #getEjbClass()
-	 * @generated
-	 */
-	void setEjbClass(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Session Type</b></em>' attribute.
-	 * The default value is <code>"Stateful"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.ejb.SessionType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Session Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Session Type</em>' attribute.
-	 * @see org.eclipse.jst.javaee.ejb.SessionType
-	 * @see #isSetSessionType()
-	 * @see #unsetSessionType()
-	 * @see #setSessionType(SessionType)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_SessionType()
-	 * @generated
-	 */
-	SessionType getSessionType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.SessionBean#getSessionType <em>Session Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Session Type</em>' attribute.
-	 * @see org.eclipse.jst.javaee.ejb.SessionType
-	 * @see #isSetSessionType()
-	 * @see #unsetSessionType()
-	 * @see #getSessionType()
-	 * @generated
-	 */
-	void setSessionType(SessionType value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.javaee.ejb.SessionBean#getSessionType <em>Session Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetSessionType()
-	 * @see #getSessionType()
-	 * @see #setSessionType(SessionType)
-	 * @generated
-	 */
-	void unsetSessionType();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.ejb.SessionBean#getSessionType <em>Session Type</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Session Type</em>' attribute is set.
-	 * @see #unsetSessionType()
-	 * @see #getSessionType()
-	 * @see #setSessionType(SessionType)
-	 * @generated
-	 */
-	boolean isSetSessionType();
-
-	/**
-	 * Returns the value of the '<em><b>Timeout Method</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Timeout Method</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Timeout Method</em>' containment reference.
-	 * @see #setTimeoutMethod(NamedMethodType)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_TimeoutMethod()
-	 * @generated
-	 */
-	NamedMethodType getTimeoutMethod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.SessionBean#getTimeoutMethod <em>Timeout Method</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Timeout Method</em>' containment reference.
-	 * @see #getTimeoutMethod()
-	 * @generated
-	 */
-	void setTimeoutMethod(NamedMethodType value);
-
-	/**
-	 * Returns the value of the '<em><b>Init Methods</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.ejb.InitMethodType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The init-method element specifies the mappings for
-	 * 	    EJB 2.x style create methods for an EJB 3.0 bean.
-	 * 	    This element can only be specified for stateful
-	 *             session beans.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Init Methods</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_InitMethods()
-	 * @generated
-	 */
-	List getInitMethods();
-
-	/**
-	 * Returns the value of the '<em><b>Remove Methods</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.ejb.RemoveMethodType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The remove-method element specifies the mappings for
-	 * 	    EJB 2.x style remove methods for an EJB 3.0 bean.
-	 * 	    This element can only be specified for stateful
-	 *             session beans.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Remove Methods</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_RemoveMethods()
-	 * @generated
-	 */
-	List getRemoveMethods();
-
-	/**
-	 * Returns the value of the '<em><b>Transaction Type</b></em>' attribute.
-	 * The default value is <code>"Bean"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.ejb.TransactionType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Transaction Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Transaction Type</em>' attribute.
-	 * @see org.eclipse.jst.javaee.ejb.TransactionType
-	 * @see #isSetTransactionType()
-	 * @see #unsetTransactionType()
-	 * @see #setTransactionType(TransactionType)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_TransactionType()
-	 * @generated
-	 */
-	TransactionType getTransactionType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.SessionBean#getTransactionType <em>Transaction Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Transaction Type</em>' attribute.
-	 * @see org.eclipse.jst.javaee.ejb.TransactionType
-	 * @see #isSetTransactionType()
-	 * @see #unsetTransactionType()
-	 * @see #getTransactionType()
-	 * @generated
-	 */
-	void setTransactionType(TransactionType value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.javaee.ejb.SessionBean#getTransactionType <em>Transaction Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetTransactionType()
-	 * @see #getTransactionType()
-	 * @see #setTransactionType(TransactionType)
-	 * @generated
-	 */
-	void unsetTransactionType();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.ejb.SessionBean#getTransactionType <em>Transaction Type</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Transaction Type</em>' attribute is set.
-	 * @see #unsetTransactionType()
-	 * @see #getTransactionType()
-	 * @see #setTransactionType(TransactionType)
-	 * @generated
-	 */
-	boolean isSetTransactionType();
-
-	/**
-	 * Returns the value of the '<em><b>Around Invokes</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.ejb.AroundInvokeType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Around Invokes</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Around Invokes</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_AroundInvokes()
-	 * @generated
-	 */
-	List getAroundInvokes();
-
-	/**
-	 * Returns the value of the '<em><b>Env Entries</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.EnvEntry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Env Entries</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Env Entries</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_EnvEntries()
-	 * @generated
-	 */
-	List getEnvEntries();
-
-	/**
-	 * Returns the value of the '<em><b>Ejb Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.EjbRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ejb Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ejb Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_EjbRefs()
-	 * @generated
-	 */
-	List getEjbRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Ejb Local Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.EjbLocalRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ejb Local Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ejb Local Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_EjbLocalRefs()
-	 * @generated
-	 */
-	List getEjbLocalRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Service Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.ServiceRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Service Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Service Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_ServiceRefs()
-	 * @generated
-	 */
-	List getServiceRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Resource Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.ResourceRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Resource Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Resource Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_ResourceRefs()
-	 * @generated
-	 */
-	List getResourceRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Resource Env Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.ResourceEnvRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Resource Env Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Resource Env Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_ResourceEnvRefs()
-	 * @generated
-	 */
-	List getResourceEnvRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Message Destination Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.MessageDestinationRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Message Destination Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Message Destination Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_MessageDestinationRefs()
-	 * @generated
-	 */
-	List getMessageDestinationRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Persistence Context Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.PersistenceContextRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Persistence Context Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Persistence Context Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_PersistenceContextRefs()
-	 * @generated
-	 */
-	List getPersistenceContextRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Persistence Unit Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.PersistenceUnitRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Persistence Unit Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Persistence Unit Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_PersistenceUnitRefs()
-	 * @generated
-	 */
-	List getPersistenceUnitRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Post Constructs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.LifecycleCallback}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Post Constructs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Post Constructs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_PostConstructs()
-	 * @generated
-	 */
-	List getPostConstructs();
-
-	/**
-	 * Returns the value of the '<em><b>Pre Destroys</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.LifecycleCallback}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Pre Destroys</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Pre Destroys</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_PreDestroys()
-	 * @generated
-	 */
-	List getPreDestroys();
-
-	/**
-	 * Returns the value of the '<em><b>Post Activates</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.LifecycleCallback}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Post Activates</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Post Activates</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_PostActivates()
-	 * @generated
-	 */
-	List getPostActivates();
-
-	/**
-	 * Returns the value of the '<em><b>Pre Passivates</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.LifecycleCallback}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Pre Passivates</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Pre Passivates</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_PrePassivates()
-	 * @generated
-	 */
-	List getPrePassivates();
-
-	/**
-	 * Returns the value of the '<em><b>Security Role Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.SecurityRoleRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Security Role Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Security Role Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_SecurityRoleRefs()
-	 * @generated
-	 */
-	List getSecurityRoleRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Security Identities</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Security Identities</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Security Identities</em>' containment reference.
-	 * @see #setSecurityIdentities(SecurityIdentityType)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_SecurityIdentities()
-	 * @generated
-	 */
-	SecurityIdentityType getSecurityIdentities();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.SessionBean#getSecurityIdentities <em>Security Identities</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Security Identities</em>' containment reference.
-	 * @see #getSecurityIdentities()
-	 * @generated
-	 */
-	void setSecurityIdentities(SecurityIdentityType value);
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.SessionBean#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // SessionBean
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/SessionType.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/SessionType.java
deleted file mode 100644
index a41710c18..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/SessionType.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Session Type</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The session-typeType describes whether the session bean is a
- * 	stateful session or stateless session. It is used by
- * 	session-type elements.
- * 
- * 	The value must be one of the two following:
- * 
- * 	    Stateful
- * 	    Stateless
- * 
- *       
- * <!-- end-model-doc -->
- * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionType()
- * @generated
- */
-public final class SessionType extends AbstractEnumerator {
-	/**
-	 * The '<em><b>Stateful</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Stateful</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #STATEFUL_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int STATEFUL = 0;
-
-	/**
-	 * The '<em><b>Stateless</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Stateless</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #STATELESS_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int STATELESS = 1;
-
-	/**
-	 * The '<em><b>Stateful</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #STATEFUL
-	 * @generated
-	 * @ordered
-	 */
-	public static final SessionType STATEFUL_LITERAL = new SessionType(STATEFUL, "Stateful", "Stateful"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Stateless</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #STATELESS
-	 * @generated
-	 * @ordered
-	 */
-	public static final SessionType STATELESS_LITERAL = new SessionType(STATELESS, "Stateless", "Stateless"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * An array of all the '<em><b>Session Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final SessionType[] VALUES_ARRAY =
-		new SessionType[] {
-			STATEFUL_LITERAL,
-			STATELESS_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Session Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Session Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static SessionType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			SessionType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Session Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static SessionType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			SessionType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Session Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static SessionType get(int value) {
-		switch (value) {
-			case STATEFUL: return STATEFUL_LITERAL;
-			case STATELESS: return STATELESS_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private SessionType(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //SessionType
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/TransactionAttributeType.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/TransactionAttributeType.java
deleted file mode 100644
index 2e1241c66..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/TransactionAttributeType.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Transaction Attribute Type</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The trans-attributeType specifies how the container must
- * 	manage the transaction boundaries when delegating a method
- * 	invocation to an enterprise bean's business method.
- * 
- * 	The value must be one of the following:
- * 
- * 	    NotSupported
- * 	    Supports
- * 	    Required
- * 	    RequiresNew
- * 	    Mandatory
- * 	    Never
- * 
- *       
- * <!-- end-model-doc -->
- * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getTransactionAttributeType()
- * @generated
- */
-public final class TransactionAttributeType extends AbstractEnumerator {
-	/**
-	 * The '<em><b>Not Supported</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Not Supported</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #NOT_SUPPORTED_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int NOT_SUPPORTED = 0;
-
-	/**
-	 * The '<em><b>Supports</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Supports</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SUPPORTS_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SUPPORTS = 1;
-
-	/**
-	 * The '<em><b>Required</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Required</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #REQUIRED_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int REQUIRED = 2;
-
-	/**
-	 * The '<em><b>Requires New</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Requires New</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #REQUIRES_NEW_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int REQUIRES_NEW = 3;
-
-	/**
-	 * The '<em><b>Mandatory</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Mandatory</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #MANDATORY_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int MANDATORY = 4;
-
-	/**
-	 * The '<em><b>Never</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Never</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #NEVER_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int NEVER = 5;
-
-	/**
-	 * The '<em><b>Not Supported</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #NOT_SUPPORTED
-	 * @generated
-	 * @ordered
-	 */
-	public static final TransactionAttributeType NOT_SUPPORTED_LITERAL = new TransactionAttributeType(NOT_SUPPORTED, "NotSupported", "NotSupported"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Supports</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #SUPPORTS
-	 * @generated
-	 * @ordered
-	 */
-	public static final TransactionAttributeType SUPPORTS_LITERAL = new TransactionAttributeType(SUPPORTS, "Supports", "Supports"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Required</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #REQUIRED
-	 * @generated
-	 * @ordered
-	 */
-	public static final TransactionAttributeType REQUIRED_LITERAL = new TransactionAttributeType(REQUIRED, "Required", "Required"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Requires New</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #REQUIRES_NEW
-	 * @generated
-	 * @ordered
-	 */
-	public static final TransactionAttributeType REQUIRES_NEW_LITERAL = new TransactionAttributeType(REQUIRES_NEW, "RequiresNew", "RequiresNew"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Mandatory</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #MANDATORY
-	 * @generated
-	 * @ordered
-	 */
-	public static final TransactionAttributeType MANDATORY_LITERAL = new TransactionAttributeType(MANDATORY, "Mandatory", "Mandatory"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Never</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #NEVER
-	 * @generated
-	 * @ordered
-	 */
-	public static final TransactionAttributeType NEVER_LITERAL = new TransactionAttributeType(NEVER, "Never", "Never"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * An array of all the '<em><b>Transaction Attribute Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final TransactionAttributeType[] VALUES_ARRAY =
-		new TransactionAttributeType[] {
-			NOT_SUPPORTED_LITERAL,
-			SUPPORTS_LITERAL,
-			REQUIRED_LITERAL,
-			REQUIRES_NEW_LITERAL,
-			MANDATORY_LITERAL,
-			NEVER_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Transaction Attribute Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Transaction Attribute Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static TransactionAttributeType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			TransactionAttributeType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Transaction Attribute Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static TransactionAttributeType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			TransactionAttributeType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Transaction Attribute Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static TransactionAttributeType get(int value) {
-		switch (value) {
-			case NOT_SUPPORTED: return NOT_SUPPORTED_LITERAL;
-			case SUPPORTS: return SUPPORTS_LITERAL;
-			case REQUIRED: return REQUIRED_LITERAL;
-			case REQUIRES_NEW: return REQUIRES_NEW_LITERAL;
-			case MANDATORY: return MANDATORY_LITERAL;
-			case NEVER: return NEVER_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private TransactionAttributeType(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //TransactionAttributeType
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/TransactionType.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/TransactionType.java
deleted file mode 100644
index 5a97b1efc..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/TransactionType.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Transaction Type</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The transaction-typeType specifies an enterprise bean's
- * 	transaction management type.
- * 
- * 	The transaction-type must be one of the two following:
- * 
- * 	    Bean
- * 	    Container
- * 
- *       
- * <!-- end-model-doc -->
- * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getTransactionType()
- * @generated
- */
-public final class TransactionType extends AbstractEnumerator {
-	/**
-	 * The '<em><b>Bean</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Bean</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #BEAN_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int BEAN = 0;
-
-	/**
-	 * The '<em><b>Container</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Container</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #CONTAINER_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CONTAINER = 1;
-
-	/**
-	 * The '<em><b>Bean</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #BEAN
-	 * @generated
-	 * @ordered
-	 */
-	public static final TransactionType BEAN_LITERAL = new TransactionType(BEAN, "Bean", "Bean"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Container</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #CONTAINER
-	 * @generated
-	 * @ordered
-	 */
-	public static final TransactionType CONTAINER_LITERAL = new TransactionType(CONTAINER, "Container", "Container"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * An array of all the '<em><b>Transaction Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final TransactionType[] VALUES_ARRAY =
-		new TransactionType[] {
-			BEAN_LITERAL,
-			CONTAINER_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Transaction Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Transaction Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static TransactionType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			TransactionType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Transaction Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static TransactionType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			TransactionType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Transaction Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static TransactionType get(int value) {
-		switch (value) {
-			case BEAN: return BEAN_LITERAL;
-			case CONTAINER: return CONTAINER_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private TransactionType(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //TransactionType
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/ActivationConfigImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/ActivationConfigImpl.java
deleted file mode 100644
index 9d0fd121d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/ActivationConfigImpl.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb.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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jst.javaee.core.Description;
-
-import org.eclipse.jst.javaee.ejb.ActivationConfig;
-import org.eclipse.jst.javaee.ejb.ActivationConfigProperty;
-
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Activation Config</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.ActivationConfigImpl#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.ActivationConfigImpl#getActivationConfigProperties <em>Activation Config Properties</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.ActivationConfigImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ActivationConfigImpl extends EObjectImpl implements ActivationConfig {
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The cached value of the '{@link #getActivationConfigProperties() <em>Activation Config Properties</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActivationConfigProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList activationConfigProperties = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ActivationConfigImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.ACTIVATION_CONFIG;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.ACTIVATION_CONFIG__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getActivationConfigProperties() {
-		if (activationConfigProperties == null) {
-			activationConfigProperties = new EObjectContainmentEList(ActivationConfigProperty.class, this, EjbPackage.ACTIVATION_CONFIG__ACTIVATION_CONFIG_PROPERTIES);
-		}
-		return activationConfigProperties;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ACTIVATION_CONFIG__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.ACTIVATION_CONFIG__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-			case EjbPackage.ACTIVATION_CONFIG__ACTIVATION_CONFIG_PROPERTIES:
-				return ((InternalEList)getActivationConfigProperties()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.ACTIVATION_CONFIG__DESCRIPTIONS:
-				return getDescriptions();
-			case EjbPackage.ACTIVATION_CONFIG__ACTIVATION_CONFIG_PROPERTIES:
-				return getActivationConfigProperties();
-			case EjbPackage.ACTIVATION_CONFIG__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.ACTIVATION_CONFIG__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ACTIVATION_CONFIG__ACTIVATION_CONFIG_PROPERTIES:
-				getActivationConfigProperties().clear();
-				getActivationConfigProperties().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ACTIVATION_CONFIG__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.ACTIVATION_CONFIG__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case EjbPackage.ACTIVATION_CONFIG__ACTIVATION_CONFIG_PROPERTIES:
-				getActivationConfigProperties().clear();
-				return;
-			case EjbPackage.ACTIVATION_CONFIG__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.ACTIVATION_CONFIG__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case EjbPackage.ACTIVATION_CONFIG__ACTIVATION_CONFIG_PROPERTIES:
-				return activationConfigProperties != null && !activationConfigProperties.isEmpty();
-			case EjbPackage.ACTIVATION_CONFIG__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	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();
-	}
-
-} //ActivationConfigImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/ActivationConfigPropertyImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/ActivationConfigPropertyImpl.java
deleted file mode 100644
index afe117e9d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/ActivationConfigPropertyImpl.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb.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.ejb.ActivationConfigProperty;
-
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Activation Config Property</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.ActivationConfigPropertyImpl#getActivationConfigPropertyName <em>Activation Config Property Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.ActivationConfigPropertyImpl#getActivationConfigPropertyValue <em>Activation Config Property Value</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.ActivationConfigPropertyImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ActivationConfigPropertyImpl extends EObjectImpl implements ActivationConfigProperty {
-	/**
-	 * The default value of the '{@link #getActivationConfigPropertyName() <em>Activation Config Property Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActivationConfigPropertyName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ACTIVATION_CONFIG_PROPERTY_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getActivationConfigPropertyName() <em>Activation Config Property Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActivationConfigPropertyName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String activationConfigPropertyName = ACTIVATION_CONFIG_PROPERTY_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getActivationConfigPropertyValue() <em>Activation Config Property Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActivationConfigPropertyValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ACTIVATION_CONFIG_PROPERTY_VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getActivationConfigPropertyValue() <em>Activation Config Property Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActivationConfigPropertyValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String activationConfigPropertyValue = ACTIVATION_CONFIG_PROPERTY_VALUE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ActivationConfigPropertyImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.ACTIVATION_CONFIG_PROPERTY;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getActivationConfigPropertyName() {
-		return activationConfigPropertyName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setActivationConfigPropertyName(String newActivationConfigPropertyName) {
-		String oldActivationConfigPropertyName = activationConfigPropertyName;
-		activationConfigPropertyName = newActivationConfigPropertyName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ACTIVATION_CONFIG_PROPERTY__ACTIVATION_CONFIG_PROPERTY_NAME, oldActivationConfigPropertyName, activationConfigPropertyName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getActivationConfigPropertyValue() {
-		return activationConfigPropertyValue;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setActivationConfigPropertyValue(String newActivationConfigPropertyValue) {
-		String oldActivationConfigPropertyValue = activationConfigPropertyValue;
-		activationConfigPropertyValue = newActivationConfigPropertyValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ACTIVATION_CONFIG_PROPERTY__ACTIVATION_CONFIG_PROPERTY_VALUE, oldActivationConfigPropertyValue, activationConfigPropertyValue));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ACTIVATION_CONFIG_PROPERTY__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.ACTIVATION_CONFIG_PROPERTY__ACTIVATION_CONFIG_PROPERTY_NAME:
-				return getActivationConfigPropertyName();
-			case EjbPackage.ACTIVATION_CONFIG_PROPERTY__ACTIVATION_CONFIG_PROPERTY_VALUE:
-				return getActivationConfigPropertyValue();
-			case EjbPackage.ACTIVATION_CONFIG_PROPERTY__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.ACTIVATION_CONFIG_PROPERTY__ACTIVATION_CONFIG_PROPERTY_NAME:
-				setActivationConfigPropertyName((String)newValue);
-				return;
-			case EjbPackage.ACTIVATION_CONFIG_PROPERTY__ACTIVATION_CONFIG_PROPERTY_VALUE:
-				setActivationConfigPropertyValue((String)newValue);
-				return;
-			case EjbPackage.ACTIVATION_CONFIG_PROPERTY__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.ACTIVATION_CONFIG_PROPERTY__ACTIVATION_CONFIG_PROPERTY_NAME:
-				setActivationConfigPropertyName(ACTIVATION_CONFIG_PROPERTY_NAME_EDEFAULT);
-				return;
-			case EjbPackage.ACTIVATION_CONFIG_PROPERTY__ACTIVATION_CONFIG_PROPERTY_VALUE:
-				setActivationConfigPropertyValue(ACTIVATION_CONFIG_PROPERTY_VALUE_EDEFAULT);
-				return;
-			case EjbPackage.ACTIVATION_CONFIG_PROPERTY__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.ACTIVATION_CONFIG_PROPERTY__ACTIVATION_CONFIG_PROPERTY_NAME:
-				return ACTIVATION_CONFIG_PROPERTY_NAME_EDEFAULT == null ? activationConfigPropertyName != null : !ACTIVATION_CONFIG_PROPERTY_NAME_EDEFAULT.equals(activationConfigPropertyName);
-			case EjbPackage.ACTIVATION_CONFIG_PROPERTY__ACTIVATION_CONFIG_PROPERTY_VALUE:
-				return ACTIVATION_CONFIG_PROPERTY_VALUE_EDEFAULT == null ? activationConfigPropertyValue != null : !ACTIVATION_CONFIG_PROPERTY_VALUE_EDEFAULT.equals(activationConfigPropertyValue);
-			case EjbPackage.ACTIVATION_CONFIG_PROPERTY__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (activationConfigPropertyName: "); //$NON-NLS-1$
-		result.append(activationConfigPropertyName);
-		result.append(", activationConfigPropertyValue: "); //$NON-NLS-1$
-		result.append(activationConfigPropertyValue);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ActivationConfigPropertyImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/ApplicationExceptionImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/ApplicationExceptionImpl.java
deleted file mode 100644
index c557693c5..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/ApplicationExceptionImpl.java
+++ /dev/null
@@ -1,308 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb.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.ejb.ApplicationException;
-
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Application Exception</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.ApplicationExceptionImpl#getExceptionClass <em>Exception Class</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.ApplicationExceptionImpl#isRollback <em>Rollback</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.ApplicationExceptionImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ApplicationExceptionImpl extends EObjectImpl implements ApplicationException {
-	/**
-	 * The default value of the '{@link #getExceptionClass() <em>Exception Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExceptionClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EXCEPTION_CLASS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getExceptionClass() <em>Exception Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExceptionClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected String exceptionClass = EXCEPTION_CLASS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isRollback() <em>Rollback</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isRollback()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean ROLLBACK_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isRollback() <em>Rollback</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isRollback()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean rollback = ROLLBACK_EDEFAULT;
-
-	/**
-	 * This is true if the Rollback attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean rollbackESet = false;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ApplicationExceptionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.APPLICATION_EXCEPTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getExceptionClass() {
-		return exceptionClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setExceptionClass(String newExceptionClass) {
-		String oldExceptionClass = exceptionClass;
-		exceptionClass = newExceptionClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.APPLICATION_EXCEPTION__EXCEPTION_CLASS, oldExceptionClass, exceptionClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isRollback() {
-		return rollback;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRollback(boolean newRollback) {
-		boolean oldRollback = rollback;
-		rollback = newRollback;
-		boolean oldRollbackESet = rollbackESet;
-		rollbackESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.APPLICATION_EXCEPTION__ROLLBACK, oldRollback, rollback, !oldRollbackESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetRollback() {
-		boolean oldRollback = rollback;
-		boolean oldRollbackESet = rollbackESet;
-		rollback = ROLLBACK_EDEFAULT;
-		rollbackESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.APPLICATION_EXCEPTION__ROLLBACK, oldRollback, ROLLBACK_EDEFAULT, oldRollbackESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetRollback() {
-		return rollbackESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.APPLICATION_EXCEPTION__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.APPLICATION_EXCEPTION__EXCEPTION_CLASS:
-				return getExceptionClass();
-			case EjbPackage.APPLICATION_EXCEPTION__ROLLBACK:
-				return isRollback() ? Boolean.TRUE : Boolean.FALSE;
-			case EjbPackage.APPLICATION_EXCEPTION__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.APPLICATION_EXCEPTION__EXCEPTION_CLASS:
-				setExceptionClass((String)newValue);
-				return;
-			case EjbPackage.APPLICATION_EXCEPTION__ROLLBACK:
-				setRollback(((Boolean)newValue).booleanValue());
-				return;
-			case EjbPackage.APPLICATION_EXCEPTION__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.APPLICATION_EXCEPTION__EXCEPTION_CLASS:
-				setExceptionClass(EXCEPTION_CLASS_EDEFAULT);
-				return;
-			case EjbPackage.APPLICATION_EXCEPTION__ROLLBACK:
-				unsetRollback();
-				return;
-			case EjbPackage.APPLICATION_EXCEPTION__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.APPLICATION_EXCEPTION__EXCEPTION_CLASS:
-				return EXCEPTION_CLASS_EDEFAULT == null ? exceptionClass != null : !EXCEPTION_CLASS_EDEFAULT.equals(exceptionClass);
-			case EjbPackage.APPLICATION_EXCEPTION__ROLLBACK:
-				return isSetRollback();
-			case EjbPackage.APPLICATION_EXCEPTION__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (exceptionClass: "); //$NON-NLS-1$
-		result.append(exceptionClass);
-		result.append(", rollback: "); //$NON-NLS-1$
-		if (rollbackESet) result.append(rollback); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ApplicationExceptionImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/AroundInvokeTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/AroundInvokeTypeImpl.java
deleted file mode 100644
index df1ce75f8..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/AroundInvokeTypeImpl.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb.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.ejb.AroundInvokeType;
-
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Around Invoke Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.AroundInvokeTypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.AroundInvokeTypeImpl#getMethodName <em>Method Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class AroundInvokeTypeImpl extends EObjectImpl implements AroundInvokeType {
-	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getClass_()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CLASS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getClass_()
-	 * @generated
-	 * @ordered
-	 */
-	protected String class_ = CLASS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getMethodName() <em>Method Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMethodName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String METHOD_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMethodName() <em>Method Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMethodName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String methodName = METHOD_NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AroundInvokeTypeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.AROUND_INVOKE_TYPE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getClass_() {
-		return class_;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setClass(String newClass) {
-		String oldClass = class_;
-		class_ = newClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.AROUND_INVOKE_TYPE__CLASS, oldClass, class_));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getMethodName() {
-		return methodName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMethodName(String newMethodName) {
-		String oldMethodName = methodName;
-		methodName = newMethodName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.AROUND_INVOKE_TYPE__METHOD_NAME, oldMethodName, methodName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.AROUND_INVOKE_TYPE__CLASS:
-				return getClass_();
-			case EjbPackage.AROUND_INVOKE_TYPE__METHOD_NAME:
-				return getMethodName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.AROUND_INVOKE_TYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case EjbPackage.AROUND_INVOKE_TYPE__METHOD_NAME:
-				setMethodName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.AROUND_INVOKE_TYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case EjbPackage.AROUND_INVOKE_TYPE__METHOD_NAME:
-				setMethodName(METHOD_NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.AROUND_INVOKE_TYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case EjbPackage.AROUND_INVOKE_TYPE__METHOD_NAME:
-				return METHOD_NAME_EDEFAULT == null ? methodName != null : !METHOD_NAME_EDEFAULT.equals(methodName);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (class: "); //$NON-NLS-1$
-		result.append(class_);
-		result.append(", methodName: "); //$NON-NLS-1$
-		result.append(methodName);
-		result.append(')');
-		return result.toString();
-	}
-
-} //AroundInvokeTypeImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/AssemblyDescriptorImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/AssemblyDescriptorImpl.java
deleted file mode 100644
index b907a61a8..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/AssemblyDescriptorImpl.java
+++ /dev/null
@@ -1,477 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb.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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jst.javaee.core.MessageDestination;
-import org.eclipse.jst.javaee.core.SecurityRole;
-
-import org.eclipse.jst.javaee.ejb.ApplicationException;
-import org.eclipse.jst.javaee.ejb.AssemblyDescriptor;
-import org.eclipse.jst.javaee.ejb.ContainerTransactionType;
-import org.eclipse.jst.javaee.ejb.ExcludeList;
-import org.eclipse.jst.javaee.ejb.InterceptorBindingType;
-import org.eclipse.jst.javaee.ejb.MethodPermission;
-
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Assembly Descriptor</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.AssemblyDescriptorImpl#getSecurityRoles <em>Security Roles</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.AssemblyDescriptorImpl#getMethodPermissions <em>Method Permissions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.AssemblyDescriptorImpl#getContainerTransactions <em>Container Transactions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.AssemblyDescriptorImpl#getInterceptorBindings <em>Interceptor Bindings</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.AssemblyDescriptorImpl#getMessageDestinations <em>Message Destinations</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.AssemblyDescriptorImpl#getExcludeList <em>Exclude List</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.AssemblyDescriptorImpl#getApplicationExceptions <em>Application Exceptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.AssemblyDescriptorImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class AssemblyDescriptorImpl extends EObjectImpl implements AssemblyDescriptor {
-	/**
-	 * The cached value of the '{@link #getSecurityRoles() <em>Security Roles</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSecurityRoles()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList securityRoles = null;
-
-	/**
-	 * The cached value of the '{@link #getMethodPermissions() <em>Method Permissions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMethodPermissions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList methodPermissions = null;
-
-	/**
-	 * The cached value of the '{@link #getContainerTransactions() <em>Container Transactions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getContainerTransactions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList containerTransactions = null;
-
-	/**
-	 * The cached value of the '{@link #getInterceptorBindings() <em>Interceptor Bindings</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInterceptorBindings()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList interceptorBindings = null;
-
-	/**
-	 * The cached value of the '{@link #getMessageDestinations() <em>Message Destinations</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessageDestinations()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList messageDestinations = null;
-
-	/**
-	 * The cached value of the '{@link #getExcludeList() <em>Exclude List</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExcludeList()
-	 * @generated
-	 * @ordered
-	 */
-	protected ExcludeList excludeList = null;
-
-	/**
-	 * The cached value of the '{@link #getApplicationExceptions() <em>Application Exceptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getApplicationExceptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList applicationExceptions = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AssemblyDescriptorImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.ASSEMBLY_DESCRIPTOR;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getSecurityRoles() {
-		if (securityRoles == null) {
-			securityRoles = new EObjectContainmentEList(SecurityRole.class, this, EjbPackage.ASSEMBLY_DESCRIPTOR__SECURITY_ROLES);
-		}
-		return securityRoles;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getMethodPermissions() {
-		if (methodPermissions == null) {
-			methodPermissions = new EObjectContainmentEList(MethodPermission.class, this, EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_PERMISSIONS);
-		}
-		return methodPermissions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getContainerTransactions() {
-		if (containerTransactions == null) {
-			containerTransactions = new EObjectContainmentEList(ContainerTransactionType.class, this, EjbPackage.ASSEMBLY_DESCRIPTOR__CONTAINER_TRANSACTIONS);
-		}
-		return containerTransactions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getInterceptorBindings() {
-		if (interceptorBindings == null) {
-			interceptorBindings = new EObjectContainmentEList(InterceptorBindingType.class, this, EjbPackage.ASSEMBLY_DESCRIPTOR__INTERCEPTOR_BINDINGS);
-		}
-		return interceptorBindings;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getMessageDestinations() {
-		if (messageDestinations == null) {
-			messageDestinations = new EObjectContainmentEList(MessageDestination.class, this, EjbPackage.ASSEMBLY_DESCRIPTOR__MESSAGE_DESTINATIONS);
-		}
-		return messageDestinations;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExcludeList getExcludeList() {
-		return excludeList;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetExcludeList(ExcludeList newExcludeList, NotificationChain msgs) {
-		ExcludeList oldExcludeList = excludeList;
-		excludeList = newExcludeList;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.ASSEMBLY_DESCRIPTOR__EXCLUDE_LIST, oldExcludeList, newExcludeList);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setExcludeList(ExcludeList newExcludeList) {
-		if (newExcludeList != excludeList) {
-			NotificationChain msgs = null;
-			if (excludeList != null)
-				msgs = ((InternalEObject)excludeList).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.ASSEMBLY_DESCRIPTOR__EXCLUDE_LIST, null, msgs);
-			if (newExcludeList != null)
-				msgs = ((InternalEObject)newExcludeList).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EjbPackage.ASSEMBLY_DESCRIPTOR__EXCLUDE_LIST, null, msgs);
-			msgs = basicSetExcludeList(newExcludeList, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ASSEMBLY_DESCRIPTOR__EXCLUDE_LIST, newExcludeList, newExcludeList));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getApplicationExceptions() {
-		if (applicationExceptions == null) {
-			applicationExceptions = new EObjectContainmentEList(ApplicationException.class, this, EjbPackage.ASSEMBLY_DESCRIPTOR__APPLICATION_EXCEPTIONS);
-		}
-		return applicationExceptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ASSEMBLY_DESCRIPTOR__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__SECURITY_ROLES:
-				return ((InternalEList)getSecurityRoles()).basicRemove(otherEnd, msgs);
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_PERMISSIONS:
-				return ((InternalEList)getMethodPermissions()).basicRemove(otherEnd, msgs);
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__CONTAINER_TRANSACTIONS:
-				return ((InternalEList)getContainerTransactions()).basicRemove(otherEnd, msgs);
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__INTERCEPTOR_BINDINGS:
-				return ((InternalEList)getInterceptorBindings()).basicRemove(otherEnd, msgs);
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__MESSAGE_DESTINATIONS:
-				return ((InternalEList)getMessageDestinations()).basicRemove(otherEnd, msgs);
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__EXCLUDE_LIST:
-				return basicSetExcludeList(null, msgs);
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__APPLICATION_EXCEPTIONS:
-				return ((InternalEList)getApplicationExceptions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__SECURITY_ROLES:
-				return getSecurityRoles();
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_PERMISSIONS:
-				return getMethodPermissions();
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__CONTAINER_TRANSACTIONS:
-				return getContainerTransactions();
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__INTERCEPTOR_BINDINGS:
-				return getInterceptorBindings();
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__MESSAGE_DESTINATIONS:
-				return getMessageDestinations();
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__EXCLUDE_LIST:
-				return getExcludeList();
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__APPLICATION_EXCEPTIONS:
-				return getApplicationExceptions();
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__SECURITY_ROLES:
-				getSecurityRoles().clear();
-				getSecurityRoles().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_PERMISSIONS:
-				getMethodPermissions().clear();
-				getMethodPermissions().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__CONTAINER_TRANSACTIONS:
-				getContainerTransactions().clear();
-				getContainerTransactions().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__INTERCEPTOR_BINDINGS:
-				getInterceptorBindings().clear();
-				getInterceptorBindings().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__MESSAGE_DESTINATIONS:
-				getMessageDestinations().clear();
-				getMessageDestinations().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__EXCLUDE_LIST:
-				setExcludeList((ExcludeList)newValue);
-				return;
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__APPLICATION_EXCEPTIONS:
-				getApplicationExceptions().clear();
-				getApplicationExceptions().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__SECURITY_ROLES:
-				getSecurityRoles().clear();
-				return;
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_PERMISSIONS:
-				getMethodPermissions().clear();
-				return;
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__CONTAINER_TRANSACTIONS:
-				getContainerTransactions().clear();
-				return;
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__INTERCEPTOR_BINDINGS:
-				getInterceptorBindings().clear();
-				return;
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__MESSAGE_DESTINATIONS:
-				getMessageDestinations().clear();
-				return;
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__EXCLUDE_LIST:
-				setExcludeList((ExcludeList)null);
-				return;
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__APPLICATION_EXCEPTIONS:
-				getApplicationExceptions().clear();
-				return;
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__SECURITY_ROLES:
-				return securityRoles != null && !securityRoles.isEmpty();
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_PERMISSIONS:
-				return methodPermissions != null && !methodPermissions.isEmpty();
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__CONTAINER_TRANSACTIONS:
-				return containerTransactions != null && !containerTransactions.isEmpty();
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__INTERCEPTOR_BINDINGS:
-				return interceptorBindings != null && !interceptorBindings.isEmpty();
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__MESSAGE_DESTINATIONS:
-				return messageDestinations != null && !messageDestinations.isEmpty();
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__EXCLUDE_LIST:
-				return excludeList != null;
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__APPLICATION_EXCEPTIONS:
-				return applicationExceptions != null && !applicationExceptions.isEmpty();
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	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();
-	}
-
-} //AssemblyDescriptorImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/CMPFieldImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/CMPFieldImpl.java
deleted file mode 100644
index 419fb9fc9..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/CMPFieldImpl.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb.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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jst.javaee.core.Description;
-
-import org.eclipse.jst.javaee.ejb.CMPField;
-
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>CMP Field</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.CMPFieldImpl#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.CMPFieldImpl#getFieldName <em>Field Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.CMPFieldImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class CMPFieldImpl extends EObjectImpl implements CMPField {
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The default value of the '{@link #getFieldName() <em>Field Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFieldName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String FIELD_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getFieldName() <em>Field Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFieldName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String fieldName = FIELD_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CMPFieldImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.CMP_FIELD;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.CMP_FIELD__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getFieldName() {
-		return fieldName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFieldName(String newFieldName) {
-		String oldFieldName = fieldName;
-		fieldName = newFieldName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.CMP_FIELD__FIELD_NAME, oldFieldName, fieldName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.CMP_FIELD__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.CMP_FIELD__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.CMP_FIELD__DESCRIPTIONS:
-				return getDescriptions();
-			case EjbPackage.CMP_FIELD__FIELD_NAME:
-				return getFieldName();
-			case EjbPackage.CMP_FIELD__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.CMP_FIELD__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case EjbPackage.CMP_FIELD__FIELD_NAME:
-				setFieldName((String)newValue);
-				return;
-			case EjbPackage.CMP_FIELD__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.CMP_FIELD__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case EjbPackage.CMP_FIELD__FIELD_NAME:
-				setFieldName(FIELD_NAME_EDEFAULT);
-				return;
-			case EjbPackage.CMP_FIELD__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.CMP_FIELD__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case EjbPackage.CMP_FIELD__FIELD_NAME:
-				return FIELD_NAME_EDEFAULT == null ? fieldName != null : !FIELD_NAME_EDEFAULT.equals(fieldName);
-			case EjbPackage.CMP_FIELD__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (fieldName: "); //$NON-NLS-1$
-		result.append(fieldName);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //CMPFieldImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/CMRFieldImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/CMRFieldImpl.java
deleted file mode 100644
index 02921bad2..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/CMRFieldImpl.java
+++ /dev/null
@@ -1,368 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb.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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jst.javaee.core.Description;
-
-import org.eclipse.jst.javaee.ejb.CMRField;
-import org.eclipse.jst.javaee.ejb.CMRFieldType;
-
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>CMR Field</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.CMRFieldImpl#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.CMRFieldImpl#getCmrFieldName <em>Cmr Field Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.CMRFieldImpl#getCmrFieldType <em>Cmr Field Type</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.CMRFieldImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class CMRFieldImpl extends EObjectImpl implements CMRField {
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The default value of the '{@link #getCmrFieldName() <em>Cmr Field Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCmrFieldName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CMR_FIELD_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCmrFieldName() <em>Cmr Field Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCmrFieldName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String cmrFieldName = CMR_FIELD_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCmrFieldType() <em>Cmr Field Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCmrFieldType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final CMRFieldType CMR_FIELD_TYPE_EDEFAULT = CMRFieldType.JAVA_UTIL_COLLECTION_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getCmrFieldType() <em>Cmr Field Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCmrFieldType()
-	 * @generated
-	 * @ordered
-	 */
-	protected CMRFieldType cmrFieldType = CMR_FIELD_TYPE_EDEFAULT;
-
-	/**
-	 * This is true if the Cmr Field Type attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean cmrFieldTypeESet = false;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CMRFieldImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.CMR_FIELD;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.CMR_FIELD__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getCmrFieldName() {
-		return cmrFieldName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCmrFieldName(String newCmrFieldName) {
-		String oldCmrFieldName = cmrFieldName;
-		cmrFieldName = newCmrFieldName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.CMR_FIELD__CMR_FIELD_NAME, oldCmrFieldName, cmrFieldName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CMRFieldType getCmrFieldType() {
-		return cmrFieldType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCmrFieldType(CMRFieldType newCmrFieldType) {
-		CMRFieldType oldCmrFieldType = cmrFieldType;
-		cmrFieldType = newCmrFieldType == null ? CMR_FIELD_TYPE_EDEFAULT : newCmrFieldType;
-		boolean oldCmrFieldTypeESet = cmrFieldTypeESet;
-		cmrFieldTypeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.CMR_FIELD__CMR_FIELD_TYPE, oldCmrFieldType, cmrFieldType, !oldCmrFieldTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetCmrFieldType() {
-		CMRFieldType oldCmrFieldType = cmrFieldType;
-		boolean oldCmrFieldTypeESet = cmrFieldTypeESet;
-		cmrFieldType = CMR_FIELD_TYPE_EDEFAULT;
-		cmrFieldTypeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.CMR_FIELD__CMR_FIELD_TYPE, oldCmrFieldType, CMR_FIELD_TYPE_EDEFAULT, oldCmrFieldTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetCmrFieldType() {
-		return cmrFieldTypeESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.CMR_FIELD__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.CMR_FIELD__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.CMR_FIELD__DESCRIPTIONS:
-				return getDescriptions();
-			case EjbPackage.CMR_FIELD__CMR_FIELD_NAME:
-				return getCmrFieldName();
-			case EjbPackage.CMR_FIELD__CMR_FIELD_TYPE:
-				return getCmrFieldType();
-			case EjbPackage.CMR_FIELD__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.CMR_FIELD__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case EjbPackage.CMR_FIELD__CMR_FIELD_NAME:
-				setCmrFieldName((String)newValue);
-				return;
-			case EjbPackage.CMR_FIELD__CMR_FIELD_TYPE:
-				setCmrFieldType((CMRFieldType)newValue);
-				return;
-			case EjbPackage.CMR_FIELD__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.CMR_FIELD__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case EjbPackage.CMR_FIELD__CMR_FIELD_NAME:
-				setCmrFieldName(CMR_FIELD_NAME_EDEFAULT);
-				return;
-			case EjbPackage.CMR_FIELD__CMR_FIELD_TYPE:
-				unsetCmrFieldType();
-				return;
-			case EjbPackage.CMR_FIELD__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.CMR_FIELD__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case EjbPackage.CMR_FIELD__CMR_FIELD_NAME:
-				return CMR_FIELD_NAME_EDEFAULT == null ? cmrFieldName != null : !CMR_FIELD_NAME_EDEFAULT.equals(cmrFieldName);
-			case EjbPackage.CMR_FIELD__CMR_FIELD_TYPE:
-				return isSetCmrFieldType();
-			case EjbPackage.CMR_FIELD__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (cmrFieldName: "); //$NON-NLS-1$
-		result.append(cmrFieldName);
-		result.append(", cmrFieldType: "); //$NON-NLS-1$
-		if (cmrFieldTypeESet) result.append(cmrFieldType); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //CMRFieldImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/ContainerTransactionTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/ContainerTransactionTypeImpl.java
deleted file mode 100644
index 3de0129a9..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/ContainerTransactionTypeImpl.java
+++ /dev/null
@@ -1,351 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb.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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jst.javaee.core.Description;
-
-import org.eclipse.jst.javaee.ejb.ContainerTransactionType;
-import org.eclipse.jst.javaee.ejb.MethodType;
-import org.eclipse.jst.javaee.ejb.TransactionAttributeType;
-
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Container Transaction Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.ContainerTransactionTypeImpl#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.ContainerTransactionTypeImpl#getMethods <em>Methods</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.ContainerTransactionTypeImpl#getTransAttribute <em>Trans Attribute</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.ContainerTransactionTypeImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ContainerTransactionTypeImpl extends EObjectImpl implements ContainerTransactionType {
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The cached value of the '{@link #getMethods() <em>Methods</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMethods()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList methods = null;
-
-	/**
-	 * The default value of the '{@link #getTransAttribute() <em>Trans Attribute</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTransAttribute()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final TransactionAttributeType TRANS_ATTRIBUTE_EDEFAULT = TransactionAttributeType.NOT_SUPPORTED_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getTransAttribute() <em>Trans Attribute</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTransAttribute()
-	 * @generated
-	 * @ordered
-	 */
-	protected TransactionAttributeType transAttribute = TRANS_ATTRIBUTE_EDEFAULT;
-
-	/**
-	 * This is true if the Trans Attribute attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean transAttributeESet = false;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ContainerTransactionTypeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.CONTAINER_TRANSACTION_TYPE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.CONTAINER_TRANSACTION_TYPE__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getMethods() {
-		if (methods == null) {
-			methods = new EObjectContainmentEList(MethodType.class, this, EjbPackage.CONTAINER_TRANSACTION_TYPE__METHODS);
-		}
-		return methods;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TransactionAttributeType getTransAttribute() {
-		return transAttribute;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTransAttribute(TransactionAttributeType newTransAttribute) {
-		TransactionAttributeType oldTransAttribute = transAttribute;
-		transAttribute = newTransAttribute == null ? TRANS_ATTRIBUTE_EDEFAULT : newTransAttribute;
-		boolean oldTransAttributeESet = transAttributeESet;
-		transAttributeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.CONTAINER_TRANSACTION_TYPE__TRANS_ATTRIBUTE, oldTransAttribute, transAttribute, !oldTransAttributeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetTransAttribute() {
-		TransactionAttributeType oldTransAttribute = transAttribute;
-		boolean oldTransAttributeESet = transAttributeESet;
-		transAttribute = TRANS_ATTRIBUTE_EDEFAULT;
-		transAttributeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.CONTAINER_TRANSACTION_TYPE__TRANS_ATTRIBUTE, oldTransAttribute, TRANS_ATTRIBUTE_EDEFAULT, oldTransAttributeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetTransAttribute() {
-		return transAttributeESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.CONTAINER_TRANSACTION_TYPE__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.CONTAINER_TRANSACTION_TYPE__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-			case EjbPackage.CONTAINER_TRANSACTION_TYPE__METHODS:
-				return ((InternalEList)getMethods()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.CONTAINER_TRANSACTION_TYPE__DESCRIPTIONS:
-				return getDescriptions();
-			case EjbPackage.CONTAINER_TRANSACTION_TYPE__METHODS:
-				return getMethods();
-			case EjbPackage.CONTAINER_TRANSACTION_TYPE__TRANS_ATTRIBUTE:
-				return getTransAttribute();
-			case EjbPackage.CONTAINER_TRANSACTION_TYPE__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.CONTAINER_TRANSACTION_TYPE__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case EjbPackage.CONTAINER_TRANSACTION_TYPE__METHODS:
-				getMethods().clear();
-				getMethods().addAll((Collection)newValue);
-				return;
-			case EjbPackage.CONTAINER_TRANSACTION_TYPE__TRANS_ATTRIBUTE:
-				setTransAttribute((TransactionAttributeType)newValue);
-				return;
-			case EjbPackage.CONTAINER_TRANSACTION_TYPE__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.CONTAINER_TRANSACTION_TYPE__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case EjbPackage.CONTAINER_TRANSACTION_TYPE__METHODS:
-				getMethods().clear();
-				return;
-			case EjbPackage.CONTAINER_TRANSACTION_TYPE__TRANS_ATTRIBUTE:
-				unsetTransAttribute();
-				return;
-			case EjbPackage.CONTAINER_TRANSACTION_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.CONTAINER_TRANSACTION_TYPE__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case EjbPackage.CONTAINER_TRANSACTION_TYPE__METHODS:
-				return methods != null && !methods.isEmpty();
-			case EjbPackage.CONTAINER_TRANSACTION_TYPE__TRANS_ATTRIBUTE:
-				return isSetTransAttribute();
-			case EjbPackage.CONTAINER_TRANSACTION_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (transAttribute: "); //$NON-NLS-1$
-		if (transAttributeESet) result.append(transAttribute); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ContainerTransactionTypeImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EJBJarDeploymentDescriptorImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EJBJarDeploymentDescriptorImpl.java
deleted file mode 100644
index 5bb85b673..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EJBJarDeploymentDescriptorImpl.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb.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.ejb.EJBJar;
-import org.eclipse.jst.javaee.ejb.EJBJarDeploymentDescriptor;
-
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>EJB Jar Deployment Descriptor</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarDeploymentDescriptorImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarDeploymentDescriptorImpl#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarDeploymentDescriptorImpl#getXSISchemaLocation <em>XSI Schema Location</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarDeploymentDescriptorImpl#getEjbJar <em>Ejb Jar</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class EJBJarDeploymentDescriptorImpl extends EObjectImpl implements EJBJarDeploymentDescriptor {
-	/**
-	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMixed()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureMap mixed = null;
-
-	/**
-	 * The cached value of the '{@link #getXMLNSPrefixMap() <em>XMLNS Prefix Map</em>}' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getXMLNSPrefixMap()
-	 * @generated
-	 * @ordered
-	 */
-	protected EMap xMLNSPrefixMap = null;
-
-	/**
-	 * The cached value of the '{@link #getXSISchemaLocation() <em>XSI Schema Location</em>}' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getXSISchemaLocation()
-	 * @generated
-	 * @ordered
-	 */
-	protected EMap xSISchemaLocation = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EJBJarDeploymentDescriptorImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.EJB_JAR_DEPLOYMENT_DESCRIPTOR;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureMap getMixed() {
-		if (mixed == null) {
-			mixed = new BasicFeatureMap(this, EjbPackage.EJB_JAR_DEPLOYMENT_DESCRIPTOR__MIXED);
-		}
-		return mixed;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Map getXMLNSPrefixMap() {
-		if (xMLNSPrefixMap == null) {
-			xMLNSPrefixMap = new EcoreEMap(EcorePackage.Literals.ESTRING_TO_STRING_MAP_ENTRY, EStringToStringMapEntryImpl.class, this, EjbPackage.EJB_JAR_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP);
-		}
-		return xMLNSPrefixMap.map();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Map getXSISchemaLocation() {
-		if (xSISchemaLocation == null) {
-			xSISchemaLocation = new EcoreEMap(EcorePackage.Literals.ESTRING_TO_STRING_MAP_ENTRY, EStringToStringMapEntryImpl.class, this, EjbPackage.EJB_JAR_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION);
-		}
-		return xSISchemaLocation.map();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EJBJar getEjbJar() {
-		return (EJBJar)getMixed().get(EjbPackage.Literals.EJB_JAR_DEPLOYMENT_DESCRIPTOR__EJB_JAR, true);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetEjbJar(EJBJar newEjbJar, NotificationChain msgs) {
-		return ((FeatureMap.Internal)getMixed()).basicAdd(EjbPackage.Literals.EJB_JAR_DEPLOYMENT_DESCRIPTOR__EJB_JAR, newEjbJar, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEjbJar(EJBJar newEjbJar) {
-		((FeatureMap.Internal)getMixed()).set(EjbPackage.Literals.EJB_JAR_DEPLOYMENT_DESCRIPTOR__EJB_JAR, newEjbJar);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.EJB_JAR_DEPLOYMENT_DESCRIPTOR__MIXED:
-				return ((InternalEList)getMixed()).basicRemove(otherEnd, msgs);
-			case EjbPackage.EJB_JAR_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP:
-				return ((InternalEList)((EMap.InternalMapView)getXMLNSPrefixMap()).eMap()).basicRemove(otherEnd, msgs);
-			case EjbPackage.EJB_JAR_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION:
-				return ((InternalEList)((EMap.InternalMapView)getXSISchemaLocation()).eMap()).basicRemove(otherEnd, msgs);
-			case EjbPackage.EJB_JAR_DEPLOYMENT_DESCRIPTOR__EJB_JAR:
-				return basicSetEjbJar(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.EJB_JAR_DEPLOYMENT_DESCRIPTOR__MIXED:
-				if (coreType) return getMixed();
-				return ((FeatureMap.Internal)getMixed()).getWrapper();
-			case EjbPackage.EJB_JAR_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP:
-				if (coreType) return ((EMap.InternalMapView)getXMLNSPrefixMap()).eMap();
-				else return getXMLNSPrefixMap();
-			case EjbPackage.EJB_JAR_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION:
-				if (coreType) return ((EMap.InternalMapView)getXSISchemaLocation()).eMap();
-				else return getXSISchemaLocation();
-			case EjbPackage.EJB_JAR_DEPLOYMENT_DESCRIPTOR__EJB_JAR:
-				return getEjbJar();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.EJB_JAR_DEPLOYMENT_DESCRIPTOR__MIXED:
-				((FeatureMap.Internal)getMixed()).set(newValue);
-				return;
-			case EjbPackage.EJB_JAR_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP:
-				((EStructuralFeature.Setting)((EMap.InternalMapView)getXMLNSPrefixMap()).eMap()).set(newValue);
-				return;
-			case EjbPackage.EJB_JAR_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION:
-				((EStructuralFeature.Setting)((EMap.InternalMapView)getXSISchemaLocation()).eMap()).set(newValue);
-				return;
-			case EjbPackage.EJB_JAR_DEPLOYMENT_DESCRIPTOR__EJB_JAR:
-				setEjbJar((EJBJar)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.EJB_JAR_DEPLOYMENT_DESCRIPTOR__MIXED:
-				getMixed().clear();
-				return;
-			case EjbPackage.EJB_JAR_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP:
-				getXMLNSPrefixMap().clear();
-				return;
-			case EjbPackage.EJB_JAR_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION:
-				getXSISchemaLocation().clear();
-				return;
-			case EjbPackage.EJB_JAR_DEPLOYMENT_DESCRIPTOR__EJB_JAR:
-				setEjbJar((EJBJar)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.EJB_JAR_DEPLOYMENT_DESCRIPTOR__MIXED:
-				return mixed != null && !mixed.isEmpty();
-			case EjbPackage.EJB_JAR_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP:
-				return xMLNSPrefixMap != null && !xMLNSPrefixMap.isEmpty();
-			case EjbPackage.EJB_JAR_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION:
-				return xSISchemaLocation != null && !xSISchemaLocation.isEmpty();
-			case EjbPackage.EJB_JAR_DEPLOYMENT_DESCRIPTOR__EJB_JAR:
-				return getEjbJar() != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	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();
-	}
-
-} //EJBJarDeploymentDescriptorImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EJBJarImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EJBJarImpl.java
deleted file mode 100644
index 7c464f7b3..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EJBJarImpl.java
+++ /dev/null
@@ -1,790 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb.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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-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.ejb.AssemblyDescriptor;
-import org.eclipse.jst.javaee.ejb.EJBJar;
-import org.eclipse.jst.javaee.ejb.EnterpriseBeans;
-import org.eclipse.jst.javaee.ejb.InterceptorsType;
-import org.eclipse.jst.javaee.ejb.Relationships;
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>EJB Jar</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl#getDisplayNames <em>Display Names</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl#getIcons <em>Icons</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl#getEnterpriseBeans <em>Enterprise Beans</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl#getInterceptors <em>Interceptors</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl#getRelationships <em>Relationships</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl#getAssemblyDescriptor <em>Assembly Descriptor</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl#getEjbClientJar <em>Ejb Client Jar</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl#isMetadataComplete <em>Metadata Complete</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl#getVersion <em>Version</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class EJBJarImpl extends EObjectImpl implements EJBJar {
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayNames() <em>Display Names</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayNames()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList displayNames = null;
-
-	/**
-	 * The cached value of the '{@link #getIcons() <em>Icons</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIcons()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList icons = null;
-
-	/**
-	 * The cached value of the '{@link #getEnterpriseBeans() <em>Enterprise Beans</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEnterpriseBeans()
-	 * @generated
-	 * @ordered
-	 */
-	protected EnterpriseBeans enterpriseBeans = null;
-
-	/**
-	 * The cached value of the '{@link #getInterceptors() <em>Interceptors</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInterceptors()
-	 * @generated
-	 * @ordered
-	 */
-	protected InterceptorsType interceptors = null;
-
-	/**
-	 * The cached value of the '{@link #getRelationships() <em>Relationships</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRelationships()
-	 * @generated
-	 * @ordered
-	 */
-	protected Relationships relationships = null;
-
-	/**
-	 * The cached value of the '{@link #getAssemblyDescriptor() <em>Assembly Descriptor</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAssemblyDescriptor()
-	 * @generated
-	 * @ordered
-	 */
-	protected AssemblyDescriptor assemblyDescriptor = null;
-
-	/**
-	 * The default value of the '{@link #getEjbClientJar() <em>Ejb Client Jar</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbClientJar()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EJB_CLIENT_JAR_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getEjbClientJar() <em>Ejb Client Jar</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbClientJar()
-	 * @generated
-	 * @ordered
-	 */
-	protected String ejbClientJar = EJB_CLIENT_JAR_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isMetadataComplete() <em>Metadata Complete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMetadataComplete()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean METADATA_COMPLETE_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isMetadataComplete() <em>Metadata Complete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMetadataComplete()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean metadataComplete = METADATA_COMPLETE_EDEFAULT;
-
-	/**
-	 * This is true if the Metadata Complete attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean metadataCompleteESet = false;
-
-	/**
-	 * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VERSION_EDEFAULT = "3.0"; //$NON-NLS-1$
-
-	/**
-	 * The cached value of the '{@link #getVersion() <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected String version = VERSION_EDEFAULT;
-
-	/**
-	 * This is true if the Version attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean versionESet = false;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EJBJarImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.EJB_JAR;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.EJB_JAR__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDisplayNames() {
-		if (displayNames == null) {
-			displayNames = new EObjectContainmentEList(DisplayName.class, this, EjbPackage.EJB_JAR__DISPLAY_NAMES);
-		}
-		return displayNames;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getIcons() {
-		if (icons == null) {
-			icons = new EObjectContainmentEList(Icon.class, this, EjbPackage.EJB_JAR__ICONS);
-		}
-		return icons;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EnterpriseBeans getEnterpriseBeans() {
-		return enterpriseBeans;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetEnterpriseBeans(EnterpriseBeans newEnterpriseBeans, NotificationChain msgs) {
-		EnterpriseBeans oldEnterpriseBeans = enterpriseBeans;
-		enterpriseBeans = newEnterpriseBeans;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_JAR__ENTERPRISE_BEANS, oldEnterpriseBeans, newEnterpriseBeans);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEnterpriseBeans(EnterpriseBeans newEnterpriseBeans) {
-		if (newEnterpriseBeans != enterpriseBeans) {
-			NotificationChain msgs = null;
-			if (enterpriseBeans != null)
-				msgs = ((InternalEObject)enterpriseBeans).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.EJB_JAR__ENTERPRISE_BEANS, null, msgs);
-			if (newEnterpriseBeans != null)
-				msgs = ((InternalEObject)newEnterpriseBeans).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EjbPackage.EJB_JAR__ENTERPRISE_BEANS, null, msgs);
-			msgs = basicSetEnterpriseBeans(newEnterpriseBeans, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_JAR__ENTERPRISE_BEANS, newEnterpriseBeans, newEnterpriseBeans));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public InterceptorsType getInterceptors() {
-		return interceptors;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetInterceptors(InterceptorsType newInterceptors, NotificationChain msgs) {
-		InterceptorsType oldInterceptors = interceptors;
-		interceptors = newInterceptors;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_JAR__INTERCEPTORS, oldInterceptors, newInterceptors);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setInterceptors(InterceptorsType newInterceptors) {
-		if (newInterceptors != interceptors) {
-			NotificationChain msgs = null;
-			if (interceptors != null)
-				msgs = ((InternalEObject)interceptors).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.EJB_JAR__INTERCEPTORS, null, msgs);
-			if (newInterceptors != null)
-				msgs = ((InternalEObject)newInterceptors).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EjbPackage.EJB_JAR__INTERCEPTORS, null, msgs);
-			msgs = basicSetInterceptors(newInterceptors, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_JAR__INTERCEPTORS, newInterceptors, newInterceptors));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Relationships getRelationships() {
-		return relationships;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetRelationships(Relationships newRelationships, NotificationChain msgs) {
-		Relationships oldRelationships = relationships;
-		relationships = newRelationships;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_JAR__RELATIONSHIPS, oldRelationships, newRelationships);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRelationships(Relationships newRelationships) {
-		if (newRelationships != relationships) {
-			NotificationChain msgs = null;
-			if (relationships != null)
-				msgs = ((InternalEObject)relationships).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.EJB_JAR__RELATIONSHIPS, null, msgs);
-			if (newRelationships != null)
-				msgs = ((InternalEObject)newRelationships).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EjbPackage.EJB_JAR__RELATIONSHIPS, null, msgs);
-			msgs = basicSetRelationships(newRelationships, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_JAR__RELATIONSHIPS, newRelationships, newRelationships));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AssemblyDescriptor getAssemblyDescriptor() {
-		return assemblyDescriptor;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetAssemblyDescriptor(AssemblyDescriptor newAssemblyDescriptor, NotificationChain msgs) {
-		AssemblyDescriptor oldAssemblyDescriptor = assemblyDescriptor;
-		assemblyDescriptor = newAssemblyDescriptor;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_JAR__ASSEMBLY_DESCRIPTOR, oldAssemblyDescriptor, newAssemblyDescriptor);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAssemblyDescriptor(AssemblyDescriptor newAssemblyDescriptor) {
-		if (newAssemblyDescriptor != assemblyDescriptor) {
-			NotificationChain msgs = null;
-			if (assemblyDescriptor != null)
-				msgs = ((InternalEObject)assemblyDescriptor).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.EJB_JAR__ASSEMBLY_DESCRIPTOR, null, msgs);
-			if (newAssemblyDescriptor != null)
-				msgs = ((InternalEObject)newAssemblyDescriptor).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EjbPackage.EJB_JAR__ASSEMBLY_DESCRIPTOR, null, msgs);
-			msgs = basicSetAssemblyDescriptor(newAssemblyDescriptor, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_JAR__ASSEMBLY_DESCRIPTOR, newAssemblyDescriptor, newAssemblyDescriptor));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getEjbClientJar() {
-		return ejbClientJar;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEjbClientJar(String newEjbClientJar) {
-		String oldEjbClientJar = ejbClientJar;
-		ejbClientJar = newEjbClientJar;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_JAR__EJB_CLIENT_JAR, oldEjbClientJar, ejbClientJar));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_JAR__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isMetadataComplete() {
-		return metadataComplete;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMetadataComplete(boolean newMetadataComplete) {
-		boolean oldMetadataComplete = metadataComplete;
-		metadataComplete = newMetadataComplete;
-		boolean oldMetadataCompleteESet = metadataCompleteESet;
-		metadataCompleteESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_JAR__METADATA_COMPLETE, oldMetadataComplete, metadataComplete, !oldMetadataCompleteESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetMetadataComplete() {
-		boolean oldMetadataComplete = metadataComplete;
-		boolean oldMetadataCompleteESet = metadataCompleteESet;
-		metadataComplete = METADATA_COMPLETE_EDEFAULT;
-		metadataCompleteESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.EJB_JAR__METADATA_COMPLETE, oldMetadataComplete, METADATA_COMPLETE_EDEFAULT, oldMetadataCompleteESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetMetadataComplete() {
-		return metadataCompleteESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getVersion() {
-		return version;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setVersion(String newVersion) {
-		String oldVersion = version;
-		version = newVersion;
-		boolean oldVersionESet = versionESet;
-		versionESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_JAR__VERSION, oldVersion, version, !oldVersionESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetVersion() {
-		String oldVersion = version;
-		boolean oldVersionESet = versionESet;
-		version = VERSION_EDEFAULT;
-		versionESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.EJB_JAR__VERSION, oldVersion, VERSION_EDEFAULT, oldVersionESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetVersion() {
-		return versionESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.EJB_JAR__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-			case EjbPackage.EJB_JAR__DISPLAY_NAMES:
-				return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
-			case EjbPackage.EJB_JAR__ICONS:
-				return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
-			case EjbPackage.EJB_JAR__ENTERPRISE_BEANS:
-				return basicSetEnterpriseBeans(null, msgs);
-			case EjbPackage.EJB_JAR__INTERCEPTORS:
-				return basicSetInterceptors(null, msgs);
-			case EjbPackage.EJB_JAR__RELATIONSHIPS:
-				return basicSetRelationships(null, msgs);
-			case EjbPackage.EJB_JAR__ASSEMBLY_DESCRIPTOR:
-				return basicSetAssemblyDescriptor(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.EJB_JAR__DESCRIPTIONS:
-				return getDescriptions();
-			case EjbPackage.EJB_JAR__DISPLAY_NAMES:
-				return getDisplayNames();
-			case EjbPackage.EJB_JAR__ICONS:
-				return getIcons();
-			case EjbPackage.EJB_JAR__ENTERPRISE_BEANS:
-				return getEnterpriseBeans();
-			case EjbPackage.EJB_JAR__INTERCEPTORS:
-				return getInterceptors();
-			case EjbPackage.EJB_JAR__RELATIONSHIPS:
-				return getRelationships();
-			case EjbPackage.EJB_JAR__ASSEMBLY_DESCRIPTOR:
-				return getAssemblyDescriptor();
-			case EjbPackage.EJB_JAR__EJB_CLIENT_JAR:
-				return getEjbClientJar();
-			case EjbPackage.EJB_JAR__ID:
-				return getId();
-			case EjbPackage.EJB_JAR__METADATA_COMPLETE:
-				return isMetadataComplete() ? Boolean.TRUE : Boolean.FALSE;
-			case EjbPackage.EJB_JAR__VERSION:
-				return getVersion();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.EJB_JAR__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case EjbPackage.EJB_JAR__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				getDisplayNames().addAll((Collection)newValue);
-				return;
-			case EjbPackage.EJB_JAR__ICONS:
-				getIcons().clear();
-				getIcons().addAll((Collection)newValue);
-				return;
-			case EjbPackage.EJB_JAR__ENTERPRISE_BEANS:
-				setEnterpriseBeans((EnterpriseBeans)newValue);
-				return;
-			case EjbPackage.EJB_JAR__INTERCEPTORS:
-				setInterceptors((InterceptorsType)newValue);
-				return;
-			case EjbPackage.EJB_JAR__RELATIONSHIPS:
-				setRelationships((Relationships)newValue);
-				return;
-			case EjbPackage.EJB_JAR__ASSEMBLY_DESCRIPTOR:
-				setAssemblyDescriptor((AssemblyDescriptor)newValue);
-				return;
-			case EjbPackage.EJB_JAR__EJB_CLIENT_JAR:
-				setEjbClientJar((String)newValue);
-				return;
-			case EjbPackage.EJB_JAR__ID:
-				setId((String)newValue);
-				return;
-			case EjbPackage.EJB_JAR__METADATA_COMPLETE:
-				setMetadataComplete(((Boolean)newValue).booleanValue());
-				return;
-			case EjbPackage.EJB_JAR__VERSION:
-				setVersion((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.EJB_JAR__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case EjbPackage.EJB_JAR__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				return;
-			case EjbPackage.EJB_JAR__ICONS:
-				getIcons().clear();
-				return;
-			case EjbPackage.EJB_JAR__ENTERPRISE_BEANS:
-				setEnterpriseBeans((EnterpriseBeans)null);
-				return;
-			case EjbPackage.EJB_JAR__INTERCEPTORS:
-				setInterceptors((InterceptorsType)null);
-				return;
-			case EjbPackage.EJB_JAR__RELATIONSHIPS:
-				setRelationships((Relationships)null);
-				return;
-			case EjbPackage.EJB_JAR__ASSEMBLY_DESCRIPTOR:
-				setAssemblyDescriptor((AssemblyDescriptor)null);
-				return;
-			case EjbPackage.EJB_JAR__EJB_CLIENT_JAR:
-				setEjbClientJar(EJB_CLIENT_JAR_EDEFAULT);
-				return;
-			case EjbPackage.EJB_JAR__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case EjbPackage.EJB_JAR__METADATA_COMPLETE:
-				unsetMetadataComplete();
-				return;
-			case EjbPackage.EJB_JAR__VERSION:
-				unsetVersion();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.EJB_JAR__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case EjbPackage.EJB_JAR__DISPLAY_NAMES:
-				return displayNames != null && !displayNames.isEmpty();
-			case EjbPackage.EJB_JAR__ICONS:
-				return icons != null && !icons.isEmpty();
-			case EjbPackage.EJB_JAR__ENTERPRISE_BEANS:
-				return enterpriseBeans != null;
-			case EjbPackage.EJB_JAR__INTERCEPTORS:
-				return interceptors != null;
-			case EjbPackage.EJB_JAR__RELATIONSHIPS:
-				return relationships != null;
-			case EjbPackage.EJB_JAR__ASSEMBLY_DESCRIPTOR:
-				return assemblyDescriptor != null;
-			case EjbPackage.EJB_JAR__EJB_CLIENT_JAR:
-				return EJB_CLIENT_JAR_EDEFAULT == null ? ejbClientJar != null : !EJB_CLIENT_JAR_EDEFAULT.equals(ejbClientJar);
-			case EjbPackage.EJB_JAR__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case EjbPackage.EJB_JAR__METADATA_COMPLETE:
-				return isSetMetadataComplete();
-			case EjbPackage.EJB_JAR__VERSION:
-				return isSetVersion();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (ejbClientJar: "); //$NON-NLS-1$
-		result.append(ejbClientJar);
-		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();
-	}
-
-} //EJBJarImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EJBRelationImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EJBRelationImpl.java
deleted file mode 100644
index 6a90bb05a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EJBRelationImpl.java
+++ /dev/null
@@ -1,316 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb.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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jst.javaee.core.Description;
-
-import org.eclipse.jst.javaee.ejb.EJBRelation;
-import org.eclipse.jst.javaee.ejb.EJBRelationshipRole;
-
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>EJB Relation</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBRelationImpl#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBRelationImpl#getEjbRelationName <em>Ejb Relation Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBRelationImpl#getEjbRelationshipRoles <em>Ejb Relationship Roles</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBRelationImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class EJBRelationImpl extends EObjectImpl implements EJBRelation {
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The default value of the '{@link #getEjbRelationName() <em>Ejb Relation Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbRelationName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EJB_RELATION_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getEjbRelationName() <em>Ejb Relation Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbRelationName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String ejbRelationName = EJB_RELATION_NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getEjbRelationshipRoles() <em>Ejb Relationship Roles</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbRelationshipRoles()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList ejbRelationshipRoles = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EJBRelationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.EJB_RELATION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.EJB_RELATION__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getEjbRelationName() {
-		return ejbRelationName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEjbRelationName(String newEjbRelationName) {
-		String oldEjbRelationName = ejbRelationName;
-		ejbRelationName = newEjbRelationName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_RELATION__EJB_RELATION_NAME, oldEjbRelationName, ejbRelationName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getEjbRelationshipRoles() {
-		if (ejbRelationshipRoles == null) {
-			ejbRelationshipRoles = new EObjectContainmentEList(EJBRelationshipRole.class, this, EjbPackage.EJB_RELATION__EJB_RELATIONSHIP_ROLES);
-		}
-		return ejbRelationshipRoles;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_RELATION__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.EJB_RELATION__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-			case EjbPackage.EJB_RELATION__EJB_RELATIONSHIP_ROLES:
-				return ((InternalEList)getEjbRelationshipRoles()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.EJB_RELATION__DESCRIPTIONS:
-				return getDescriptions();
-			case EjbPackage.EJB_RELATION__EJB_RELATION_NAME:
-				return getEjbRelationName();
-			case EjbPackage.EJB_RELATION__EJB_RELATIONSHIP_ROLES:
-				return getEjbRelationshipRoles();
-			case EjbPackage.EJB_RELATION__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.EJB_RELATION__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case EjbPackage.EJB_RELATION__EJB_RELATION_NAME:
-				setEjbRelationName((String)newValue);
-				return;
-			case EjbPackage.EJB_RELATION__EJB_RELATIONSHIP_ROLES:
-				getEjbRelationshipRoles().clear();
-				getEjbRelationshipRoles().addAll((Collection)newValue);
-				return;
-			case EjbPackage.EJB_RELATION__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.EJB_RELATION__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case EjbPackage.EJB_RELATION__EJB_RELATION_NAME:
-				setEjbRelationName(EJB_RELATION_NAME_EDEFAULT);
-				return;
-			case EjbPackage.EJB_RELATION__EJB_RELATIONSHIP_ROLES:
-				getEjbRelationshipRoles().clear();
-				return;
-			case EjbPackage.EJB_RELATION__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.EJB_RELATION__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case EjbPackage.EJB_RELATION__EJB_RELATION_NAME:
-				return EJB_RELATION_NAME_EDEFAULT == null ? ejbRelationName != null : !EJB_RELATION_NAME_EDEFAULT.equals(ejbRelationName);
-			case EjbPackage.EJB_RELATION__EJB_RELATIONSHIP_ROLES:
-				return ejbRelationshipRoles != null && !ejbRelationshipRoles.isEmpty();
-			case EjbPackage.EJB_RELATION__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (ejbRelationName: "); //$NON-NLS-1$
-		result.append(ejbRelationName);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //EJBRelationImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EJBRelationshipRoleImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EJBRelationshipRoleImpl.java
deleted file mode 100644
index ff91a3433..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EJBRelationshipRoleImpl.java
+++ /dev/null
@@ -1,569 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb.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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jst.javaee.core.Description;
-import org.eclipse.jst.javaee.core.EmptyType;
-
-import org.eclipse.jst.javaee.ejb.CMRField;
-import org.eclipse.jst.javaee.ejb.EJBRelationshipRole;
-import org.eclipse.jst.javaee.ejb.MultiplicityType;
-import org.eclipse.jst.javaee.ejb.RelationshipRoleSourceType;
-
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>EJB Relationship Role</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBRelationshipRoleImpl#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBRelationshipRoleImpl#getEjbRelationshipRoleName <em>Ejb Relationship Role Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBRelationshipRoleImpl#getMultiplicity <em>Multiplicity</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBRelationshipRoleImpl#getCascadeDelete <em>Cascade Delete</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBRelationshipRoleImpl#getRelationshipRoleSource <em>Relationship Role Source</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBRelationshipRoleImpl#getCmrField <em>Cmr Field</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBRelationshipRoleImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class EJBRelationshipRoleImpl extends EObjectImpl implements EJBRelationshipRole {
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The default value of the '{@link #getEjbRelationshipRoleName() <em>Ejb Relationship Role Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbRelationshipRoleName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EJB_RELATIONSHIP_ROLE_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getEjbRelationshipRoleName() <em>Ejb Relationship Role Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbRelationshipRoleName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String ejbRelationshipRoleName = EJB_RELATIONSHIP_ROLE_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getMultiplicity() <em>Multiplicity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMultiplicity()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final MultiplicityType MULTIPLICITY_EDEFAULT = MultiplicityType.ONE_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getMultiplicity() <em>Multiplicity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMultiplicity()
-	 * @generated
-	 * @ordered
-	 */
-	protected MultiplicityType multiplicity = MULTIPLICITY_EDEFAULT;
-
-	/**
-	 * This is true if the Multiplicity attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean multiplicityESet = false;
-
-	/**
-	 * The cached value of the '{@link #getCascadeDelete() <em>Cascade Delete</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCascadeDelete()
-	 * @generated
-	 * @ordered
-	 */
-	protected EmptyType cascadeDelete = null;
-
-	/**
-	 * The cached value of the '{@link #getRelationshipRoleSource() <em>Relationship Role Source</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRelationshipRoleSource()
-	 * @generated
-	 * @ordered
-	 */
-	protected RelationshipRoleSourceType relationshipRoleSource = null;
-
-	/**
-	 * The cached value of the '{@link #getCmrField() <em>Cmr Field</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCmrField()
-	 * @generated
-	 * @ordered
-	 */
-	protected CMRField cmrField = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EJBRelationshipRoleImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.EJB_RELATIONSHIP_ROLE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.EJB_RELATIONSHIP_ROLE__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getEjbRelationshipRoleName() {
-		return ejbRelationshipRoleName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEjbRelationshipRoleName(String newEjbRelationshipRoleName) {
-		String oldEjbRelationshipRoleName = ejbRelationshipRoleName;
-		ejbRelationshipRoleName = newEjbRelationshipRoleName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_RELATIONSHIP_ROLE__EJB_RELATIONSHIP_ROLE_NAME, oldEjbRelationshipRoleName, ejbRelationshipRoleName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MultiplicityType getMultiplicity() {
-		return multiplicity;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMultiplicity(MultiplicityType newMultiplicity) {
-		MultiplicityType oldMultiplicity = multiplicity;
-		multiplicity = newMultiplicity == null ? MULTIPLICITY_EDEFAULT : newMultiplicity;
-		boolean oldMultiplicityESet = multiplicityESet;
-		multiplicityESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_RELATIONSHIP_ROLE__MULTIPLICITY, oldMultiplicity, multiplicity, !oldMultiplicityESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetMultiplicity() {
-		MultiplicityType oldMultiplicity = multiplicity;
-		boolean oldMultiplicityESet = multiplicityESet;
-		multiplicity = MULTIPLICITY_EDEFAULT;
-		multiplicityESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.EJB_RELATIONSHIP_ROLE__MULTIPLICITY, oldMultiplicity, MULTIPLICITY_EDEFAULT, oldMultiplicityESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetMultiplicity() {
-		return multiplicityESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EmptyType getCascadeDelete() {
-		return cascadeDelete;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetCascadeDelete(EmptyType newCascadeDelete, NotificationChain msgs) {
-		EmptyType oldCascadeDelete = cascadeDelete;
-		cascadeDelete = newCascadeDelete;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_RELATIONSHIP_ROLE__CASCADE_DELETE, oldCascadeDelete, newCascadeDelete);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCascadeDelete(EmptyType newCascadeDelete) {
-		if (newCascadeDelete != cascadeDelete) {
-			NotificationChain msgs = null;
-			if (cascadeDelete != null)
-				msgs = ((InternalEObject)cascadeDelete).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.EJB_RELATIONSHIP_ROLE__CASCADE_DELETE, null, msgs);
-			if (newCascadeDelete != null)
-				msgs = ((InternalEObject)newCascadeDelete).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EjbPackage.EJB_RELATIONSHIP_ROLE__CASCADE_DELETE, null, msgs);
-			msgs = basicSetCascadeDelete(newCascadeDelete, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_RELATIONSHIP_ROLE__CASCADE_DELETE, newCascadeDelete, newCascadeDelete));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RelationshipRoleSourceType getRelationshipRoleSource() {
-		return relationshipRoleSource;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetRelationshipRoleSource(RelationshipRoleSourceType newRelationshipRoleSource, NotificationChain msgs) {
-		RelationshipRoleSourceType oldRelationshipRoleSource = relationshipRoleSource;
-		relationshipRoleSource = newRelationshipRoleSource;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_RELATIONSHIP_ROLE__RELATIONSHIP_ROLE_SOURCE, oldRelationshipRoleSource, newRelationshipRoleSource);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRelationshipRoleSource(RelationshipRoleSourceType newRelationshipRoleSource) {
-		if (newRelationshipRoleSource != relationshipRoleSource) {
-			NotificationChain msgs = null;
-			if (relationshipRoleSource != null)
-				msgs = ((InternalEObject)relationshipRoleSource).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.EJB_RELATIONSHIP_ROLE__RELATIONSHIP_ROLE_SOURCE, null, msgs);
-			if (newRelationshipRoleSource != null)
-				msgs = ((InternalEObject)newRelationshipRoleSource).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EjbPackage.EJB_RELATIONSHIP_ROLE__RELATIONSHIP_ROLE_SOURCE, null, msgs);
-			msgs = basicSetRelationshipRoleSource(newRelationshipRoleSource, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_RELATIONSHIP_ROLE__RELATIONSHIP_ROLE_SOURCE, newRelationshipRoleSource, newRelationshipRoleSource));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CMRField getCmrField() {
-		return cmrField;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetCmrField(CMRField newCmrField, NotificationChain msgs) {
-		CMRField oldCmrField = cmrField;
-		cmrField = newCmrField;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_RELATIONSHIP_ROLE__CMR_FIELD, oldCmrField, newCmrField);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCmrField(CMRField newCmrField) {
-		if (newCmrField != cmrField) {
-			NotificationChain msgs = null;
-			if (cmrField != null)
-				msgs = ((InternalEObject)cmrField).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.EJB_RELATIONSHIP_ROLE__CMR_FIELD, null, msgs);
-			if (newCmrField != null)
-				msgs = ((InternalEObject)newCmrField).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EjbPackage.EJB_RELATIONSHIP_ROLE__CMR_FIELD, null, msgs);
-			msgs = basicSetCmrField(newCmrField, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_RELATIONSHIP_ROLE__CMR_FIELD, newCmrField, newCmrField));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_RELATIONSHIP_ROLE__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__CASCADE_DELETE:
-				return basicSetCascadeDelete(null, msgs);
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__RELATIONSHIP_ROLE_SOURCE:
-				return basicSetRelationshipRoleSource(null, msgs);
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__CMR_FIELD:
-				return basicSetCmrField(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__DESCRIPTIONS:
-				return getDescriptions();
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__EJB_RELATIONSHIP_ROLE_NAME:
-				return getEjbRelationshipRoleName();
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__MULTIPLICITY:
-				return getMultiplicity();
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__CASCADE_DELETE:
-				return getCascadeDelete();
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__RELATIONSHIP_ROLE_SOURCE:
-				return getRelationshipRoleSource();
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__CMR_FIELD:
-				return getCmrField();
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__EJB_RELATIONSHIP_ROLE_NAME:
-				setEjbRelationshipRoleName((String)newValue);
-				return;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__MULTIPLICITY:
-				setMultiplicity((MultiplicityType)newValue);
-				return;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__CASCADE_DELETE:
-				setCascadeDelete((EmptyType)newValue);
-				return;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__RELATIONSHIP_ROLE_SOURCE:
-				setRelationshipRoleSource((RelationshipRoleSourceType)newValue);
-				return;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__CMR_FIELD:
-				setCmrField((CMRField)newValue);
-				return;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__EJB_RELATIONSHIP_ROLE_NAME:
-				setEjbRelationshipRoleName(EJB_RELATIONSHIP_ROLE_NAME_EDEFAULT);
-				return;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__MULTIPLICITY:
-				unsetMultiplicity();
-				return;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__CASCADE_DELETE:
-				setCascadeDelete((EmptyType)null);
-				return;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__RELATIONSHIP_ROLE_SOURCE:
-				setRelationshipRoleSource((RelationshipRoleSourceType)null);
-				return;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__CMR_FIELD:
-				setCmrField((CMRField)null);
-				return;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__EJB_RELATIONSHIP_ROLE_NAME:
-				return EJB_RELATIONSHIP_ROLE_NAME_EDEFAULT == null ? ejbRelationshipRoleName != null : !EJB_RELATIONSHIP_ROLE_NAME_EDEFAULT.equals(ejbRelationshipRoleName);
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__MULTIPLICITY:
-				return isSetMultiplicity();
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__CASCADE_DELETE:
-				return cascadeDelete != null;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__RELATIONSHIP_ROLE_SOURCE:
-				return relationshipRoleSource != null;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__CMR_FIELD:
-				return cmrField != null;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (ejbRelationshipRoleName: "); //$NON-NLS-1$
-		result.append(ejbRelationshipRoleName);
-		result.append(", multiplicity: "); //$NON-NLS-1$
-		if (multiplicityESet) result.append(multiplicity); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //EJBRelationshipRoleImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EjbFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EjbFactoryImpl.java
deleted file mode 100644
index 9dfb97d24..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EjbFactoryImpl.java
+++ /dev/null
@@ -1,955 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-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.emf.ecore.xml.type.XMLTypeFactory;
-import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-
-import org.eclipse.jst.javaee.core.JavaeeFactory;
-import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
-
-import org.eclipse.jst.javaee.ejb.*;
-
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class EjbFactoryImpl extends EFactoryImpl implements EjbFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static EjbFactory init() {
-		try {
-			EjbFactory theEjbFactory = (EjbFactory)EPackage.Registry.INSTANCE.getEFactory("http://java.sun.com/xml/ns/javaee/ejb"); //$NON-NLS-1$ 
-			if (theEjbFactory != null) {
-				return theEjbFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new EjbFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EjbFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case EjbPackage.ACTIVATION_CONFIG: return (EObject)createActivationConfig();
-			case EjbPackage.ACTIVATION_CONFIG_PROPERTY: return (EObject)createActivationConfigProperty();
-			case EjbPackage.APPLICATION_EXCEPTION: return (EObject)createApplicationException();
-			case EjbPackage.AROUND_INVOKE_TYPE: return (EObject)createAroundInvokeType();
-			case EjbPackage.ASSEMBLY_DESCRIPTOR: return (EObject)createAssemblyDescriptor();
-			case EjbPackage.CMP_FIELD: return (EObject)createCMPField();
-			case EjbPackage.CMR_FIELD: return (EObject)createCMRField();
-			case EjbPackage.CONTAINER_TRANSACTION_TYPE: return (EObject)createContainerTransactionType();
-			case EjbPackage.EJB_JAR: return (EObject)createEJBJar();
-			case EjbPackage.EJB_JAR_DEPLOYMENT_DESCRIPTOR: return (EObject)createEJBJarDeploymentDescriptor();
-			case EjbPackage.EJB_RELATION: return (EObject)createEJBRelation();
-			case EjbPackage.EJB_RELATIONSHIP_ROLE: return (EObject)createEJBRelationshipRole();
-			case EjbPackage.ENTERPRISE_BEANS: return (EObject)createEnterpriseBeans();
-			case EjbPackage.ENTITY_BEAN: return (EObject)createEntityBean();
-			case EjbPackage.EXCLUDE_LIST: return (EObject)createExcludeList();
-			case EjbPackage.INIT_METHOD_TYPE: return (EObject)createInitMethodType();
-			case EjbPackage.INTERCEPTOR_BINDING_TYPE: return (EObject)createInterceptorBindingType();
-			case EjbPackage.INTERCEPTOR_ORDER_TYPE: return (EObject)createInterceptorOrderType();
-			case EjbPackage.INTERCEPTORS_TYPE: return (EObject)createInterceptorsType();
-			case EjbPackage.INTERCEPTOR_TYPE: return (EObject)createInterceptorType();
-			case EjbPackage.MESSAGE_DRIVEN_BEAN: return (EObject)createMessageDrivenBean();
-			case EjbPackage.METHOD_PARAMS: return (EObject)createMethodParams();
-			case EjbPackage.METHOD_PERMISSION: return (EObject)createMethodPermission();
-			case EjbPackage.METHOD_TYPE: return (EObject)createMethodType();
-			case EjbPackage.NAMED_METHOD_TYPE: return (EObject)createNamedMethodType();
-			case EjbPackage.QUERY: return (EObject)createQuery();
-			case EjbPackage.QUERY_METHOD: return (EObject)createQueryMethod();
-			case EjbPackage.RELATIONSHIP_ROLE_SOURCE_TYPE: return (EObject)createRelationshipRoleSourceType();
-			case EjbPackage.RELATIONSHIPS: return (EObject)createRelationships();
-			case EjbPackage.REMOVE_METHOD_TYPE: return (EObject)createRemoveMethodType();
-			case EjbPackage.SECURITY_IDENTITY_TYPE: return (EObject)createSecurityIdentityType();
-			case EjbPackage.SESSION_BEAN: return (EObject)createSessionBean();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case EjbPackage.CMP_VERSION_TYPE:
-				return createCmpVersionTypeFromString(eDataType, initialValue);
-			case EjbPackage.CMR_FIELD_TYPE:
-				return createCMRFieldTypeFromString(eDataType, initialValue);
-			case EjbPackage.METHOD_INTERFACE_TYPE:
-				return createMethodInterfaceTypeFromString(eDataType, initialValue);
-			case EjbPackage.MULTIPLICITY_TYPE:
-				return createMultiplicityTypeFromString(eDataType, initialValue);
-			case EjbPackage.PERSISTENCE_TYPE:
-				return createPersistenceTypeFromString(eDataType, initialValue);
-			case EjbPackage.RESULT_TYPE_MAPPING_TYPE:
-				return createResultTypeMappingTypeFromString(eDataType, initialValue);
-			case EjbPackage.SESSION_TYPE:
-				return createSessionTypeFromString(eDataType, initialValue);
-			case EjbPackage.TRANSACTION_ATTRIBUTE_TYPE:
-				return createTransactionAttributeTypeFromString(eDataType, initialValue);
-			case EjbPackage.TRANSACTION_TYPE:
-				return createTransactionTypeFromString(eDataType, initialValue);
-			case EjbPackage.CMP_VERSION_TYPE_OBJECT:
-				return createCmpVersionTypeObjectFromString(eDataType, initialValue);
-			case EjbPackage.CMR_FIELD_TYPE_OBJECT:
-				return createCMRFieldTypeObjectFromString(eDataType, initialValue);
-			case EjbPackage.EJB_CLASS_TYPE:
-				return createEjbClassTypeFromString(eDataType, initialValue);
-			case EjbPackage.EJB_NAME_TYPE:
-				return createEjbNameTypeFromString(eDataType, initialValue);
-			case EjbPackage.METHOD_INTERFACE_TYPE_OBJECT:
-				return createMethodInterfaceTypeObjectFromString(eDataType, initialValue);
-			case EjbPackage.METHOD_NAME_TYPE:
-				return createMethodNameTypeFromString(eDataType, initialValue);
-			case EjbPackage.MULTIPLICITY_TYPE_OBJECT:
-				return createMultiplicityTypeObjectFromString(eDataType, initialValue);
-			case EjbPackage.PERSISTENCE_TYPE_OBJECT:
-				return createPersistenceTypeObjectFromString(eDataType, initialValue);
-			case EjbPackage.RESULT_TYPE_MAPPING_TYPE_OBJECT:
-				return createResultTypeMappingTypeObjectFromString(eDataType, initialValue);
-			case EjbPackage.SESSION_TYPE_OBJECT:
-				return createSessionTypeObjectFromString(eDataType, initialValue);
-			case EjbPackage.TRANSACTION_ATTRIBUTE_TYPE_OBJECT:
-				return createTransactionAttributeTypeObjectFromString(eDataType, initialValue);
-			case EjbPackage.TRANSACTION_TYPE_OBJECT:
-				return createTransactionTypeObjectFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case EjbPackage.CMP_VERSION_TYPE:
-				return convertCmpVersionTypeToString(eDataType, instanceValue);
-			case EjbPackage.CMR_FIELD_TYPE:
-				return convertCMRFieldTypeToString(eDataType, instanceValue);
-			case EjbPackage.METHOD_INTERFACE_TYPE:
-				return convertMethodInterfaceTypeToString(eDataType, instanceValue);
-			case EjbPackage.MULTIPLICITY_TYPE:
-				return convertMultiplicityTypeToString(eDataType, instanceValue);
-			case EjbPackage.PERSISTENCE_TYPE:
-				return convertPersistenceTypeToString(eDataType, instanceValue);
-			case EjbPackage.RESULT_TYPE_MAPPING_TYPE:
-				return convertResultTypeMappingTypeToString(eDataType, instanceValue);
-			case EjbPackage.SESSION_TYPE:
-				return convertSessionTypeToString(eDataType, instanceValue);
-			case EjbPackage.TRANSACTION_ATTRIBUTE_TYPE:
-				return convertTransactionAttributeTypeToString(eDataType, instanceValue);
-			case EjbPackage.TRANSACTION_TYPE:
-				return convertTransactionTypeToString(eDataType, instanceValue);
-			case EjbPackage.CMP_VERSION_TYPE_OBJECT:
-				return convertCmpVersionTypeObjectToString(eDataType, instanceValue);
-			case EjbPackage.CMR_FIELD_TYPE_OBJECT:
-				return convertCMRFieldTypeObjectToString(eDataType, instanceValue);
-			case EjbPackage.EJB_CLASS_TYPE:
-				return convertEjbClassTypeToString(eDataType, instanceValue);
-			case EjbPackage.EJB_NAME_TYPE:
-				return convertEjbNameTypeToString(eDataType, instanceValue);
-			case EjbPackage.METHOD_INTERFACE_TYPE_OBJECT:
-				return convertMethodInterfaceTypeObjectToString(eDataType, instanceValue);
-			case EjbPackage.METHOD_NAME_TYPE:
-				return convertMethodNameTypeToString(eDataType, instanceValue);
-			case EjbPackage.MULTIPLICITY_TYPE_OBJECT:
-				return convertMultiplicityTypeObjectToString(eDataType, instanceValue);
-			case EjbPackage.PERSISTENCE_TYPE_OBJECT:
-				return convertPersistenceTypeObjectToString(eDataType, instanceValue);
-			case EjbPackage.RESULT_TYPE_MAPPING_TYPE_OBJECT:
-				return convertResultTypeMappingTypeObjectToString(eDataType, instanceValue);
-			case EjbPackage.SESSION_TYPE_OBJECT:
-				return convertSessionTypeObjectToString(eDataType, instanceValue);
-			case EjbPackage.TRANSACTION_ATTRIBUTE_TYPE_OBJECT:
-				return convertTransactionAttributeTypeObjectToString(eDataType, instanceValue);
-			case EjbPackage.TRANSACTION_TYPE_OBJECT:
-				return convertTransactionTypeObjectToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ActivationConfig createActivationConfig() {
-		ActivationConfigImpl activationConfig = new ActivationConfigImpl();
-		return activationConfig;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ActivationConfigProperty createActivationConfigProperty() {
-		ActivationConfigPropertyImpl activationConfigProperty = new ActivationConfigPropertyImpl();
-		return activationConfigProperty;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ApplicationException createApplicationException() {
-		ApplicationExceptionImpl applicationException = new ApplicationExceptionImpl();
-		return applicationException;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AroundInvokeType createAroundInvokeType() {
-		AroundInvokeTypeImpl aroundInvokeType = new AroundInvokeTypeImpl();
-		return aroundInvokeType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AssemblyDescriptor createAssemblyDescriptor() {
-		AssemblyDescriptorImpl assemblyDescriptor = new AssemblyDescriptorImpl();
-		return assemblyDescriptor;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CMPField createCMPField() {
-		CMPFieldImpl cmpField = new CMPFieldImpl();
-		return cmpField;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CMRField createCMRField() {
-		CMRFieldImpl cmrField = new CMRFieldImpl();
-		return cmrField;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ContainerTransactionType createContainerTransactionType() {
-		ContainerTransactionTypeImpl containerTransactionType = new ContainerTransactionTypeImpl();
-		return containerTransactionType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EJBJar createEJBJar() {
-		EJBJarImpl ejbJar = new EJBJarImpl();
-		return ejbJar;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EJBJarDeploymentDescriptor createEJBJarDeploymentDescriptor() {
-		EJBJarDeploymentDescriptorImpl ejbJarDeploymentDescriptor = new EJBJarDeploymentDescriptorImpl();
-		return ejbJarDeploymentDescriptor;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EJBRelation createEJBRelation() {
-		EJBRelationImpl ejbRelation = new EJBRelationImpl();
-		return ejbRelation;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EJBRelationshipRole createEJBRelationshipRole() {
-		EJBRelationshipRoleImpl ejbRelationshipRole = new EJBRelationshipRoleImpl();
-		return ejbRelationshipRole;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EnterpriseBeans createEnterpriseBeans() {
-		EnterpriseBeansImpl enterpriseBeans = new EnterpriseBeansImpl();
-		return enterpriseBeans;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EntityBean createEntityBean() {
-		EntityBeanImpl entityBean = new EntityBeanImpl();
-		return entityBean;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExcludeList createExcludeList() {
-		ExcludeListImpl excludeList = new ExcludeListImpl();
-		return excludeList;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public InitMethodType createInitMethodType() {
-		InitMethodTypeImpl initMethodType = new InitMethodTypeImpl();
-		return initMethodType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public InterceptorBindingType createInterceptorBindingType() {
-		InterceptorBindingTypeImpl interceptorBindingType = new InterceptorBindingTypeImpl();
-		return interceptorBindingType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public InterceptorOrderType createInterceptorOrderType() {
-		InterceptorOrderTypeImpl interceptorOrderType = new InterceptorOrderTypeImpl();
-		return interceptorOrderType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public InterceptorsType createInterceptorsType() {
-		InterceptorsTypeImpl interceptorsType = new InterceptorsTypeImpl();
-		return interceptorsType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public InterceptorType createInterceptorType() {
-		InterceptorTypeImpl interceptorType = new InterceptorTypeImpl();
-		return interceptorType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MessageDrivenBean createMessageDrivenBean() {
-		MessageDrivenBeanImpl messageDrivenBean = new MessageDrivenBeanImpl();
-		return messageDrivenBean;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MethodParams createMethodParams() {
-		MethodParamsImpl methodParams = new MethodParamsImpl();
-		return methodParams;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MethodPermission createMethodPermission() {
-		MethodPermissionImpl methodPermission = new MethodPermissionImpl();
-		return methodPermission;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MethodType createMethodType() {
-		MethodTypeImpl methodType = new MethodTypeImpl();
-		return methodType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NamedMethodType createNamedMethodType() {
-		NamedMethodTypeImpl namedMethodType = new NamedMethodTypeImpl();
-		return namedMethodType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Query createQuery() {
-		QueryImpl query = new QueryImpl();
-		return query;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public QueryMethod createQueryMethod() {
-		QueryMethodImpl queryMethod = new QueryMethodImpl();
-		return queryMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RelationshipRoleSourceType createRelationshipRoleSourceType() {
-		RelationshipRoleSourceTypeImpl relationshipRoleSourceType = new RelationshipRoleSourceTypeImpl();
-		return relationshipRoleSourceType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Relationships createRelationships() {
-		RelationshipsImpl relationships = new RelationshipsImpl();
-		return relationships;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RemoveMethodType createRemoveMethodType() {
-		RemoveMethodTypeImpl removeMethodType = new RemoveMethodTypeImpl();
-		return removeMethodType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SecurityIdentityType createSecurityIdentityType() {
-		SecurityIdentityTypeImpl securityIdentityType = new SecurityIdentityTypeImpl();
-		return securityIdentityType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SessionBean createSessionBean() {
-		SessionBeanImpl sessionBean = new SessionBeanImpl();
-		return sessionBean;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CmpVersionType createCmpVersionTypeFromString(EDataType eDataType, String initialValue) {
-		CmpVersionType result = CmpVersionType.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;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertCmpVersionTypeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CMRFieldType createCMRFieldTypeFromString(EDataType eDataType, String initialValue) {
-		CMRFieldType result = CMRFieldType.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;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertCMRFieldTypeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MethodInterfaceType createMethodInterfaceTypeFromString(EDataType eDataType, String initialValue) {
-		MethodInterfaceType result = MethodInterfaceType.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;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertMethodInterfaceTypeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MultiplicityType createMultiplicityTypeFromString(EDataType eDataType, String initialValue) {
-		MultiplicityType result = MultiplicityType.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;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertMultiplicityTypeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PersistenceType createPersistenceTypeFromString(EDataType eDataType, String initialValue) {
-		PersistenceType result = PersistenceType.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;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertPersistenceTypeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResultTypeMappingType createResultTypeMappingTypeFromString(EDataType eDataType, String initialValue) {
-		ResultTypeMappingType result = ResultTypeMappingType.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;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertResultTypeMappingTypeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SessionType createSessionTypeFromString(EDataType eDataType, String initialValue) {
-		SessionType result = SessionType.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;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertSessionTypeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TransactionAttributeType createTransactionAttributeTypeFromString(EDataType eDataType, String initialValue) {
-		TransactionAttributeType result = TransactionAttributeType.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;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertTransactionAttributeTypeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TransactionType createTransactionTypeFromString(EDataType eDataType, String initialValue) {
-		TransactionType result = TransactionType.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;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertTransactionTypeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CmpVersionType createCmpVersionTypeObjectFromString(EDataType eDataType, String initialValue) {
-		return (CmpVersionType)createCmpVersionTypeFromString(EjbPackage.Literals.CMP_VERSION_TYPE, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertCmpVersionTypeObjectToString(EDataType eDataType, Object instanceValue) {
-		return convertCmpVersionTypeToString(EjbPackage.Literals.CMP_VERSION_TYPE, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CMRFieldType createCMRFieldTypeObjectFromString(EDataType eDataType, String initialValue) {
-		return (CMRFieldType)createCMRFieldTypeFromString(EjbPackage.Literals.CMR_FIELD_TYPE, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertCMRFieldTypeObjectToString(EDataType eDataType, Object instanceValue) {
-		return convertCMRFieldTypeToString(EjbPackage.Literals.CMR_FIELD_TYPE, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createEjbClassTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)JavaeeFactory.eINSTANCE.createFromString(JavaeePackage.Literals.FULLY_QUALIFIED_CLASS_TYPE, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertEjbClassTypeToString(EDataType eDataType, Object instanceValue) {
-		return JavaeeFactory.eINSTANCE.convertToString(JavaeePackage.Literals.FULLY_QUALIFIED_CLASS_TYPE, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createEjbNameTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.NMTOKEN, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertEjbNameTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.Literals.NMTOKEN, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MethodInterfaceType createMethodInterfaceTypeObjectFromString(EDataType eDataType, String initialValue) {
-		return (MethodInterfaceType)createMethodInterfaceTypeFromString(EjbPackage.Literals.METHOD_INTERFACE_TYPE, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertMethodInterfaceTypeObjectToString(EDataType eDataType, Object instanceValue) {
-		return convertMethodInterfaceTypeToString(EjbPackage.Literals.METHOD_INTERFACE_TYPE, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createMethodNameTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)super.createFromString(eDataType, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertMethodNameTypeToString(EDataType eDataType, Object instanceValue) {
-		return super.convertToString(eDataType, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MultiplicityType createMultiplicityTypeObjectFromString(EDataType eDataType, String initialValue) {
-		return (MultiplicityType)createMultiplicityTypeFromString(EjbPackage.Literals.MULTIPLICITY_TYPE, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertMultiplicityTypeObjectToString(EDataType eDataType, Object instanceValue) {
-		return convertMultiplicityTypeToString(EjbPackage.Literals.MULTIPLICITY_TYPE, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PersistenceType createPersistenceTypeObjectFromString(EDataType eDataType, String initialValue) {
-		return (PersistenceType)createPersistenceTypeFromString(EjbPackage.Literals.PERSISTENCE_TYPE, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertPersistenceTypeObjectToString(EDataType eDataType, Object instanceValue) {
-		return convertPersistenceTypeToString(EjbPackage.Literals.PERSISTENCE_TYPE, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResultTypeMappingType createResultTypeMappingTypeObjectFromString(EDataType eDataType, String initialValue) {
-		return (ResultTypeMappingType)createResultTypeMappingTypeFromString(EjbPackage.Literals.RESULT_TYPE_MAPPING_TYPE, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertResultTypeMappingTypeObjectToString(EDataType eDataType, Object instanceValue) {
-		return convertResultTypeMappingTypeToString(EjbPackage.Literals.RESULT_TYPE_MAPPING_TYPE, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SessionType createSessionTypeObjectFromString(EDataType eDataType, String initialValue) {
-		return (SessionType)createSessionTypeFromString(EjbPackage.Literals.SESSION_TYPE, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertSessionTypeObjectToString(EDataType eDataType, Object instanceValue) {
-		return convertSessionTypeToString(EjbPackage.Literals.SESSION_TYPE, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TransactionAttributeType createTransactionAttributeTypeObjectFromString(EDataType eDataType, String initialValue) {
-		return (TransactionAttributeType)createTransactionAttributeTypeFromString(EjbPackage.Literals.TRANSACTION_ATTRIBUTE_TYPE, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertTransactionAttributeTypeObjectToString(EDataType eDataType, Object instanceValue) {
-		return convertTransactionAttributeTypeToString(EjbPackage.Literals.TRANSACTION_ATTRIBUTE_TYPE, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TransactionType createTransactionTypeObjectFromString(EDataType eDataType, String initialValue) {
-		return (TransactionType)createTransactionTypeFromString(EjbPackage.Literals.TRANSACTION_TYPE, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertTransactionTypeObjectToString(EDataType eDataType, Object instanceValue) {
-		return convertTransactionTypeToString(EjbPackage.Literals.TRANSACTION_TYPE, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EjbPackage getEjbPackage() {
-		return (EjbPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	public static EjbPackage getPackage() {
-		return EjbPackage.eINSTANCE;
-	}
-
-} //EjbFactoryImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EjbPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EjbPackageImpl.java
deleted file mode 100644
index 4746a2021..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EjbPackageImpl.java
+++ /dev/null
@@ -1,5949 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb.internal.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EEnum;
-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.emf.ecore.xml.type.XMLTypePackage;
-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.ActivationConfig;
-import org.eclipse.jst.javaee.ejb.ActivationConfigProperty;
-import org.eclipse.jst.javaee.ejb.ApplicationException;
-import org.eclipse.jst.javaee.ejb.AroundInvokeType;
-import org.eclipse.jst.javaee.ejb.AssemblyDescriptor;
-import org.eclipse.jst.javaee.ejb.CMPField;
-import org.eclipse.jst.javaee.ejb.CMRField;
-import org.eclipse.jst.javaee.ejb.CMRFieldType;
-import org.eclipse.jst.javaee.ejb.CmpVersionType;
-import org.eclipse.jst.javaee.ejb.ContainerTransactionType;
-import org.eclipse.jst.javaee.ejb.EJBJar;
-import org.eclipse.jst.javaee.ejb.EJBJarDeploymentDescriptor;
-import org.eclipse.jst.javaee.ejb.EJBRelation;
-import org.eclipse.jst.javaee.ejb.EJBRelationshipRole;
-import org.eclipse.jst.javaee.ejb.EjbFactory;
-import org.eclipse.jst.javaee.ejb.EnterpriseBeans;
-import org.eclipse.jst.javaee.ejb.EntityBean;
-import org.eclipse.jst.javaee.ejb.ExcludeList;
-import org.eclipse.jst.javaee.ejb.InitMethodType;
-import org.eclipse.jst.javaee.ejb.InterceptorBindingType;
-import org.eclipse.jst.javaee.ejb.InterceptorOrderType;
-import org.eclipse.jst.javaee.ejb.InterceptorType;
-import org.eclipse.jst.javaee.ejb.InterceptorsType;
-import org.eclipse.jst.javaee.ejb.MessageDrivenBean;
-import org.eclipse.jst.javaee.ejb.MethodInterfaceType;
-import org.eclipse.jst.javaee.ejb.MethodParams;
-import org.eclipse.jst.javaee.ejb.MethodPermission;
-import org.eclipse.jst.javaee.ejb.MethodType;
-import org.eclipse.jst.javaee.ejb.MultiplicityType;
-import org.eclipse.jst.javaee.ejb.NamedMethodType;
-import org.eclipse.jst.javaee.ejb.PersistenceType;
-import org.eclipse.jst.javaee.ejb.Query;
-import org.eclipse.jst.javaee.ejb.QueryMethod;
-import org.eclipse.jst.javaee.ejb.RelationshipRoleSourceType;
-import org.eclipse.jst.javaee.ejb.Relationships;
-import org.eclipse.jst.javaee.ejb.RemoveMethodType;
-import org.eclipse.jst.javaee.ejb.ResultTypeMappingType;
-import org.eclipse.jst.javaee.ejb.SecurityIdentityType;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-import org.eclipse.jst.javaee.ejb.SessionType;
-import org.eclipse.jst.javaee.ejb.TransactionAttributeType;
-import org.eclipse.jst.javaee.ejb.TransactionType;
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-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;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class EjbPackageImpl extends EPackageImpl implements EjbPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass activationConfigEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass activationConfigPropertyEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass applicationExceptionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass aroundInvokeTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass assemblyDescriptorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass cmpFieldEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass cmrFieldEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass containerTransactionTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ejbJarEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ejbJarDeploymentDescriptorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ejbRelationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ejbRelationshipRoleEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass enterpriseBeansEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass entityBeanEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass excludeListEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass initMethodTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass interceptorBindingTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass interceptorOrderTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass interceptorsTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass interceptorTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass messageDrivenBeanEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass methodParamsEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass methodPermissionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass methodTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass namedMethodTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass queryEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass queryMethodEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass relationshipRoleSourceTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass relationshipsEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass removeMethodTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass securityIdentityTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass sessionBeanEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum cmpVersionTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum cmrFieldTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum methodInterfaceTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum multiplicityTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum persistenceTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum resultTypeMappingTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum sessionTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum transactionAttributeTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum transactionTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType cmpVersionTypeObjectEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType cmrFieldTypeObjectEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType ejbClassTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType ejbNameTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType methodInterfaceTypeObjectEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType methodNameTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType multiplicityTypeObjectEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType persistenceTypeObjectEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType resultTypeMappingTypeObjectEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType sessionTypeObjectEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType transactionAttributeTypeObjectEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType transactionTypeObjectEDataType = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>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.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private EjbPackageImpl() {
-		super(eNS_URI, EjbFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> 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.
-	 * <p>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.
-	 * <p>Invocation of this method will not affect any packages that have
-	 * already been initialized.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static EjbPackage init() {
-		if (isInited) return (EjbPackage)EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI);
-
-		// Obtain or create and register package
-		EjbPackageImpl theEjbPackage = (EjbPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof EjbPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new EjbPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		XMLNamespacePackage.eINSTANCE.eClass();
-		XMLTypePackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		WebPackageImpl theWebPackage = (WebPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebPackage.eNS_URI) instanceof WebPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebPackage.eNS_URI) : WebPackage.eINSTANCE);
-		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);
-		JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) instanceof JspPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) : JspPackage.eINSTANCE);
-
-		// Create package meta-data objects
-		theEjbPackage.createPackageContents();
-		theWebPackage.createPackageContents();
-		theApplicationPackage.createPackageContents();
-		theJavaeePackage.createPackageContents();
-		theApplicationclientPackage.createPackageContents();
-		theJspPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theEjbPackage.initializePackageContents();
-		theWebPackage.initializePackageContents();
-		theApplicationPackage.initializePackageContents();
-		theJavaeePackage.initializePackageContents();
-		theApplicationclientPackage.initializePackageContents();
-		theJspPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theEjbPackage.freeze();
-
-		return theEjbPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getActivationConfig() {
-		return activationConfigEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getActivationConfig_Descriptions() {
-		return (EReference)activationConfigEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getActivationConfig_ActivationConfigProperties() {
-		return (EReference)activationConfigEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getActivationConfig_Id() {
-		return (EAttribute)activationConfigEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getActivationConfigProperty() {
-		return activationConfigPropertyEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getActivationConfigProperty_ActivationConfigPropertyName() {
-		return (EAttribute)activationConfigPropertyEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getActivationConfigProperty_ActivationConfigPropertyValue() {
-		return (EAttribute)activationConfigPropertyEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getActivationConfigProperty_Id() {
-		return (EAttribute)activationConfigPropertyEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getApplicationException() {
-		return applicationExceptionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getApplicationException_ExceptionClass() {
-		return (EAttribute)applicationExceptionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getApplicationException_Rollback() {
-		return (EAttribute)applicationExceptionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getApplicationException_Id() {
-		return (EAttribute)applicationExceptionEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getAroundInvokeType() {
-		return aroundInvokeTypeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAroundInvokeType_Class() {
-		return (EAttribute)aroundInvokeTypeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAroundInvokeType_MethodName() {
-		return (EAttribute)aroundInvokeTypeEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getAssemblyDescriptor() {
-		return assemblyDescriptorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getAssemblyDescriptor_SecurityRoles() {
-		return (EReference)assemblyDescriptorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getAssemblyDescriptor_MethodPermissions() {
-		return (EReference)assemblyDescriptorEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getAssemblyDescriptor_ContainerTransactions() {
-		return (EReference)assemblyDescriptorEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getAssemblyDescriptor_InterceptorBindings() {
-		return (EReference)assemblyDescriptorEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getAssemblyDescriptor_MessageDestinations() {
-		return (EReference)assemblyDescriptorEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getAssemblyDescriptor_ExcludeList() {
-		return (EReference)assemblyDescriptorEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getAssemblyDescriptor_ApplicationExceptions() {
-		return (EReference)assemblyDescriptorEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssemblyDescriptor_Id() {
-		return (EAttribute)assemblyDescriptorEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getCMPField() {
-		return cmpFieldEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getCMPField_Descriptions() {
-		return (EReference)cmpFieldEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getCMPField_FieldName() {
-		return (EAttribute)cmpFieldEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getCMPField_Id() {
-		return (EAttribute)cmpFieldEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getCMRField() {
-		return cmrFieldEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getCMRField_Descriptions() {
-		return (EReference)cmrFieldEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getCMRField_CmrFieldName() {
-		return (EAttribute)cmrFieldEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getCMRField_CmrFieldType() {
-		return (EAttribute)cmrFieldEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getCMRField_Id() {
-		return (EAttribute)cmrFieldEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getContainerTransactionType() {
-		return containerTransactionTypeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getContainerTransactionType_Descriptions() {
-		return (EReference)containerTransactionTypeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getContainerTransactionType_Methods() {
-		return (EReference)containerTransactionTypeEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getContainerTransactionType_TransAttribute() {
-		return (EAttribute)containerTransactionTypeEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getContainerTransactionType_Id() {
-		return (EAttribute)containerTransactionTypeEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getEJBJar() {
-		return ejbJarEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEJBJar_Descriptions() {
-		return (EReference)ejbJarEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEJBJar_DisplayNames() {
-		return (EReference)ejbJarEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEJBJar_Icons() {
-		return (EReference)ejbJarEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEJBJar_EnterpriseBeans() {
-		return (EReference)ejbJarEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEJBJar_Interceptors() {
-		return (EReference)ejbJarEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEJBJar_Relationships() {
-		return (EReference)ejbJarEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEJBJar_AssemblyDescriptor() {
-		return (EReference)ejbJarEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEJBJar_EjbClientJar() {
-		return (EAttribute)ejbJarEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEJBJar_Id() {
-		return (EAttribute)ejbJarEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEJBJar_MetadataComplete() {
-		return (EAttribute)ejbJarEClass.getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEJBJar_Version() {
-		return (EAttribute)ejbJarEClass.getEStructuralFeatures().get(10);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getEJBJarDeploymentDescriptor() {
-		return ejbJarDeploymentDescriptorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEJBJarDeploymentDescriptor_Mixed() {
-		return (EAttribute)ejbJarDeploymentDescriptorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEJBJarDeploymentDescriptor_XMLNSPrefixMap() {
-		return (EReference)ejbJarDeploymentDescriptorEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEJBJarDeploymentDescriptor_XSISchemaLocation() {
-		return (EReference)ejbJarDeploymentDescriptorEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEJBJarDeploymentDescriptor_EjbJar() {
-		return (EReference)ejbJarDeploymentDescriptorEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getEJBRelation() {
-		return ejbRelationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEJBRelation_Descriptions() {
-		return (EReference)ejbRelationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEJBRelation_EjbRelationName() {
-		return (EAttribute)ejbRelationEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEJBRelation_EjbRelationshipRoles() {
-		return (EReference)ejbRelationEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEJBRelation_Id() {
-		return (EAttribute)ejbRelationEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getEJBRelationshipRole() {
-		return ejbRelationshipRoleEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEJBRelationshipRole_Descriptions() {
-		return (EReference)ejbRelationshipRoleEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEJBRelationshipRole_EjbRelationshipRoleName() {
-		return (EAttribute)ejbRelationshipRoleEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEJBRelationshipRole_Multiplicity() {
-		return (EAttribute)ejbRelationshipRoleEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEJBRelationshipRole_CascadeDelete() {
-		return (EReference)ejbRelationshipRoleEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEJBRelationshipRole_RelationshipRoleSource() {
-		return (EReference)ejbRelationshipRoleEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEJBRelationshipRole_CmrField() {
-		return (EReference)ejbRelationshipRoleEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEJBRelationshipRole_Id() {
-		return (EAttribute)ejbRelationshipRoleEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getEnterpriseBeans() {
-		return enterpriseBeansEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEnterpriseBeans_Group() {
-		return (EAttribute)enterpriseBeansEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEnterpriseBeans_SessionBeans() {
-		return (EReference)enterpriseBeansEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEnterpriseBeans_EntityBeans() {
-		return (EReference)enterpriseBeansEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEnterpriseBeans_MessageDrivenBeans() {
-		return (EReference)enterpriseBeansEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEnterpriseBeans_Id() {
-		return (EAttribute)enterpriseBeansEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getEntityBean() {
-		return entityBeanEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEntityBean_Descriptions() {
-		return (EReference)entityBeanEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEntityBean_DisplayNames() {
-		return (EReference)entityBeanEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEntityBean_Icons() {
-		return (EReference)entityBeanEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEntityBean_EjbName() {
-		return (EAttribute)entityBeanEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEntityBean_MappedName() {
-		return (EAttribute)entityBeanEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEntityBean_Home() {
-		return (EAttribute)entityBeanEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEntityBean_Remote() {
-		return (EAttribute)entityBeanEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEntityBean_LocalHome() {
-		return (EAttribute)entityBeanEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEntityBean_Local() {
-		return (EAttribute)entityBeanEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEntityBean_EjbClass() {
-		return (EAttribute)entityBeanEClass.getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEntityBean_PersistenceType() {
-		return (EAttribute)entityBeanEClass.getEStructuralFeatures().get(10);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEntityBean_PrimKeyClass() {
-		return (EAttribute)entityBeanEClass.getEStructuralFeatures().get(11);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEntityBean_Reentrant() {
-		return (EAttribute)entityBeanEClass.getEStructuralFeatures().get(12);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEntityBean_CmpVersion() {
-		return (EAttribute)entityBeanEClass.getEStructuralFeatures().get(13);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEntityBean_AbstractSchemaName() {
-		return (EAttribute)entityBeanEClass.getEStructuralFeatures().get(14);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEntityBean_CmpFields() {
-		return (EReference)entityBeanEClass.getEStructuralFeatures().get(15);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEntityBean_PrimkeyField() {
-		return (EAttribute)entityBeanEClass.getEStructuralFeatures().get(16);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEntityBean_EnvEntries() {
-		return (EReference)entityBeanEClass.getEStructuralFeatures().get(17);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEntityBean_EjbRefs() {
-		return (EReference)entityBeanEClass.getEStructuralFeatures().get(18);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEntityBean_EjbLocalRefs() {
-		return (EReference)entityBeanEClass.getEStructuralFeatures().get(19);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEntityBean_ServiceRefs() {
-		return (EReference)entityBeanEClass.getEStructuralFeatures().get(20);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEntityBean_ResourceRefs() {
-		return (EReference)entityBeanEClass.getEStructuralFeatures().get(21);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEntityBean_ResourceEnvRefs() {
-		return (EReference)entityBeanEClass.getEStructuralFeatures().get(22);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEntityBean_MessageDestinationRefs() {
-		return (EReference)entityBeanEClass.getEStructuralFeatures().get(23);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEntityBean_PersistenceContextRefs() {
-		return (EReference)entityBeanEClass.getEStructuralFeatures().get(24);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEntityBean_PersistenceUnitRefs() {
-		return (EReference)entityBeanEClass.getEStructuralFeatures().get(25);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEntityBean_PostConstructs() {
-		return (EReference)entityBeanEClass.getEStructuralFeatures().get(26);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEntityBean_PreDestroys() {
-		return (EReference)entityBeanEClass.getEStructuralFeatures().get(27);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEntityBean_SecurityRoleRefs() {
-		return (EReference)entityBeanEClass.getEStructuralFeatures().get(28);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEntityBean_SecurityIdentity() {
-		return (EReference)entityBeanEClass.getEStructuralFeatures().get(29);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEntityBean_Queries() {
-		return (EReference)entityBeanEClass.getEStructuralFeatures().get(30);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEntityBean_Id() {
-		return (EAttribute)entityBeanEClass.getEStructuralFeatures().get(31);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getExcludeList() {
-		return excludeListEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getExcludeList_Descriptions() {
-		return (EReference)excludeListEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getExcludeList_Methods() {
-		return (EReference)excludeListEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getExcludeList_Id() {
-		return (EAttribute)excludeListEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getInitMethodType() {
-		return initMethodTypeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getInitMethodType_CreateMethod() {
-		return (EReference)initMethodTypeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getInitMethodType_BeanMethod() {
-		return (EReference)initMethodTypeEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getInitMethodType_Id() {
-		return (EAttribute)initMethodTypeEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getInterceptorBindingType() {
-		return interceptorBindingTypeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getInterceptorBindingType_Descriptions() {
-		return (EReference)interceptorBindingTypeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getInterceptorBindingType_EjbName() {
-		return (EAttribute)interceptorBindingTypeEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getInterceptorBindingType_InterceptorClasses() {
-		return (EAttribute)interceptorBindingTypeEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getInterceptorBindingType_InterceptorOrder() {
-		return (EReference)interceptorBindingTypeEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getInterceptorBindingType_ExcludeDefaultInterceptors() {
-		return (EAttribute)interceptorBindingTypeEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getInterceptorBindingType_ExcludeClassInterceptors() {
-		return (EAttribute)interceptorBindingTypeEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getInterceptorBindingType_Method() {
-		return (EReference)interceptorBindingTypeEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getInterceptorBindingType_Id() {
-		return (EAttribute)interceptorBindingTypeEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getInterceptorOrderType() {
-		return interceptorOrderTypeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getInterceptorOrderType_InterceptorClasses() {
-		return (EAttribute)interceptorOrderTypeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getInterceptorOrderType_Id() {
-		return (EAttribute)interceptorOrderTypeEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getInterceptorsType() {
-		return interceptorsTypeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getInterceptorsType_Descriptions() {
-		return (EReference)interceptorsTypeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getInterceptorsType_Interceptors() {
-		return (EReference)interceptorsTypeEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getInterceptorsType_Id() {
-		return (EAttribute)interceptorsTypeEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getInterceptorType() {
-		return interceptorTypeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getInterceptorType_Descriptions() {
-		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getInterceptorType_InterceptorClass() {
-		return (EAttribute)interceptorTypeEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getInterceptorType_AroundInvokes() {
-		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getInterceptorType_EnvEntries() {
-		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getInterceptorType_EjbRefs() {
-		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getInterceptorType_EjbLocalRefs() {
-		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getInterceptorType_ServiceRefs() {
-		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getInterceptorType_ResourceRefs() {
-		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getInterceptorType_ResourceEnvRefs() {
-		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getInterceptorType_MessageDestinationRefs() {
-		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getInterceptorType_PersistenceContextRefs() {
-		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(10);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getInterceptorType_PersistenceUnitRefs() {
-		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(11);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getInterceptorType_PostConstructs() {
-		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(12);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getInterceptorType_PreDestroys() {
-		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(13);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getInterceptorType_PostActivates() {
-		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(14);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getInterceptorType_PrePassivates() {
-		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(15);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getInterceptorType_Id() {
-		return (EAttribute)interceptorTypeEClass.getEStructuralFeatures().get(16);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMessageDrivenBean() {
-		return messageDrivenBeanEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMessageDrivenBean_Descriptions() {
-		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMessageDrivenBean_DisplayNames() {
-		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMessageDrivenBean_Icons() {
-		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMessageDrivenBean_EjbName() {
-		return (EAttribute)messageDrivenBeanEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMessageDrivenBean_MappedName() {
-		return (EAttribute)messageDrivenBeanEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMessageDrivenBean_EjbClass() {
-		return (EAttribute)messageDrivenBeanEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMessageDrivenBean_MessagingType() {
-		return (EAttribute)messageDrivenBeanEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMessageDrivenBean_TimeoutMethod() {
-		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMessageDrivenBean_TransactionType() {
-		return (EAttribute)messageDrivenBeanEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMessageDrivenBean_MessageDestinationType() {
-		return (EAttribute)messageDrivenBeanEClass.getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMessageDrivenBean_MessageDestinationLink() {
-		return (EAttribute)messageDrivenBeanEClass.getEStructuralFeatures().get(10);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMessageDrivenBean_ActivationConfig() {
-		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(11);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMessageDrivenBean_AroundInvokes() {
-		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(12);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMessageDrivenBean_EnvEntries() {
-		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(13);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMessageDrivenBean_EjbRefs() {
-		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(14);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMessageDrivenBean_EjbLocalRefs() {
-		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(15);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMessageDrivenBean_ServiceRefs() {
-		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(16);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMessageDrivenBean_ResourceRefs() {
-		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(17);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMessageDrivenBean_ResourceEnvRefs() {
-		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(18);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMessageDrivenBean_MessageDestinationRefs() {
-		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(19);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMessageDrivenBean_PersistenceContextRefs() {
-		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(20);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMessageDrivenBean_PersistenceUnitRefs() {
-		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(21);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMessageDrivenBean_PostConstructs() {
-		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(22);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMessageDrivenBean_PreDestroys() {
-		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(23);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMessageDrivenBean_SecurityIdentity() {
-		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(24);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMessageDrivenBean_Id() {
-		return (EAttribute)messageDrivenBeanEClass.getEStructuralFeatures().get(25);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMethodParams() {
-		return methodParamsEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethodParams_MethodParams() {
-		return (EAttribute)methodParamsEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethodParams_Id() {
-		return (EAttribute)methodParamsEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMethodPermission() {
-		return methodPermissionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMethodPermission_Descriptions() {
-		return (EReference)methodPermissionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethodPermission_RoleNames() {
-		return (EAttribute)methodPermissionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMethodPermission_Unchecked() {
-		return (EReference)methodPermissionEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMethodPermission_Methods() {
-		return (EReference)methodPermissionEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethodPermission_Id() {
-		return (EAttribute)methodPermissionEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMethodType() {
-		return methodTypeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMethodType_Descriptions() {
-		return (EReference)methodTypeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethodType_EjbName() {
-		return (EAttribute)methodTypeEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethodType_MethodIntf() {
-		return (EAttribute)methodTypeEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethodType_MethodName() {
-		return (EAttribute)methodTypeEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMethodType_MethodParams() {
-		return (EReference)methodTypeEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethodType_Id() {
-		return (EAttribute)methodTypeEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getNamedMethodType() {
-		return namedMethodTypeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getNamedMethodType_MethodName() {
-		return (EAttribute)namedMethodTypeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getNamedMethodType_MethodParams() {
-		return (EReference)namedMethodTypeEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getNamedMethodType_Id() {
-		return (EAttribute)namedMethodTypeEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getQuery() {
-		return queryEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getQuery_Description() {
-		return (EReference)queryEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getQuery_QueryMethod() {
-		return (EReference)queryEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getQuery_ResultTypeMapping() {
-		return (EAttribute)queryEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getQuery_EjbQl() {
-		return (EAttribute)queryEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getQuery_Id() {
-		return (EAttribute)queryEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getQueryMethod() {
-		return queryMethodEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getQueryMethod_MethodName() {
-		return (EAttribute)queryMethodEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getQueryMethod_MethodParams() {
-		return (EReference)queryMethodEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getQueryMethod_Id() {
-		return (EAttribute)queryMethodEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getRelationshipRoleSourceType() {
-		return relationshipRoleSourceTypeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getRelationshipRoleSourceType_Descriptions() {
-		return (EReference)relationshipRoleSourceTypeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRelationshipRoleSourceType_EjbName() {
-		return (EAttribute)relationshipRoleSourceTypeEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRelationshipRoleSourceType_Id() {
-		return (EAttribute)relationshipRoleSourceTypeEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getRelationships() {
-		return relationshipsEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getRelationships_Descriptions() {
-		return (EReference)relationshipsEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getRelationships_EjbRelations() {
-		return (EReference)relationshipsEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRelationships_Id() {
-		return (EAttribute)relationshipsEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getRemoveMethodType() {
-		return removeMethodTypeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getRemoveMethodType_BeanMethod() {
-		return (EReference)removeMethodTypeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRemoveMethodType_RetainIfException() {
-		return (EAttribute)removeMethodTypeEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRemoveMethodType_Id() {
-		return (EAttribute)removeMethodTypeEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getSecurityIdentityType() {
-		return securityIdentityTypeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSecurityIdentityType_Descriptions() {
-		return (EReference)securityIdentityTypeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSecurityIdentityType_UseCallerIdentity() {
-		return (EReference)securityIdentityTypeEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSecurityIdentityType_RunAs() {
-		return (EReference)securityIdentityTypeEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSecurityIdentityType_Id() {
-		return (EAttribute)securityIdentityTypeEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getSessionBean() {
-		return sessionBeanEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSessionBean_Descriptions() {
-		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSessionBean_DisplayNames() {
-		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSessionBean_Icons() {
-		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSessionBean_EjbName() {
-		return (EAttribute)sessionBeanEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSessionBean_MappedName() {
-		return (EAttribute)sessionBeanEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSessionBean_Home() {
-		return (EAttribute)sessionBeanEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSessionBean_Remote() {
-		return (EAttribute)sessionBeanEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSessionBean_LocalHome() {
-		return (EAttribute)sessionBeanEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSessionBean_Local() {
-		return (EAttribute)sessionBeanEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSessionBean_BusinessLocals() {
-		return (EAttribute)sessionBeanEClass.getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSessionBean_BusinessRemotes() {
-		return (EAttribute)sessionBeanEClass.getEStructuralFeatures().get(10);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSessionBean_ServiceEndpoint() {
-		return (EAttribute)sessionBeanEClass.getEStructuralFeatures().get(11);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSessionBean_EjbClass() {
-		return (EAttribute)sessionBeanEClass.getEStructuralFeatures().get(12);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSessionBean_SessionType() {
-		return (EAttribute)sessionBeanEClass.getEStructuralFeatures().get(13);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSessionBean_TimeoutMethod() {
-		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(14);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSessionBean_InitMethods() {
-		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(15);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSessionBean_RemoveMethods() {
-		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(16);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSessionBean_TransactionType() {
-		return (EAttribute)sessionBeanEClass.getEStructuralFeatures().get(17);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSessionBean_AroundInvokes() {
-		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(18);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSessionBean_EnvEntries() {
-		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(19);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSessionBean_EjbRefs() {
-		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(20);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSessionBean_EjbLocalRefs() {
-		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(21);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSessionBean_ServiceRefs() {
-		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(22);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSessionBean_ResourceRefs() {
-		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(23);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSessionBean_ResourceEnvRefs() {
-		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(24);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSessionBean_MessageDestinationRefs() {
-		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(25);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSessionBean_PersistenceContextRefs() {
-		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(26);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSessionBean_PersistenceUnitRefs() {
-		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(27);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSessionBean_PostConstructs() {
-		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(28);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSessionBean_PreDestroys() {
-		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(29);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSessionBean_PostActivates() {
-		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(30);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSessionBean_PrePassivates() {
-		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(31);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSessionBean_SecurityRoleRefs() {
-		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(32);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSessionBean_SecurityIdentities() {
-		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(33);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSessionBean_Id() {
-		return (EAttribute)sessionBeanEClass.getEStructuralFeatures().get(34);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getCmpVersionType() {
-		return cmpVersionTypeEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getCMRFieldType() {
-		return cmrFieldTypeEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getMethodInterfaceType() {
-		return methodInterfaceTypeEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getMultiplicityType() {
-		return multiplicityTypeEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getPersistenceType() {
-		return persistenceTypeEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getResultTypeMappingType() {
-		return resultTypeMappingTypeEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getSessionType() {
-		return sessionTypeEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getTransactionAttributeType() {
-		return transactionAttributeTypeEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getTransactionType() {
-		return transactionTypeEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getCmpVersionTypeObject() {
-		return cmpVersionTypeObjectEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getCMRFieldTypeObject() {
-		return cmrFieldTypeObjectEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getEjbClassType() {
-		return ejbClassTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getEjbNameType() {
-		return ejbNameTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getMethodInterfaceTypeObject() {
-		return methodInterfaceTypeObjectEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getMethodNameType() {
-		return methodNameTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getMultiplicityTypeObject() {
-		return multiplicityTypeObjectEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getPersistenceTypeObject() {
-		return persistenceTypeObjectEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getResultTypeMappingTypeObject() {
-		return resultTypeMappingTypeObjectEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getSessionTypeObject() {
-		return sessionTypeObjectEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getTransactionAttributeTypeObject() {
-		return transactionAttributeTypeObjectEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getTransactionTypeObject() {
-		return transactionTypeObjectEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EjbFactory getEjbFactory() {
-		return (EjbFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @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.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		activationConfigEClass = createEClass(ACTIVATION_CONFIG);
-		createEReference(activationConfigEClass, ACTIVATION_CONFIG__DESCRIPTIONS);
-		createEReference(activationConfigEClass, ACTIVATION_CONFIG__ACTIVATION_CONFIG_PROPERTIES);
-		createEAttribute(activationConfigEClass, ACTIVATION_CONFIG__ID);
-
-		activationConfigPropertyEClass = createEClass(ACTIVATION_CONFIG_PROPERTY);
-		createEAttribute(activationConfigPropertyEClass, ACTIVATION_CONFIG_PROPERTY__ACTIVATION_CONFIG_PROPERTY_NAME);
-		createEAttribute(activationConfigPropertyEClass, ACTIVATION_CONFIG_PROPERTY__ACTIVATION_CONFIG_PROPERTY_VALUE);
-		createEAttribute(activationConfigPropertyEClass, ACTIVATION_CONFIG_PROPERTY__ID);
-
-		applicationExceptionEClass = createEClass(APPLICATION_EXCEPTION);
-		createEAttribute(applicationExceptionEClass, APPLICATION_EXCEPTION__EXCEPTION_CLASS);
-		createEAttribute(applicationExceptionEClass, APPLICATION_EXCEPTION__ROLLBACK);
-		createEAttribute(applicationExceptionEClass, APPLICATION_EXCEPTION__ID);
-
-		aroundInvokeTypeEClass = createEClass(AROUND_INVOKE_TYPE);
-		createEAttribute(aroundInvokeTypeEClass, AROUND_INVOKE_TYPE__CLASS);
-		createEAttribute(aroundInvokeTypeEClass, AROUND_INVOKE_TYPE__METHOD_NAME);
-
-		assemblyDescriptorEClass = createEClass(ASSEMBLY_DESCRIPTOR);
-		createEReference(assemblyDescriptorEClass, ASSEMBLY_DESCRIPTOR__SECURITY_ROLES);
-		createEReference(assemblyDescriptorEClass, ASSEMBLY_DESCRIPTOR__METHOD_PERMISSIONS);
-		createEReference(assemblyDescriptorEClass, ASSEMBLY_DESCRIPTOR__CONTAINER_TRANSACTIONS);
-		createEReference(assemblyDescriptorEClass, ASSEMBLY_DESCRIPTOR__INTERCEPTOR_BINDINGS);
-		createEReference(assemblyDescriptorEClass, ASSEMBLY_DESCRIPTOR__MESSAGE_DESTINATIONS);
-		createEReference(assemblyDescriptorEClass, ASSEMBLY_DESCRIPTOR__EXCLUDE_LIST);
-		createEReference(assemblyDescriptorEClass, ASSEMBLY_DESCRIPTOR__APPLICATION_EXCEPTIONS);
-		createEAttribute(assemblyDescriptorEClass, ASSEMBLY_DESCRIPTOR__ID);
-
-		cmpFieldEClass = createEClass(CMP_FIELD);
-		createEReference(cmpFieldEClass, CMP_FIELD__DESCRIPTIONS);
-		createEAttribute(cmpFieldEClass, CMP_FIELD__FIELD_NAME);
-		createEAttribute(cmpFieldEClass, CMP_FIELD__ID);
-
-		cmrFieldEClass = createEClass(CMR_FIELD);
-		createEReference(cmrFieldEClass, CMR_FIELD__DESCRIPTIONS);
-		createEAttribute(cmrFieldEClass, CMR_FIELD__CMR_FIELD_NAME);
-		createEAttribute(cmrFieldEClass, CMR_FIELD__CMR_FIELD_TYPE);
-		createEAttribute(cmrFieldEClass, CMR_FIELD__ID);
-
-		containerTransactionTypeEClass = createEClass(CONTAINER_TRANSACTION_TYPE);
-		createEReference(containerTransactionTypeEClass, CONTAINER_TRANSACTION_TYPE__DESCRIPTIONS);
-		createEReference(containerTransactionTypeEClass, CONTAINER_TRANSACTION_TYPE__METHODS);
-		createEAttribute(containerTransactionTypeEClass, CONTAINER_TRANSACTION_TYPE__TRANS_ATTRIBUTE);
-		createEAttribute(containerTransactionTypeEClass, CONTAINER_TRANSACTION_TYPE__ID);
-
-		ejbJarEClass = createEClass(EJB_JAR);
-		createEReference(ejbJarEClass, EJB_JAR__DESCRIPTIONS);
-		createEReference(ejbJarEClass, EJB_JAR__DISPLAY_NAMES);
-		createEReference(ejbJarEClass, EJB_JAR__ICONS);
-		createEReference(ejbJarEClass, EJB_JAR__ENTERPRISE_BEANS);
-		createEReference(ejbJarEClass, EJB_JAR__INTERCEPTORS);
-		createEReference(ejbJarEClass, EJB_JAR__RELATIONSHIPS);
-		createEReference(ejbJarEClass, EJB_JAR__ASSEMBLY_DESCRIPTOR);
-		createEAttribute(ejbJarEClass, EJB_JAR__EJB_CLIENT_JAR);
-		createEAttribute(ejbJarEClass, EJB_JAR__ID);
-		createEAttribute(ejbJarEClass, EJB_JAR__METADATA_COMPLETE);
-		createEAttribute(ejbJarEClass, EJB_JAR__VERSION);
-
-		ejbJarDeploymentDescriptorEClass = createEClass(EJB_JAR_DEPLOYMENT_DESCRIPTOR);
-		createEAttribute(ejbJarDeploymentDescriptorEClass, EJB_JAR_DEPLOYMENT_DESCRIPTOR__MIXED);
-		createEReference(ejbJarDeploymentDescriptorEClass, EJB_JAR_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP);
-		createEReference(ejbJarDeploymentDescriptorEClass, EJB_JAR_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION);
-		createEReference(ejbJarDeploymentDescriptorEClass, EJB_JAR_DEPLOYMENT_DESCRIPTOR__EJB_JAR);
-
-		ejbRelationEClass = createEClass(EJB_RELATION);
-		createEReference(ejbRelationEClass, EJB_RELATION__DESCRIPTIONS);
-		createEAttribute(ejbRelationEClass, EJB_RELATION__EJB_RELATION_NAME);
-		createEReference(ejbRelationEClass, EJB_RELATION__EJB_RELATIONSHIP_ROLES);
-		createEAttribute(ejbRelationEClass, EJB_RELATION__ID);
-
-		ejbRelationshipRoleEClass = createEClass(EJB_RELATIONSHIP_ROLE);
-		createEReference(ejbRelationshipRoleEClass, EJB_RELATIONSHIP_ROLE__DESCRIPTIONS);
-		createEAttribute(ejbRelationshipRoleEClass, EJB_RELATIONSHIP_ROLE__EJB_RELATIONSHIP_ROLE_NAME);
-		createEAttribute(ejbRelationshipRoleEClass, EJB_RELATIONSHIP_ROLE__MULTIPLICITY);
-		createEReference(ejbRelationshipRoleEClass, EJB_RELATIONSHIP_ROLE__CASCADE_DELETE);
-		createEReference(ejbRelationshipRoleEClass, EJB_RELATIONSHIP_ROLE__RELATIONSHIP_ROLE_SOURCE);
-		createEReference(ejbRelationshipRoleEClass, EJB_RELATIONSHIP_ROLE__CMR_FIELD);
-		createEAttribute(ejbRelationshipRoleEClass, EJB_RELATIONSHIP_ROLE__ID);
-
-		enterpriseBeansEClass = createEClass(ENTERPRISE_BEANS);
-		createEAttribute(enterpriseBeansEClass, ENTERPRISE_BEANS__GROUP);
-		createEReference(enterpriseBeansEClass, ENTERPRISE_BEANS__SESSION_BEANS);
-		createEReference(enterpriseBeansEClass, ENTERPRISE_BEANS__ENTITY_BEANS);
-		createEReference(enterpriseBeansEClass, ENTERPRISE_BEANS__MESSAGE_DRIVEN_BEANS);
-		createEAttribute(enterpriseBeansEClass, ENTERPRISE_BEANS__ID);
-
-		entityBeanEClass = createEClass(ENTITY_BEAN);
-		createEReference(entityBeanEClass, ENTITY_BEAN__DESCRIPTIONS);
-		createEReference(entityBeanEClass, ENTITY_BEAN__DISPLAY_NAMES);
-		createEReference(entityBeanEClass, ENTITY_BEAN__ICONS);
-		createEAttribute(entityBeanEClass, ENTITY_BEAN__EJB_NAME);
-		createEAttribute(entityBeanEClass, ENTITY_BEAN__MAPPED_NAME);
-		createEAttribute(entityBeanEClass, ENTITY_BEAN__HOME);
-		createEAttribute(entityBeanEClass, ENTITY_BEAN__REMOTE);
-		createEAttribute(entityBeanEClass, ENTITY_BEAN__LOCAL_HOME);
-		createEAttribute(entityBeanEClass, ENTITY_BEAN__LOCAL);
-		createEAttribute(entityBeanEClass, ENTITY_BEAN__EJB_CLASS);
-		createEAttribute(entityBeanEClass, ENTITY_BEAN__PERSISTENCE_TYPE);
-		createEAttribute(entityBeanEClass, ENTITY_BEAN__PRIM_KEY_CLASS);
-		createEAttribute(entityBeanEClass, ENTITY_BEAN__REENTRANT);
-		createEAttribute(entityBeanEClass, ENTITY_BEAN__CMP_VERSION);
-		createEAttribute(entityBeanEClass, ENTITY_BEAN__ABSTRACT_SCHEMA_NAME);
-		createEReference(entityBeanEClass, ENTITY_BEAN__CMP_FIELDS);
-		createEAttribute(entityBeanEClass, ENTITY_BEAN__PRIMKEY_FIELD);
-		createEReference(entityBeanEClass, ENTITY_BEAN__ENV_ENTRIES);
-		createEReference(entityBeanEClass, ENTITY_BEAN__EJB_REFS);
-		createEReference(entityBeanEClass, ENTITY_BEAN__EJB_LOCAL_REFS);
-		createEReference(entityBeanEClass, ENTITY_BEAN__SERVICE_REFS);
-		createEReference(entityBeanEClass, ENTITY_BEAN__RESOURCE_REFS);
-		createEReference(entityBeanEClass, ENTITY_BEAN__RESOURCE_ENV_REFS);
-		createEReference(entityBeanEClass, ENTITY_BEAN__MESSAGE_DESTINATION_REFS);
-		createEReference(entityBeanEClass, ENTITY_BEAN__PERSISTENCE_CONTEXT_REFS);
-		createEReference(entityBeanEClass, ENTITY_BEAN__PERSISTENCE_UNIT_REFS);
-		createEReference(entityBeanEClass, ENTITY_BEAN__POST_CONSTRUCTS);
-		createEReference(entityBeanEClass, ENTITY_BEAN__PRE_DESTROYS);
-		createEReference(entityBeanEClass, ENTITY_BEAN__SECURITY_ROLE_REFS);
-		createEReference(entityBeanEClass, ENTITY_BEAN__SECURITY_IDENTITY);
-		createEReference(entityBeanEClass, ENTITY_BEAN__QUERIES);
-		createEAttribute(entityBeanEClass, ENTITY_BEAN__ID);
-
-		excludeListEClass = createEClass(EXCLUDE_LIST);
-		createEReference(excludeListEClass, EXCLUDE_LIST__DESCRIPTIONS);
-		createEReference(excludeListEClass, EXCLUDE_LIST__METHODS);
-		createEAttribute(excludeListEClass, EXCLUDE_LIST__ID);
-
-		initMethodTypeEClass = createEClass(INIT_METHOD_TYPE);
-		createEReference(initMethodTypeEClass, INIT_METHOD_TYPE__CREATE_METHOD);
-		createEReference(initMethodTypeEClass, INIT_METHOD_TYPE__BEAN_METHOD);
-		createEAttribute(initMethodTypeEClass, INIT_METHOD_TYPE__ID);
-
-		interceptorBindingTypeEClass = createEClass(INTERCEPTOR_BINDING_TYPE);
-		createEReference(interceptorBindingTypeEClass, INTERCEPTOR_BINDING_TYPE__DESCRIPTIONS);
-		createEAttribute(interceptorBindingTypeEClass, INTERCEPTOR_BINDING_TYPE__EJB_NAME);
-		createEAttribute(interceptorBindingTypeEClass, INTERCEPTOR_BINDING_TYPE__INTERCEPTOR_CLASSES);
-		createEReference(interceptorBindingTypeEClass, INTERCEPTOR_BINDING_TYPE__INTERCEPTOR_ORDER);
-		createEAttribute(interceptorBindingTypeEClass, INTERCEPTOR_BINDING_TYPE__EXCLUDE_DEFAULT_INTERCEPTORS);
-		createEAttribute(interceptorBindingTypeEClass, INTERCEPTOR_BINDING_TYPE__EXCLUDE_CLASS_INTERCEPTORS);
-		createEReference(interceptorBindingTypeEClass, INTERCEPTOR_BINDING_TYPE__METHOD);
-		createEAttribute(interceptorBindingTypeEClass, INTERCEPTOR_BINDING_TYPE__ID);
-
-		interceptorOrderTypeEClass = createEClass(INTERCEPTOR_ORDER_TYPE);
-		createEAttribute(interceptorOrderTypeEClass, INTERCEPTOR_ORDER_TYPE__INTERCEPTOR_CLASSES);
-		createEAttribute(interceptorOrderTypeEClass, INTERCEPTOR_ORDER_TYPE__ID);
-
-		interceptorsTypeEClass = createEClass(INTERCEPTORS_TYPE);
-		createEReference(interceptorsTypeEClass, INTERCEPTORS_TYPE__DESCRIPTIONS);
-		createEReference(interceptorsTypeEClass, INTERCEPTORS_TYPE__INTERCEPTORS);
-		createEAttribute(interceptorsTypeEClass, INTERCEPTORS_TYPE__ID);
-
-		interceptorTypeEClass = createEClass(INTERCEPTOR_TYPE);
-		createEReference(interceptorTypeEClass, INTERCEPTOR_TYPE__DESCRIPTIONS);
-		createEAttribute(interceptorTypeEClass, INTERCEPTOR_TYPE__INTERCEPTOR_CLASS);
-		createEReference(interceptorTypeEClass, INTERCEPTOR_TYPE__AROUND_INVOKES);
-		createEReference(interceptorTypeEClass, INTERCEPTOR_TYPE__ENV_ENTRIES);
-		createEReference(interceptorTypeEClass, INTERCEPTOR_TYPE__EJB_REFS);
-		createEReference(interceptorTypeEClass, INTERCEPTOR_TYPE__EJB_LOCAL_REFS);
-		createEReference(interceptorTypeEClass, INTERCEPTOR_TYPE__SERVICE_REFS);
-		createEReference(interceptorTypeEClass, INTERCEPTOR_TYPE__RESOURCE_REFS);
-		createEReference(interceptorTypeEClass, INTERCEPTOR_TYPE__RESOURCE_ENV_REFS);
-		createEReference(interceptorTypeEClass, INTERCEPTOR_TYPE__MESSAGE_DESTINATION_REFS);
-		createEReference(interceptorTypeEClass, INTERCEPTOR_TYPE__PERSISTENCE_CONTEXT_REFS);
-		createEReference(interceptorTypeEClass, INTERCEPTOR_TYPE__PERSISTENCE_UNIT_REFS);
-		createEReference(interceptorTypeEClass, INTERCEPTOR_TYPE__POST_CONSTRUCTS);
-		createEReference(interceptorTypeEClass, INTERCEPTOR_TYPE__PRE_DESTROYS);
-		createEReference(interceptorTypeEClass, INTERCEPTOR_TYPE__POST_ACTIVATES);
-		createEReference(interceptorTypeEClass, INTERCEPTOR_TYPE__PRE_PASSIVATES);
-		createEAttribute(interceptorTypeEClass, INTERCEPTOR_TYPE__ID);
-
-		messageDrivenBeanEClass = createEClass(MESSAGE_DRIVEN_BEAN);
-		createEReference(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__DESCRIPTIONS);
-		createEReference(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__DISPLAY_NAMES);
-		createEReference(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__ICONS);
-		createEAttribute(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__EJB_NAME);
-		createEAttribute(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__MAPPED_NAME);
-		createEAttribute(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__EJB_CLASS);
-		createEAttribute(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__MESSAGING_TYPE);
-		createEReference(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__TIMEOUT_METHOD);
-		createEAttribute(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__TRANSACTION_TYPE);
-		createEAttribute(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__MESSAGE_DESTINATION_TYPE);
-		createEAttribute(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__MESSAGE_DESTINATION_LINK);
-		createEReference(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__ACTIVATION_CONFIG);
-		createEReference(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__AROUND_INVOKES);
-		createEReference(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__ENV_ENTRIES);
-		createEReference(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__EJB_REFS);
-		createEReference(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__EJB_LOCAL_REFS);
-		createEReference(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__SERVICE_REFS);
-		createEReference(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__RESOURCE_REFS);
-		createEReference(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__RESOURCE_ENV_REFS);
-		createEReference(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__MESSAGE_DESTINATION_REFS);
-		createEReference(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__PERSISTENCE_CONTEXT_REFS);
-		createEReference(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__PERSISTENCE_UNIT_REFS);
-		createEReference(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__POST_CONSTRUCTS);
-		createEReference(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__PRE_DESTROYS);
-		createEReference(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__SECURITY_IDENTITY);
-		createEAttribute(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__ID);
-
-		methodParamsEClass = createEClass(METHOD_PARAMS);
-		createEAttribute(methodParamsEClass, METHOD_PARAMS__METHOD_PARAMS);
-		createEAttribute(methodParamsEClass, METHOD_PARAMS__ID);
-
-		methodPermissionEClass = createEClass(METHOD_PERMISSION);
-		createEReference(methodPermissionEClass, METHOD_PERMISSION__DESCRIPTIONS);
-		createEAttribute(methodPermissionEClass, METHOD_PERMISSION__ROLE_NAMES);
-		createEReference(methodPermissionEClass, METHOD_PERMISSION__UNCHECKED);
-		createEReference(methodPermissionEClass, METHOD_PERMISSION__METHODS);
-		createEAttribute(methodPermissionEClass, METHOD_PERMISSION__ID);
-
-		methodTypeEClass = createEClass(METHOD_TYPE);
-		createEReference(methodTypeEClass, METHOD_TYPE__DESCRIPTIONS);
-		createEAttribute(methodTypeEClass, METHOD_TYPE__EJB_NAME);
-		createEAttribute(methodTypeEClass, METHOD_TYPE__METHOD_INTF);
-		createEAttribute(methodTypeEClass, METHOD_TYPE__METHOD_NAME);
-		createEReference(methodTypeEClass, METHOD_TYPE__METHOD_PARAMS);
-		createEAttribute(methodTypeEClass, METHOD_TYPE__ID);
-
-		namedMethodTypeEClass = createEClass(NAMED_METHOD_TYPE);
-		createEAttribute(namedMethodTypeEClass, NAMED_METHOD_TYPE__METHOD_NAME);
-		createEReference(namedMethodTypeEClass, NAMED_METHOD_TYPE__METHOD_PARAMS);
-		createEAttribute(namedMethodTypeEClass, NAMED_METHOD_TYPE__ID);
-
-		queryEClass = createEClass(QUERY);
-		createEReference(queryEClass, QUERY__DESCRIPTION);
-		createEReference(queryEClass, QUERY__QUERY_METHOD);
-		createEAttribute(queryEClass, QUERY__RESULT_TYPE_MAPPING);
-		createEAttribute(queryEClass, QUERY__EJB_QL);
-		createEAttribute(queryEClass, QUERY__ID);
-
-		queryMethodEClass = createEClass(QUERY_METHOD);
-		createEAttribute(queryMethodEClass, QUERY_METHOD__METHOD_NAME);
-		createEReference(queryMethodEClass, QUERY_METHOD__METHOD_PARAMS);
-		createEAttribute(queryMethodEClass, QUERY_METHOD__ID);
-
-		relationshipRoleSourceTypeEClass = createEClass(RELATIONSHIP_ROLE_SOURCE_TYPE);
-		createEReference(relationshipRoleSourceTypeEClass, RELATIONSHIP_ROLE_SOURCE_TYPE__DESCRIPTIONS);
-		createEAttribute(relationshipRoleSourceTypeEClass, RELATIONSHIP_ROLE_SOURCE_TYPE__EJB_NAME);
-		createEAttribute(relationshipRoleSourceTypeEClass, RELATIONSHIP_ROLE_SOURCE_TYPE__ID);
-
-		relationshipsEClass = createEClass(RELATIONSHIPS);
-		createEReference(relationshipsEClass, RELATIONSHIPS__DESCRIPTIONS);
-		createEReference(relationshipsEClass, RELATIONSHIPS__EJB_RELATIONS);
-		createEAttribute(relationshipsEClass, RELATIONSHIPS__ID);
-
-		removeMethodTypeEClass = createEClass(REMOVE_METHOD_TYPE);
-		createEReference(removeMethodTypeEClass, REMOVE_METHOD_TYPE__BEAN_METHOD);
-		createEAttribute(removeMethodTypeEClass, REMOVE_METHOD_TYPE__RETAIN_IF_EXCEPTION);
-		createEAttribute(removeMethodTypeEClass, REMOVE_METHOD_TYPE__ID);
-
-		securityIdentityTypeEClass = createEClass(SECURITY_IDENTITY_TYPE);
-		createEReference(securityIdentityTypeEClass, SECURITY_IDENTITY_TYPE__DESCRIPTIONS);
-		createEReference(securityIdentityTypeEClass, SECURITY_IDENTITY_TYPE__USE_CALLER_IDENTITY);
-		createEReference(securityIdentityTypeEClass, SECURITY_IDENTITY_TYPE__RUN_AS);
-		createEAttribute(securityIdentityTypeEClass, SECURITY_IDENTITY_TYPE__ID);
-
-		sessionBeanEClass = createEClass(SESSION_BEAN);
-		createEReference(sessionBeanEClass, SESSION_BEAN__DESCRIPTIONS);
-		createEReference(sessionBeanEClass, SESSION_BEAN__DISPLAY_NAMES);
-		createEReference(sessionBeanEClass, SESSION_BEAN__ICONS);
-		createEAttribute(sessionBeanEClass, SESSION_BEAN__EJB_NAME);
-		createEAttribute(sessionBeanEClass, SESSION_BEAN__MAPPED_NAME);
-		createEAttribute(sessionBeanEClass, SESSION_BEAN__HOME);
-		createEAttribute(sessionBeanEClass, SESSION_BEAN__REMOTE);
-		createEAttribute(sessionBeanEClass, SESSION_BEAN__LOCAL_HOME);
-		createEAttribute(sessionBeanEClass, SESSION_BEAN__LOCAL);
-		createEAttribute(sessionBeanEClass, SESSION_BEAN__BUSINESS_LOCALS);
-		createEAttribute(sessionBeanEClass, SESSION_BEAN__BUSINESS_REMOTES);
-		createEAttribute(sessionBeanEClass, SESSION_BEAN__SERVICE_ENDPOINT);
-		createEAttribute(sessionBeanEClass, SESSION_BEAN__EJB_CLASS);
-		createEAttribute(sessionBeanEClass, SESSION_BEAN__SESSION_TYPE);
-		createEReference(sessionBeanEClass, SESSION_BEAN__TIMEOUT_METHOD);
-		createEReference(sessionBeanEClass, SESSION_BEAN__INIT_METHODS);
-		createEReference(sessionBeanEClass, SESSION_BEAN__REMOVE_METHODS);
-		createEAttribute(sessionBeanEClass, SESSION_BEAN__TRANSACTION_TYPE);
-		createEReference(sessionBeanEClass, SESSION_BEAN__AROUND_INVOKES);
-		createEReference(sessionBeanEClass, SESSION_BEAN__ENV_ENTRIES);
-		createEReference(sessionBeanEClass, SESSION_BEAN__EJB_REFS);
-		createEReference(sessionBeanEClass, SESSION_BEAN__EJB_LOCAL_REFS);
-		createEReference(sessionBeanEClass, SESSION_BEAN__SERVICE_REFS);
-		createEReference(sessionBeanEClass, SESSION_BEAN__RESOURCE_REFS);
-		createEReference(sessionBeanEClass, SESSION_BEAN__RESOURCE_ENV_REFS);
-		createEReference(sessionBeanEClass, SESSION_BEAN__MESSAGE_DESTINATION_REFS);
-		createEReference(sessionBeanEClass, SESSION_BEAN__PERSISTENCE_CONTEXT_REFS);
-		createEReference(sessionBeanEClass, SESSION_BEAN__PERSISTENCE_UNIT_REFS);
-		createEReference(sessionBeanEClass, SESSION_BEAN__POST_CONSTRUCTS);
-		createEReference(sessionBeanEClass, SESSION_BEAN__PRE_DESTROYS);
-		createEReference(sessionBeanEClass, SESSION_BEAN__POST_ACTIVATES);
-		createEReference(sessionBeanEClass, SESSION_BEAN__PRE_PASSIVATES);
-		createEReference(sessionBeanEClass, SESSION_BEAN__SECURITY_ROLE_REFS);
-		createEReference(sessionBeanEClass, SESSION_BEAN__SECURITY_IDENTITIES);
-		createEAttribute(sessionBeanEClass, SESSION_BEAN__ID);
-
-		// Create enums
-		cmpVersionTypeEEnum = createEEnum(CMP_VERSION_TYPE);
-		cmrFieldTypeEEnum = createEEnum(CMR_FIELD_TYPE);
-		methodInterfaceTypeEEnum = createEEnum(METHOD_INTERFACE_TYPE);
-		multiplicityTypeEEnum = createEEnum(MULTIPLICITY_TYPE);
-		persistenceTypeEEnum = createEEnum(PERSISTENCE_TYPE);
-		resultTypeMappingTypeEEnum = createEEnum(RESULT_TYPE_MAPPING_TYPE);
-		sessionTypeEEnum = createEEnum(SESSION_TYPE);
-		transactionAttributeTypeEEnum = createEEnum(TRANSACTION_ATTRIBUTE_TYPE);
-		transactionTypeEEnum = createEEnum(TRANSACTION_TYPE);
-
-		// Create data types
-		cmpVersionTypeObjectEDataType = createEDataType(CMP_VERSION_TYPE_OBJECT);
-		cmrFieldTypeObjectEDataType = createEDataType(CMR_FIELD_TYPE_OBJECT);
-		ejbClassTypeEDataType = createEDataType(EJB_CLASS_TYPE);
-		ejbNameTypeEDataType = createEDataType(EJB_NAME_TYPE);
-		methodInterfaceTypeObjectEDataType = createEDataType(METHOD_INTERFACE_TYPE_OBJECT);
-		methodNameTypeEDataType = createEDataType(METHOD_NAME_TYPE);
-		multiplicityTypeObjectEDataType = createEDataType(MULTIPLICITY_TYPE_OBJECT);
-		persistenceTypeObjectEDataType = createEDataType(PERSISTENCE_TYPE_OBJECT);
-		resultTypeMappingTypeObjectEDataType = createEDataType(RESULT_TYPE_MAPPING_TYPE_OBJECT);
-		sessionTypeObjectEDataType = createEDataType(SESSION_TYPE_OBJECT);
-		transactionAttributeTypeObjectEDataType = createEDataType(TRANSACTION_ATTRIBUTE_TYPE_OBJECT);
-		transactionTypeObjectEDataType = createEDataType(TRANSACTION_TYPE_OBJECT);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @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.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @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);
-
-		// Add supertypes to classes
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(activationConfigEClass, ActivationConfig.class, "ActivationConfig", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getActivationConfig_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, ActivationConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getActivationConfig_ActivationConfigProperties(), this.getActivationConfigProperty(), null, "activationConfigProperties", null, 1, -1, ActivationConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getActivationConfig_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ActivationConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(activationConfigPropertyEClass, ActivationConfigProperty.class, "ActivationConfigProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getActivationConfigProperty_ActivationConfigPropertyName(), theXMLTypePackage.getString(), "activationConfigPropertyName", null, 1, 1, ActivationConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getActivationConfigProperty_ActivationConfigPropertyValue(), theXMLTypePackage.getString(), "activationConfigPropertyValue", null, 1, 1, ActivationConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getActivationConfigProperty_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ActivationConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(applicationExceptionEClass, ApplicationException.class, "ApplicationException", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getApplicationException_ExceptionClass(), theJavaeePackage.getFullyQualifiedClassType(), "exceptionClass", null, 1, 1, ApplicationException.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getApplicationException_Rollback(), theJavaeePackage.getTrueFalseType(), "rollback", null, 0, 1, ApplicationException.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getApplicationException_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ApplicationException.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(aroundInvokeTypeEClass, AroundInvokeType.class, "AroundInvokeType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getAroundInvokeType_Class(), theJavaeePackage.getFullyQualifiedClassType(), "class", null, 0, 1, AroundInvokeType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getAroundInvokeType_MethodName(), theJavaeePackage.getJavaIdentifier(), "methodName", null, 1, 1, AroundInvokeType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(assemblyDescriptorEClass, AssemblyDescriptor.class, "AssemblyDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getAssemblyDescriptor_SecurityRoles(), theJavaeePackage.getSecurityRole(), null, "securityRoles", null, 0, -1, AssemblyDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getAssemblyDescriptor_MethodPermissions(), this.getMethodPermission(), null, "methodPermissions", null, 0, -1, AssemblyDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getAssemblyDescriptor_ContainerTransactions(), this.getContainerTransactionType(), null, "containerTransactions", null, 0, -1, AssemblyDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getAssemblyDescriptor_InterceptorBindings(), this.getInterceptorBindingType(), null, "interceptorBindings", null, 0, -1, AssemblyDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getAssemblyDescriptor_MessageDestinations(), theJavaeePackage.getMessageDestination(), null, "messageDestinations", null, 0, -1, AssemblyDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getAssemblyDescriptor_ExcludeList(), this.getExcludeList(), null, "excludeList", null, 0, 1, AssemblyDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getAssemblyDescriptor_ApplicationExceptions(), this.getApplicationException(), null, "applicationExceptions", null, 0, -1, AssemblyDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getAssemblyDescriptor_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, AssemblyDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(cmpFieldEClass, CMPField.class, "CMPField", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getCMPField_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, CMPField.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getCMPField_FieldName(), theJavaeePackage.getJavaIdentifier(), "fieldName", null, 1, 1, CMPField.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getCMPField_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, CMPField.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(cmrFieldEClass, CMRField.class, "CMRField", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getCMRField_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, CMRField.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getCMRField_CmrFieldName(), theXMLTypePackage.getToken(), "cmrFieldName", null, 1, 1, CMRField.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getCMRField_CmrFieldType(), this.getCMRFieldType(), "cmrFieldType", "java.util.Collection", 0, 1, CMRField.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getCMRField_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, CMRField.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(containerTransactionTypeEClass, ContainerTransactionType.class, "ContainerTransactionType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getContainerTransactionType_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, ContainerTransactionType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getContainerTransactionType_Methods(), this.getMethodType(), null, "methods", null, 1, -1, ContainerTransactionType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getContainerTransactionType_TransAttribute(), this.getTransactionAttributeType(), "transAttribute", "NotSupported", 1, 1, ContainerTransactionType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getContainerTransactionType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ContainerTransactionType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(ejbJarEClass, EJBJar.class, "EJBJar", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getEJBJar_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getEJBJar_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getEJBJar_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getEJBJar_EnterpriseBeans(), this.getEnterpriseBeans(), null, "enterpriseBeans", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getEJBJar_Interceptors(), this.getInterceptorsType(), null, "interceptors", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getEJBJar_Relationships(), this.getRelationships(), null, "relationships", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getEJBJar_AssemblyDescriptor(), this.getAssemblyDescriptor(), null, "assemblyDescriptor", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getEJBJar_EjbClientJar(), theJavaeePackage.getPathType(), "ejbClientJar", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getEJBJar_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getEJBJar_MetadataComplete(), theXMLTypePackage.getBoolean(), "metadataComplete", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getEJBJar_Version(), theJavaeePackage.getDeweyVersionType(), "version", "3.0", 1, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
-		initEClass(ejbJarDeploymentDescriptorEClass, EJBJarDeploymentDescriptor.class, "EJBJarDeploymentDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getEJBJarDeploymentDescriptor_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(getEJBJarDeploymentDescriptor_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(getEJBJarDeploymentDescriptor_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(getEJBJarDeploymentDescriptor_EjbJar(), this.getEJBJar(), null, "ejbJar", 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(ejbRelationEClass, EJBRelation.class, "EJBRelation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getEJBRelation_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, EJBRelation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getEJBRelation_EjbRelationName(), theXMLTypePackage.getToken(), "ejbRelationName", null, 0, 1, EJBRelation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getEJBRelation_EjbRelationshipRoles(), this.getEJBRelationshipRole(), null, "ejbRelationshipRoles", null, 2, 2, EJBRelation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getEJBRelation_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, EJBRelation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(ejbRelationshipRoleEClass, EJBRelationshipRole.class, "EJBRelationshipRole", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getEJBRelationshipRole_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, EJBRelationshipRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getEJBRelationshipRole_EjbRelationshipRoleName(), theXMLTypePackage.getToken(), "ejbRelationshipRoleName", null, 0, 1, EJBRelationshipRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getEJBRelationshipRole_Multiplicity(), this.getMultiplicityType(), "multiplicity", "One", 1, 1, EJBRelationshipRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEReference(getEJBRelationshipRole_CascadeDelete(), theJavaeePackage.getEmptyType(), null, "cascadeDelete", null, 0, 1, EJBRelationshipRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getEJBRelationshipRole_RelationshipRoleSource(), this.getRelationshipRoleSourceType(), null, "relationshipRoleSource", null, 1, 1, EJBRelationshipRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getEJBRelationshipRole_CmrField(), this.getCMRField(), null, "cmrField", null, 0, 1, EJBRelationshipRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getEJBRelationshipRole_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, EJBRelationshipRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(enterpriseBeansEClass, EnterpriseBeans.class, "EnterpriseBeans", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getEnterpriseBeans_Group(), ecorePackage.getEFeatureMapEntry(), "group", null, 0, -1, EnterpriseBeans.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getEnterpriseBeans_SessionBeans(), this.getSessionBean(), null, "sessionBeans", null, 0, -1, EnterpriseBeans.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getEnterpriseBeans_EntityBeans(), this.getEntityBean(), null, "entityBeans", null, 0, -1, EnterpriseBeans.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getEnterpriseBeans_MessageDrivenBeans(), this.getMessageDrivenBean(), null, "messageDrivenBeans", null, 0, -1, EnterpriseBeans.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getEnterpriseBeans_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, EnterpriseBeans.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(entityBeanEClass, EntityBean.class, "EntityBean", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getEntityBean_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getEntityBean_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getEntityBean_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getEntityBean_EjbName(), this.getEjbNameType(), "ejbName", null, 1, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getEntityBean_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getEntityBean_Home(), theJavaeePackage.getHome(), "home", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getEntityBean_Remote(), theJavaeePackage.getRemote(), "remote", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getEntityBean_LocalHome(), theJavaeePackage.getLocalHome(), "localHome", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getEntityBean_Local(), theJavaeePackage.getLocal(), "local", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getEntityBean_EjbClass(), this.getEjbClassType(), "ejbClass", null, 1, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getEntityBean_PersistenceType(), this.getPersistenceType(), "persistenceType", "Bean", 1, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getEntityBean_PrimKeyClass(), theJavaeePackage.getFullyQualifiedClassType(), "primKeyClass", null, 1, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getEntityBean_Reentrant(), theJavaeePackage.getTrueFalseType(), "reentrant", null, 1, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getEntityBean_CmpVersion(), this.getCmpVersionType(), "cmpVersion", "1.x", 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getEntityBean_AbstractSchemaName(), theJavaeePackage.getJavaIdentifier(), "abstractSchemaName", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getEntityBean_CmpFields(), this.getCMPField(), null, "cmpFields", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getEntityBean_PrimkeyField(), theXMLTypePackage.getToken(), "primkeyField", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getEntityBean_EnvEntries(), theJavaeePackage.getEnvEntry(), null, "envEntries", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getEntityBean_EjbRefs(), theJavaeePackage.getEjbRef(), null, "ejbRefs", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getEntityBean_EjbLocalRefs(), theJavaeePackage.getEjbLocalRef(), null, "ejbLocalRefs", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getEntityBean_ServiceRefs(), theJavaeePackage.getServiceRef(), null, "serviceRefs", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getEntityBean_ResourceRefs(), theJavaeePackage.getResourceRef(), null, "resourceRefs", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getEntityBean_ResourceEnvRefs(), theJavaeePackage.getResourceEnvRef(), null, "resourceEnvRefs", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getEntityBean_MessageDestinationRefs(), theJavaeePackage.getMessageDestinationRef(), null, "messageDestinationRefs", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getEntityBean_PersistenceContextRefs(), theJavaeePackage.getPersistenceContextRef(), null, "persistenceContextRefs", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getEntityBean_PersistenceUnitRefs(), theJavaeePackage.getPersistenceUnitRef(), null, "persistenceUnitRefs", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getEntityBean_PostConstructs(), theJavaeePackage.getLifecycleCallback(), null, "postConstructs", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getEntityBean_PreDestroys(), theJavaeePackage.getLifecycleCallback(), null, "preDestroys", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getEntityBean_SecurityRoleRefs(), theJavaeePackage.getSecurityRoleRef(), null, "securityRoleRefs", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getEntityBean_SecurityIdentity(), this.getSecurityIdentityType(), null, "securityIdentity", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getEntityBean_Queries(), this.getQuery(), null, "queries", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getEntityBean_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(excludeListEClass, ExcludeList.class, "ExcludeList", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getExcludeList_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, ExcludeList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getExcludeList_Methods(), this.getMethodType(), null, "methods", null, 1, -1, ExcludeList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getExcludeList_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ExcludeList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(initMethodTypeEClass, InitMethodType.class, "InitMethodType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getInitMethodType_CreateMethod(), this.getNamedMethodType(), null, "createMethod", null, 1, 1, InitMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getInitMethodType_BeanMethod(), this.getNamedMethodType(), null, "beanMethod", null, 1, 1, InitMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getInitMethodType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, InitMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(interceptorBindingTypeEClass, InterceptorBindingType.class, "InterceptorBindingType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getInterceptorBindingType_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, InterceptorBindingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getInterceptorBindingType_EjbName(), theXMLTypePackage.getToken(), "ejbName", null, 1, 1, InterceptorBindingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getInterceptorBindingType_InterceptorClasses(), theJavaeePackage.getFullyQualifiedClassType(), "interceptorClasses", null, 0, -1, InterceptorBindingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getInterceptorBindingType_InterceptorOrder(), this.getInterceptorOrderType(), null, "interceptorOrder", null, 0, 1, InterceptorBindingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getInterceptorBindingType_ExcludeDefaultInterceptors(), theJavaeePackage.getTrueFalseType(), "excludeDefaultInterceptors", null, 0, 1, InterceptorBindingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getInterceptorBindingType_ExcludeClassInterceptors(), theJavaeePackage.getTrueFalseType(), "excludeClassInterceptors", null, 0, 1, InterceptorBindingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getInterceptorBindingType_Method(), this.getNamedMethodType(), null, "method", null, 0, 1, InterceptorBindingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getInterceptorBindingType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, InterceptorBindingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(interceptorOrderTypeEClass, InterceptorOrderType.class, "InterceptorOrderType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getInterceptorOrderType_InterceptorClasses(), theJavaeePackage.getFullyQualifiedClassType(), "interceptorClasses", null, 1, -1, InterceptorOrderType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getInterceptorOrderType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, InterceptorOrderType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(interceptorsTypeEClass, InterceptorsType.class, "InterceptorsType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getInterceptorsType_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, InterceptorsType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getInterceptorsType_Interceptors(), this.getInterceptorType(), null, "interceptors", null, 1, -1, InterceptorsType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getInterceptorsType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, InterceptorsType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(interceptorTypeEClass, InterceptorType.class, "InterceptorType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getInterceptorType_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getInterceptorType_InterceptorClass(), theJavaeePackage.getFullyQualifiedClassType(), "interceptorClass", null, 1, 1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getInterceptorType_AroundInvokes(), this.getAroundInvokeType(), null, "aroundInvokes", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getInterceptorType_EnvEntries(), theJavaeePackage.getEnvEntry(), null, "envEntries", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getInterceptorType_EjbRefs(), theJavaeePackage.getEjbRef(), null, "ejbRefs", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getInterceptorType_EjbLocalRefs(), theJavaeePackage.getEjbLocalRef(), null, "ejbLocalRefs", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getInterceptorType_ServiceRefs(), theJavaeePackage.getServiceRef(), null, "serviceRefs", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getInterceptorType_ResourceRefs(), theJavaeePackage.getResourceRef(), null, "resourceRefs", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getInterceptorType_ResourceEnvRefs(), theJavaeePackage.getResourceEnvRef(), null, "resourceEnvRefs", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getInterceptorType_MessageDestinationRefs(), theJavaeePackage.getMessageDestinationRef(), null, "messageDestinationRefs", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getInterceptorType_PersistenceContextRefs(), theJavaeePackage.getPersistenceContextRef(), null, "persistenceContextRefs", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getInterceptorType_PersistenceUnitRefs(), theJavaeePackage.getPersistenceUnitRef(), null, "persistenceUnitRefs", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getInterceptorType_PostConstructs(), theJavaeePackage.getLifecycleCallback(), null, "postConstructs", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getInterceptorType_PreDestroys(), theJavaeePackage.getLifecycleCallback(), null, "preDestroys", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getInterceptorType_PostActivates(), theJavaeePackage.getLifecycleCallback(), null, "postActivates", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getInterceptorType_PrePassivates(), theJavaeePackage.getLifecycleCallback(), null, "prePassivates", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getInterceptorType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(messageDrivenBeanEClass, MessageDrivenBean.class, "MessageDrivenBean", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getMessageDrivenBean_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getMessageDrivenBean_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getMessageDrivenBean_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getMessageDrivenBean_EjbName(), this.getEjbNameType(), "ejbName", null, 1, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getMessageDrivenBean_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getMessageDrivenBean_EjbClass(), this.getEjbClassType(), "ejbClass", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getMessageDrivenBean_MessagingType(), theJavaeePackage.getFullyQualifiedClassType(), "messagingType", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getMessageDrivenBean_TimeoutMethod(), this.getNamedMethodType(), null, "timeoutMethod", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getMessageDrivenBean_TransactionType(), this.getTransactionType(), "transactionType", "Bean", 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getMessageDrivenBean_MessageDestinationType(), theJavaeePackage.getMessageDestinationTypeType(), "messageDestinationType", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getMessageDrivenBean_MessageDestinationLink(), theJavaeePackage.getMessageDestinationLink(), "messageDestinationLink", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getMessageDrivenBean_ActivationConfig(), this.getActivationConfig(), null, "activationConfig", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getMessageDrivenBean_AroundInvokes(), this.getAroundInvokeType(), null, "aroundInvokes", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getMessageDrivenBean_EnvEntries(), theJavaeePackage.getEnvEntry(), null, "envEntries", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getMessageDrivenBean_EjbRefs(), theJavaeePackage.getEjbRef(), null, "ejbRefs", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getMessageDrivenBean_EjbLocalRefs(), theJavaeePackage.getEjbLocalRef(), null, "ejbLocalRefs", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getMessageDrivenBean_ServiceRefs(), theJavaeePackage.getServiceRef(), null, "serviceRefs", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getMessageDrivenBean_ResourceRefs(), theJavaeePackage.getResourceRef(), null, "resourceRefs", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getMessageDrivenBean_ResourceEnvRefs(), theJavaeePackage.getResourceEnvRef(), null, "resourceEnvRefs", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getMessageDrivenBean_MessageDestinationRefs(), theJavaeePackage.getMessageDestinationRef(), null, "messageDestinationRefs", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getMessageDrivenBean_PersistenceContextRefs(), theJavaeePackage.getPersistenceContextRef(), null, "persistenceContextRefs", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getMessageDrivenBean_PersistenceUnitRefs(), theJavaeePackage.getPersistenceUnitRef(), null, "persistenceUnitRefs", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getMessageDrivenBean_PostConstructs(), theJavaeePackage.getLifecycleCallback(), null, "postConstructs", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getMessageDrivenBean_PreDestroys(), theJavaeePackage.getLifecycleCallback(), null, "preDestroys", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getMessageDrivenBean_SecurityIdentity(), this.getSecurityIdentityType(), null, "securityIdentity", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getMessageDrivenBean_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(methodParamsEClass, MethodParams.class, "MethodParams", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getMethodParams_MethodParams(), theJavaeePackage.getJavaType(), "methodParams", null, 0, -1, MethodParams.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getMethodParams_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, MethodParams.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(methodPermissionEClass, MethodPermission.class, "MethodPermission", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getMethodPermission_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, MethodPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getMethodPermission_RoleNames(), theJavaeePackage.getRoleName(), "roleNames", null, 0, -1, MethodPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getMethodPermission_Unchecked(), theJavaeePackage.getEmptyType(), null, "unchecked", null, 0, 1, MethodPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getMethodPermission_Methods(), this.getMethodType(), null, "methods", null, 1, -1, MethodPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getMethodPermission_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, MethodPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(methodTypeEClass, MethodType.class, "MethodType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getMethodType_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, MethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getMethodType_EjbName(), this.getEjbNameType(), "ejbName", null, 1, 1, MethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getMethodType_MethodIntf(), this.getMethodInterfaceType(), "methodIntf", "Home", 0, 1, MethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getMethodType_MethodName(), this.getMethodNameType(), "methodName", null, 1, 1, MethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getMethodType_MethodParams(), this.getMethodParams(), null, "methodParams", null, 0, 1, MethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getMethodType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, MethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(namedMethodTypeEClass, NamedMethodType.class, "NamedMethodType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getNamedMethodType_MethodName(), theXMLTypePackage.getToken(), "methodName", null, 1, 1, NamedMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getNamedMethodType_MethodParams(), this.getMethodParams(), null, "methodParams", null, 0, 1, NamedMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getNamedMethodType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, NamedMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(queryEClass, Query.class, "Query", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getQuery_Description(), theJavaeePackage.getDescription(), null, "description", null, 0, 1, Query.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getQuery_QueryMethod(), this.getQueryMethod(), null, "queryMethod", null, 1, 1, Query.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getQuery_ResultTypeMapping(), this.getResultTypeMappingType(), "resultTypeMapping", "Local", 0, 1, Query.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getQuery_EjbQl(), theXMLTypePackage.getString(), "ejbQl", null, 1, 1, Query.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getQuery_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, Query.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(queryMethodEClass, QueryMethod.class, "QueryMethod", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getQueryMethod_MethodName(), this.getMethodNameType(), "methodName", null, 1, 1, QueryMethod.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getQueryMethod_MethodParams(), this.getMethodParams(), null, "methodParams", null, 1, 1, QueryMethod.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getQueryMethod_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, QueryMethod.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(relationshipRoleSourceTypeEClass, RelationshipRoleSourceType.class, "RelationshipRoleSourceType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getRelationshipRoleSourceType_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, RelationshipRoleSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getRelationshipRoleSourceType_EjbName(), this.getEjbNameType(), "ejbName", null, 1, 1, RelationshipRoleSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getRelationshipRoleSourceType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, RelationshipRoleSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(relationshipsEClass, Relationships.class, "Relationships", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getRelationships_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, Relationships.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getRelationships_EjbRelations(), this.getEJBRelation(), null, "ejbRelations", null, 1, -1, Relationships.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getRelationships_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, Relationships.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(removeMethodTypeEClass, RemoveMethodType.class, "RemoveMethodType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getRemoveMethodType_BeanMethod(), this.getNamedMethodType(), null, "beanMethod", null, 1, 1, RemoveMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getRemoveMethodType_RetainIfException(), theJavaeePackage.getTrueFalseType(), "retainIfException", null, 0, 1, RemoveMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getRemoveMethodType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, RemoveMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(securityIdentityTypeEClass, SecurityIdentityType.class, "SecurityIdentityType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getSecurityIdentityType_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, SecurityIdentityType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getSecurityIdentityType_UseCallerIdentity(), theJavaeePackage.getEmptyType(), null, "useCallerIdentity", null, 0, 1, SecurityIdentityType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getSecurityIdentityType_RunAs(), theJavaeePackage.getRunAs(), null, "runAs", null, 0, 1, SecurityIdentityType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getSecurityIdentityType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, SecurityIdentityType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(sessionBeanEClass, SessionBean.class, "SessionBean", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getSessionBean_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getSessionBean_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getSessionBean_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getSessionBean_EjbName(), this.getEjbNameType(), "ejbName", null, 1, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getSessionBean_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getSessionBean_Home(), theJavaeePackage.getHome(), "home", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getSessionBean_Remote(), theJavaeePackage.getRemote(), "remote", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getSessionBean_LocalHome(), theJavaeePackage.getLocalHome(), "localHome", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getSessionBean_Local(), theJavaeePackage.getLocal(), "local", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getSessionBean_BusinessLocals(), theJavaeePackage.getFullyQualifiedClassType(), "businessLocals", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getSessionBean_BusinessRemotes(), theJavaeePackage.getFullyQualifiedClassType(), "businessRemotes", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getSessionBean_ServiceEndpoint(), theJavaeePackage.getFullyQualifiedClassType(), "serviceEndpoint", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getSessionBean_EjbClass(), this.getEjbClassType(), "ejbClass", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getSessionBean_SessionType(), this.getSessionType(), "sessionType", "Stateful", 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEReference(getSessionBean_TimeoutMethod(), this.getNamedMethodType(), null, "timeoutMethod", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getSessionBean_InitMethods(), this.getInitMethodType(), null, "initMethods", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getSessionBean_RemoveMethods(), this.getRemoveMethodType(), null, "removeMethods", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getSessionBean_TransactionType(), this.getTransactionType(), "transactionType", "Bean", 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEReference(getSessionBean_AroundInvokes(), this.getAroundInvokeType(), null, "aroundInvokes", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getSessionBean_EnvEntries(), theJavaeePackage.getEnvEntry(), null, "envEntries", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getSessionBean_EjbRefs(), theJavaeePackage.getEjbRef(), null, "ejbRefs", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getSessionBean_EjbLocalRefs(), theJavaeePackage.getEjbLocalRef(), null, "ejbLocalRefs", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getSessionBean_ServiceRefs(), theJavaeePackage.getServiceRef(), null, "serviceRefs", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getSessionBean_ResourceRefs(), theJavaeePackage.getResourceRef(), null, "resourceRefs", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getSessionBean_ResourceEnvRefs(), theJavaeePackage.getResourceEnvRef(), null, "resourceEnvRefs", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getSessionBean_MessageDestinationRefs(), theJavaeePackage.getMessageDestinationRef(), null, "messageDestinationRefs", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getSessionBean_PersistenceContextRefs(), theJavaeePackage.getPersistenceContextRef(), null, "persistenceContextRefs", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getSessionBean_PersistenceUnitRefs(), theJavaeePackage.getPersistenceUnitRef(), null, "persistenceUnitRefs", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getSessionBean_PostConstructs(), theJavaeePackage.getLifecycleCallback(), null, "postConstructs", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getSessionBean_PreDestroys(), theJavaeePackage.getLifecycleCallback(), null, "preDestroys", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getSessionBean_PostActivates(), theJavaeePackage.getLifecycleCallback(), null, "postActivates", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getSessionBean_PrePassivates(), theJavaeePackage.getLifecycleCallback(), null, "prePassivates", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getSessionBean_SecurityRoleRefs(), theJavaeePackage.getSecurityRoleRef(), null, "securityRoleRefs", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getSessionBean_SecurityIdentities(), this.getSecurityIdentityType(), null, "securityIdentities", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getSessionBean_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, SessionBean.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(cmpVersionTypeEEnum, CmpVersionType.class, "CmpVersionType"); //$NON-NLS-1$
-		addEEnumLiteral(cmpVersionTypeEEnum, CmpVersionType._1X_LITERAL);
-		addEEnumLiteral(cmpVersionTypeEEnum, CmpVersionType._2X_LITERAL);
-
-		initEEnum(cmrFieldTypeEEnum, CMRFieldType.class, "CMRFieldType"); //$NON-NLS-1$
-		addEEnumLiteral(cmrFieldTypeEEnum, CMRFieldType.JAVA_UTIL_COLLECTION_LITERAL);
-		addEEnumLiteral(cmrFieldTypeEEnum, CMRFieldType.JAVA_UTIL_SET_LITERAL);
-
-		initEEnum(methodInterfaceTypeEEnum, MethodInterfaceType.class, "MethodInterfaceType"); //$NON-NLS-1$
-		addEEnumLiteral(methodInterfaceTypeEEnum, MethodInterfaceType.HOME_LITERAL);
-		addEEnumLiteral(methodInterfaceTypeEEnum, MethodInterfaceType.REMOTE_LITERAL);
-		addEEnumLiteral(methodInterfaceTypeEEnum, MethodInterfaceType.LOCAL_HOME_LITERAL);
-		addEEnumLiteral(methodInterfaceTypeEEnum, MethodInterfaceType.LOCAL_LITERAL);
-		addEEnumLiteral(methodInterfaceTypeEEnum, MethodInterfaceType.SERVICE_ENDPOINT_LITERAL);
-
-		initEEnum(multiplicityTypeEEnum, MultiplicityType.class, "MultiplicityType"); //$NON-NLS-1$
-		addEEnumLiteral(multiplicityTypeEEnum, MultiplicityType.ONE_LITERAL);
-		addEEnumLiteral(multiplicityTypeEEnum, MultiplicityType.MANY_LITERAL);
-
-		initEEnum(persistenceTypeEEnum, PersistenceType.class, "PersistenceType"); //$NON-NLS-1$
-		addEEnumLiteral(persistenceTypeEEnum, PersistenceType.BEAN_LITERAL);
-		addEEnumLiteral(persistenceTypeEEnum, PersistenceType.CONTAINER_LITERAL);
-
-		initEEnum(resultTypeMappingTypeEEnum, ResultTypeMappingType.class, "ResultTypeMappingType"); //$NON-NLS-1$
-		addEEnumLiteral(resultTypeMappingTypeEEnum, ResultTypeMappingType.LOCAL_LITERAL);
-		addEEnumLiteral(resultTypeMappingTypeEEnum, ResultTypeMappingType.REMOTE_LITERAL);
-
-		initEEnum(sessionTypeEEnum, SessionType.class, "SessionType"); //$NON-NLS-1$
-		addEEnumLiteral(sessionTypeEEnum, SessionType.STATEFUL_LITERAL);
-		addEEnumLiteral(sessionTypeEEnum, SessionType.STATELESS_LITERAL);
-
-		initEEnum(transactionAttributeTypeEEnum, TransactionAttributeType.class, "TransactionAttributeType"); //$NON-NLS-1$
-		addEEnumLiteral(transactionAttributeTypeEEnum, TransactionAttributeType.NOT_SUPPORTED_LITERAL);
-		addEEnumLiteral(transactionAttributeTypeEEnum, TransactionAttributeType.SUPPORTS_LITERAL);
-		addEEnumLiteral(transactionAttributeTypeEEnum, TransactionAttributeType.REQUIRED_LITERAL);
-		addEEnumLiteral(transactionAttributeTypeEEnum, TransactionAttributeType.REQUIRES_NEW_LITERAL);
-		addEEnumLiteral(transactionAttributeTypeEEnum, TransactionAttributeType.MANDATORY_LITERAL);
-		addEEnumLiteral(transactionAttributeTypeEEnum, TransactionAttributeType.NEVER_LITERAL);
-
-		initEEnum(transactionTypeEEnum, TransactionType.class, "TransactionType"); //$NON-NLS-1$
-		addEEnumLiteral(transactionTypeEEnum, TransactionType.BEAN_LITERAL);
-		addEEnumLiteral(transactionTypeEEnum, TransactionType.CONTAINER_LITERAL);
-
-		// Initialize data types
-		initEDataType(cmpVersionTypeObjectEDataType, CmpVersionType.class, "CmpVersionTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(cmrFieldTypeObjectEDataType, CMRFieldType.class, "CMRFieldTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(ejbClassTypeEDataType, String.class, "EjbClassType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(ejbNameTypeEDataType, String.class, "EjbNameType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(methodInterfaceTypeObjectEDataType, MethodInterfaceType.class, "MethodInterfaceTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(methodNameTypeEDataType, String.class, "MethodNameType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(multiplicityTypeObjectEDataType, MultiplicityType.class, "MultiplicityTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(persistenceTypeObjectEDataType, PersistenceType.class, "PersistenceTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(resultTypeMappingTypeObjectEDataType, ResultTypeMappingType.class, "ResultTypeMappingTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(sessionTypeObjectEDataType, SessionType.class, "SessionTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(transactionAttributeTypeObjectEDataType, TransactionAttributeType.class, "TransactionAttributeTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(transactionTypeObjectEDataType, TransactionType.class, "TransactionTypeObject", 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 <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void createExtendedMetaDataAnnotations() {
-		String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$				
-		addAnnotation
-		  (activationConfigEClass, 
-		   source, 
-		   new String[] {
-			 "name", "activation-configType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getActivationConfig_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
-		  (getActivationConfig_ActivationConfigProperties(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "activation-config-property", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getActivationConfig_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (activationConfigPropertyEClass, 
-		   source, 
-		   new String[] {
-			 "name", "activation-config-propertyType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getActivationConfigProperty_ActivationConfigPropertyName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "activation-config-property-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getActivationConfigProperty_ActivationConfigPropertyValue(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "activation-config-property-value", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getActivationConfigProperty_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (applicationExceptionEClass, 
-		   source, 
-		   new String[] {
-			 "name", "application-exceptionType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getApplicationException_ExceptionClass(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "exception-class", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getApplicationException_Rollback(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "rollback", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getApplicationException_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (aroundInvokeTypeEClass, 
-		   source, 
-		   new String[] {
-			 "name", "around-invokeType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getAroundInvokeType_Class(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "class", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getAroundInvokeType_MethodName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "method-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (assemblyDescriptorEClass, 
-		   source, 
-		   new String[] {
-			 "name", "assembly-descriptorType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getAssemblyDescriptor_SecurityRoles(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "security-role", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getAssemblyDescriptor_MethodPermissions(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "method-permission", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getAssemblyDescriptor_ContainerTransactions(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "container-transaction", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getAssemblyDescriptor_InterceptorBindings(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "interceptor-binding", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getAssemblyDescriptor_MessageDestinations(), 
-		   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$
-		   });		
-		addAnnotation
-		  (getAssemblyDescriptor_ExcludeList(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "exclude-list", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getAssemblyDescriptor_ApplicationExceptions(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "application-exception", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getAssemblyDescriptor_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (cmpFieldEClass, 
-		   source, 
-		   new String[] {
-			 "name", "cmp-fieldType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getCMPField_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
-		  (getCMPField_FieldName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "field-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getCMPField_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (cmpVersionTypeEEnum, 
-		   source, 
-		   new String[] {
-			 "name", "cmp-versionType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (cmpVersionTypeObjectEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "cmp-versionType:Object", //$NON-NLS-1$ //$NON-NLS-2$
-			 "baseType", "cmp-versionType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (cmrFieldEClass, 
-		   source, 
-		   new String[] {
-			 "name", "cmr-fieldType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getCMRField_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
-		  (getCMRField_CmrFieldName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "cmr-field-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getCMRField_CmrFieldType(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "cmr-field-type", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getCMRField_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (cmrFieldTypeEEnum, 
-		   source, 
-		   new String[] {
-			 "name", "cmr-field-typeType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (cmrFieldTypeObjectEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "cmr-field-typeType:Object", //$NON-NLS-1$ //$NON-NLS-2$
-			 "baseType", "cmr-field-typeType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (containerTransactionTypeEClass, 
-		   source, 
-		   new String[] {
-			 "name", "container-transactionType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getContainerTransactionType_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
-		  (getContainerTransactionType_Methods(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "method", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getContainerTransactionType_TransAttribute(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "trans-attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getContainerTransactionType_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (ejbClassTypeEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "ejb-classType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "baseType", "http://java.sun.com/xml/ns/javaee#fully-qualified-classType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (ejbJarEClass, 
-		   source, 
-		   new String[] {
-			 "name", "ejb-jarType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEJBJar_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
-		  (getEJBJar_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
-		  (getEJBJar_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
-		  (getEJBJar_EnterpriseBeans(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "enterprise-beans", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEJBJar_Interceptors(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "interceptors", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEJBJar_Relationships(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "relationships", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getEJBJar_AssemblyDescriptor(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "assembly-descriptor", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getEJBJar_EjbClientJar(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ejb-client-jar", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEJBJar_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getEJBJar_MetadataComplete(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "metadata-complete" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getEJBJar_Version(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "version" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (ejbJarDeploymentDescriptorEClass, 
-		   source, 
-		   new String[] {
-			 "name", "", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "mixed" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEJBJarDeploymentDescriptor_Mixed(), 
-		   source, 
-		   new String[] {
-			 "kind", "elementWildcard", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", ":mixed" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEJBJarDeploymentDescriptor_XMLNSPrefixMap(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "xmlns:prefix" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEJBJarDeploymentDescriptor_XSISchemaLocation(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "xsi:schemaLocation" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getEJBJarDeploymentDescriptor_EjbJar(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ejb-jar", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (ejbNameTypeEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "ejb-nameType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#NMTOKEN" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (ejbRelationEClass, 
-		   source, 
-		   new String[] {
-			 "name", "ejb-relationType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEJBRelation_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
-		  (getEJBRelation_EjbRelationName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ejb-relation-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEJBRelation_EjbRelationshipRoles(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ejb-relationship-role", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEJBRelation_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (ejbRelationshipRoleEClass, 
-		   source, 
-		   new String[] {
-			 "name", "ejb-relationship-roleType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEJBRelationshipRole_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
-		  (getEJBRelationshipRole_EjbRelationshipRoleName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ejb-relationship-role-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEJBRelationshipRole_Multiplicity(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "multiplicity", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getEJBRelationshipRole_CascadeDelete(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "cascade-delete", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEJBRelationshipRole_RelationshipRoleSource(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "relationship-role-source", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEJBRelationshipRole_CmrField(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "cmr-field", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEJBRelationshipRole_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (enterpriseBeansEClass, 
-		   source, 
-		   new String[] {
-			 "name", "enterprise-beansType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEnterpriseBeans_Group(), 
-		   source, 
-		   new String[] {
-			 "kind", "group", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "group:0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEnterpriseBeans_SessionBeans(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "session", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
-			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEnterpriseBeans_EntityBeans(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "entity", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
-			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEnterpriseBeans_MessageDrivenBeans(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "message-driven", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
-			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEnterpriseBeans_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (entityBeanEClass, 
-		   source, 
-		   new String[] {
-			 "name", "entity-beanType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEntityBean_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
-		  (getEntityBean_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
-		  (getEntityBean_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
-		  (getEntityBean_EjbName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ejb-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEntityBean_MappedName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "mapped-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEntityBean_Home(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "home", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEntityBean_Remote(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "remote", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEntityBean_LocalHome(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "local-home", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEntityBean_Local(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "local", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEntityBean_EjbClass(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ejb-class", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEntityBean_PersistenceType(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "persistence-type", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getEntityBean_PrimKeyClass(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "prim-key-class", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getEntityBean_Reentrant(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "reentrant", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEntityBean_CmpVersion(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "cmp-version", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getEntityBean_AbstractSchemaName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "abstract-schema-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEntityBean_CmpFields(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "cmp-field", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getEntityBean_PrimkeyField(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "primkey-field", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEntityBean_EnvEntries(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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$
-		   });		
-		addAnnotation
-		  (getEntityBean_EjbRefs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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$
-		   });		
-		addAnnotation
-		  (getEntityBean_EjbLocalRefs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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$
-		   });		
-		addAnnotation
-		  (getEntityBean_ServiceRefs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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$
-		   });		
-		addAnnotation
-		  (getEntityBean_ResourceRefs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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$
-		   });		
-		addAnnotation
-		  (getEntityBean_ResourceEnvRefs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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$
-		   });		
-		addAnnotation
-		  (getEntityBean_MessageDestinationRefs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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$
-		   });		
-		addAnnotation
-		  (getEntityBean_PersistenceContextRefs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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$
-		   });		
-		addAnnotation
-		  (getEntityBean_PersistenceUnitRefs(), 
-		   source, 
-		   new String[] {
-			 "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$
-		   });		
-		addAnnotation
-		  (getEntityBean_PostConstructs(), 
-		   source, 
-		   new String[] {
-			 "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$
-		   });		
-		addAnnotation
-		  (getEntityBean_PreDestroys(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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$
-		   });		
-		addAnnotation
-		  (getEntityBean_SecurityRoleRefs(), 
-		   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$
-		   });		
-		addAnnotation
-		  (getEntityBean_SecurityIdentity(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "security-identity", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEntityBean_Queries(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "query", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getEntityBean_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (excludeListEClass, 
-		   source, 
-		   new String[] {
-			 "name", "exclude-listType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getExcludeList_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
-		  (getExcludeList_Methods(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "method", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getExcludeList_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (initMethodTypeEClass, 
-		   source, 
-		   new String[] {
-			 "name", "init-methodType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getInitMethodType_CreateMethod(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "create-method", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getInitMethodType_BeanMethod(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "bean-method", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getInitMethodType_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (interceptorBindingTypeEClass, 
-		   source, 
-		   new String[] {
-			 "name", "interceptor-bindingType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getInterceptorBindingType_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
-		  (getInterceptorBindingType_EjbName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ejb-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getInterceptorBindingType_InterceptorClasses(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "interceptor-class", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getInterceptorBindingType_InterceptorOrder(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "interceptor-order", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getInterceptorBindingType_ExcludeDefaultInterceptors(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "exclude-default-interceptors", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getInterceptorBindingType_ExcludeClassInterceptors(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "exclude-class-interceptors", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getInterceptorBindingType_Method(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "method", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getInterceptorBindingType_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (interceptorOrderTypeEClass, 
-		   source, 
-		   new String[] {
-			 "name", "interceptor-orderType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getInterceptorOrderType_InterceptorClasses(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "interceptor-class", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getInterceptorOrderType_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (interceptorsTypeEClass, 
-		   source, 
-		   new String[] {
-			 "name", "interceptorsType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getInterceptorsType_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
-		  (getInterceptorsType_Interceptors(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "interceptor", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getInterceptorsType_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (interceptorTypeEClass, 
-		   source, 
-		   new String[] {
-			 "name", "interceptorType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getInterceptorType_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
-		  (getInterceptorType_InterceptorClass(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "interceptor-class", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getInterceptorType_AroundInvokes(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "around-invoke", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getInterceptorType_EnvEntries(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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$
-		   });		
-		addAnnotation
-		  (getInterceptorType_EjbRefs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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$
-		   });		
-		addAnnotation
-		  (getInterceptorType_EjbLocalRefs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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$
-		   });		
-		addAnnotation
-		  (getInterceptorType_ServiceRefs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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$
-		   });		
-		addAnnotation
-		  (getInterceptorType_ResourceRefs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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$
-		   });		
-		addAnnotation
-		  (getInterceptorType_ResourceEnvRefs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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$
-		   });		
-		addAnnotation
-		  (getInterceptorType_MessageDestinationRefs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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$
-		   });		
-		addAnnotation
-		  (getInterceptorType_PersistenceContextRefs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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$
-		   });		
-		addAnnotation
-		  (getInterceptorType_PersistenceUnitRefs(), 
-		   source, 
-		   new String[] {
-			 "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$
-		   });		
-		addAnnotation
-		  (getInterceptorType_PostConstructs(), 
-		   source, 
-		   new String[] {
-			 "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$
-		   });		
-		addAnnotation
-		  (getInterceptorType_PreDestroys(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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$
-		   });		
-		addAnnotation
-		  (getInterceptorType_PostActivates(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "post-activate", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getInterceptorType_PrePassivates(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "pre-passivate", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getInterceptorType_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (messageDrivenBeanEClass, 
-		   source, 
-		   new String[] {
-			 "name", "message-driven-beanType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getMessageDrivenBean_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
-		  (getMessageDrivenBean_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
-		  (getMessageDrivenBean_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
-		  (getMessageDrivenBean_EjbName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ejb-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getMessageDrivenBean_MappedName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "mapped-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getMessageDrivenBean_EjbClass(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ejb-class", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getMessageDrivenBean_MessagingType(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "messaging-type", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getMessageDrivenBean_TimeoutMethod(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "timeout-method", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getMessageDrivenBean_TransactionType(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "transaction-type", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getMessageDrivenBean_MessageDestinationType(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "message-destination-type", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getMessageDrivenBean_MessageDestinationLink(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "message-destination-link", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getMessageDrivenBean_ActivationConfig(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "activation-config", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getMessageDrivenBean_AroundInvokes(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "around-invoke", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getMessageDrivenBean_EnvEntries(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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$
-		   });		
-		addAnnotation
-		  (getMessageDrivenBean_EjbRefs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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$
-		   });		
-		addAnnotation
-		  (getMessageDrivenBean_EjbLocalRefs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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$
-		   });		
-		addAnnotation
-		  (getMessageDrivenBean_ServiceRefs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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$
-		   });		
-		addAnnotation
-		  (getMessageDrivenBean_ResourceRefs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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$
-		   });		
-		addAnnotation
-		  (getMessageDrivenBean_ResourceEnvRefs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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$
-		   });		
-		addAnnotation
-		  (getMessageDrivenBean_MessageDestinationRefs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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$
-		   });		
-		addAnnotation
-		  (getMessageDrivenBean_PersistenceContextRefs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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$
-		   });		
-		addAnnotation
-		  (getMessageDrivenBean_PersistenceUnitRefs(), 
-		   source, 
-		   new String[] {
-			 "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$
-		   });		
-		addAnnotation
-		  (getMessageDrivenBean_PostConstructs(), 
-		   source, 
-		   new String[] {
-			 "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$
-		   });		
-		addAnnotation
-		  (getMessageDrivenBean_PreDestroys(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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$
-		   });		
-		addAnnotation
-		  (getMessageDrivenBean_SecurityIdentity(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "security-identity", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getMessageDrivenBean_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (methodInterfaceTypeEEnum, 
-		   source, 
-		   new String[] {
-			 "name", "method-intfType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (methodInterfaceTypeObjectEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "method-intfType:Object", //$NON-NLS-1$ //$NON-NLS-2$
-			 "baseType", "method-intfType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (methodNameTypeEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "method-nameType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (methodParamsEClass, 
-		   source, 
-		   new String[] {
-			 "name", "method-paramsType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getMethodParams_MethodParams(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "method-param", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getMethodParams_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (methodPermissionEClass, 
-		   source, 
-		   new String[] {
-			 "name", "method-permissionType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getMethodPermission_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
-		  (getMethodPermission_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
-		  (getMethodPermission_Unchecked(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "unchecked", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getMethodPermission_Methods(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "method", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getMethodPermission_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (methodTypeEClass, 
-		   source, 
-		   new String[] {
-			 "name", "methodType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getMethodType_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
-		  (getMethodType_EjbName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ejb-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getMethodType_MethodIntf(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "method-intf", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getMethodType_MethodName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "method-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getMethodType_MethodParams(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "method-params", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getMethodType_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (multiplicityTypeEEnum, 
-		   source, 
-		   new String[] {
-			 "name", "multiplicityType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (multiplicityTypeObjectEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "multiplicityType:Object", //$NON-NLS-1$ //$NON-NLS-2$
-			 "baseType", "multiplicityType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (namedMethodTypeEClass, 
-		   source, 
-		   new String[] {
-			 "name", "named-methodType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getNamedMethodType_MethodName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "method-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getNamedMethodType_MethodParams(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "method-params", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getNamedMethodType_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (persistenceTypeEEnum, 
-		   source, 
-		   new String[] {
-			 "name", "persistence-typeType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (persistenceTypeObjectEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "persistence-typeType:Object", //$NON-NLS-1$ //$NON-NLS-2$
-			 "baseType", "persistence-typeType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (queryEClass, 
-		   source, 
-		   new String[] {
-			 "name", "queryType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getQuery_Description(), 
-		   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
-		  (getQuery_QueryMethod(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "query-method", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getQuery_ResultTypeMapping(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "result-type-mapping", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getQuery_EjbQl(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ejb-ql", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getQuery_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (queryMethodEClass, 
-		   source, 
-		   new String[] {
-			 "name", "query-methodType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getQueryMethod_MethodName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "method-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getQueryMethod_MethodParams(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "method-params", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getQueryMethod_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (relationshipRoleSourceTypeEClass, 
-		   source, 
-		   new String[] {
-			 "name", "relationship-role-sourceType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getRelationshipRoleSourceType_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
-		  (getRelationshipRoleSourceType_EjbName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ejb-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getRelationshipRoleSourceType_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (relationshipsEClass, 
-		   source, 
-		   new String[] {
-			 "name", "relationshipsType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getRelationships_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
-		  (getRelationships_EjbRelations(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ejb-relation", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getRelationships_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (removeMethodTypeEClass, 
-		   source, 
-		   new String[] {
-			 "name", "remove-methodType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getRemoveMethodType_BeanMethod(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "bean-method", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getRemoveMethodType_RetainIfException(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "retain-if-exception", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getRemoveMethodType_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (resultTypeMappingTypeEEnum, 
-		   source, 
-		   new String[] {
-			 "name", "result-type-mappingType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (resultTypeMappingTypeObjectEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "result-type-mappingType:Object", //$NON-NLS-1$ //$NON-NLS-2$
-			 "baseType", "result-type-mappingType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (securityIdentityTypeEClass, 
-		   source, 
-		   new String[] {
-			 "name", "security-identityType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getSecurityIdentityType_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
-		  (getSecurityIdentityType_UseCallerIdentity(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "use-caller-identity", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getSecurityIdentityType_RunAs(), 
-		   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$
-		   });		
-		addAnnotation
-		  (getSecurityIdentityType_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (sessionBeanEClass, 
-		   source, 
-		   new String[] {
-			 "name", "session-beanType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getSessionBean_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
-		  (getSessionBean_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
-		  (getSessionBean_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
-		  (getSessionBean_EjbName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ejb-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getSessionBean_MappedName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "mapped-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getSessionBean_Home(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "home", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getSessionBean_Remote(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "remote", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getSessionBean_LocalHome(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "local-home", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getSessionBean_Local(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "local", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getSessionBean_BusinessLocals(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "business-local", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getSessionBean_BusinessRemotes(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "business-remote", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getSessionBean_ServiceEndpoint(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "service-endpoint", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getSessionBean_EjbClass(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ejb-class", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getSessionBean_SessionType(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "session-type", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getSessionBean_TimeoutMethod(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "timeout-method", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getSessionBean_InitMethods(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "init-method", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getSessionBean_RemoveMethods(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "remove-method", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getSessionBean_TransactionType(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "transaction-type", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getSessionBean_AroundInvokes(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "around-invoke", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getSessionBean_EnvEntries(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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$
-		   });		
-		addAnnotation
-		  (getSessionBean_EjbRefs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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$
-		   });		
-		addAnnotation
-		  (getSessionBean_EjbLocalRefs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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$
-		   });		
-		addAnnotation
-		  (getSessionBean_ServiceRefs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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$
-		   });		
-		addAnnotation
-		  (getSessionBean_ResourceRefs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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$
-		   });		
-		addAnnotation
-		  (getSessionBean_ResourceEnvRefs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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$
-		   });		
-		addAnnotation
-		  (getSessionBean_MessageDestinationRefs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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$
-		   });		
-		addAnnotation
-		  (getSessionBean_PersistenceContextRefs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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$
-		   });		
-		addAnnotation
-		  (getSessionBean_PersistenceUnitRefs(), 
-		   source, 
-		   new String[] {
-			 "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$
-		   });		
-		addAnnotation
-		  (getSessionBean_PostConstructs(), 
-		   source, 
-		   new String[] {
-			 "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$
-		   });		
-		addAnnotation
-		  (getSessionBean_PreDestroys(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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$
-		   });		
-		addAnnotation
-		  (getSessionBean_PostActivates(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "post-activate", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getSessionBean_PrePassivates(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "pre-passivate", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getSessionBean_SecurityRoleRefs(), 
-		   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$
-		   });		
-		addAnnotation
-		  (getSessionBean_SecurityIdentities(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "security-identity", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getSessionBean_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (sessionTypeEEnum, 
-		   source, 
-		   new String[] {
-			 "name", "session-typeType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (sessionTypeObjectEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "session-typeType:Object", //$NON-NLS-1$ //$NON-NLS-2$
-			 "baseType", "session-typeType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (transactionAttributeTypeEEnum, 
-		   source, 
-		   new String[] {
-			 "name", "trans-attributeType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (transactionAttributeTypeObjectEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "trans-attributeType:Object", //$NON-NLS-1$ //$NON-NLS-2$
-			 "baseType", "trans-attributeType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (transactionTypeEEnum, 
-		   source, 
-		   new String[] {
-			 "name", "transaction-typeType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (transactionTypeObjectEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "transaction-typeType:Object", //$NON-NLS-1$ //$NON-NLS-2$
-			 "baseType", "transaction-typeType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });
-	}
-
-} //EjbPackageImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EnterpriseBeansImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EnterpriseBeansImpl.java
deleted file mode 100644
index b8854f91c..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EnterpriseBeansImpl.java
+++ /dev/null
@@ -1,293 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb.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.ejb.EnterpriseBeans;
-
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Enterprise Beans</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EnterpriseBeansImpl#getGroup <em>Group</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EnterpriseBeansImpl#getSessionBeans <em>Session Beans</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EnterpriseBeansImpl#getEntityBeans <em>Entity Beans</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EnterpriseBeansImpl#getMessageDrivenBeans <em>Message Driven Beans</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EnterpriseBeansImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class EnterpriseBeansImpl extends EObjectImpl implements EnterpriseBeans {
-	/**
-	 * The cached value of the '{@link #getGroup() <em>Group</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGroup()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureMap group = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EnterpriseBeansImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.ENTERPRISE_BEANS;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureMap getGroup() {
-		if (group == null) {
-			group = new BasicFeatureMap(this, EjbPackage.ENTERPRISE_BEANS__GROUP);
-		}
-		return group;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getSessionBeans() {
-		return ((FeatureMap)getGroup()).list(EjbPackage.Literals.ENTERPRISE_BEANS__SESSION_BEANS);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getEntityBeans() {
-		return ((FeatureMap)getGroup()).list(EjbPackage.Literals.ENTERPRISE_BEANS__ENTITY_BEANS);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getMessageDrivenBeans() {
-		return ((FeatureMap)getGroup()).list(EjbPackage.Literals.ENTERPRISE_BEANS__MESSAGE_DRIVEN_BEANS);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ENTERPRISE_BEANS__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.ENTERPRISE_BEANS__GROUP:
-				return ((InternalEList)getGroup()).basicRemove(otherEnd, msgs);
-			case EjbPackage.ENTERPRISE_BEANS__SESSION_BEANS:
-				return ((InternalEList)getSessionBeans()).basicRemove(otherEnd, msgs);
-			case EjbPackage.ENTERPRISE_BEANS__ENTITY_BEANS:
-				return ((InternalEList)getEntityBeans()).basicRemove(otherEnd, msgs);
-			case EjbPackage.ENTERPRISE_BEANS__MESSAGE_DRIVEN_BEANS:
-				return ((InternalEList)getMessageDrivenBeans()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.ENTERPRISE_BEANS__GROUP:
-				if (coreType) return getGroup();
-				return ((FeatureMap.Internal)getGroup()).getWrapper();
-			case EjbPackage.ENTERPRISE_BEANS__SESSION_BEANS:
-				return getSessionBeans();
-			case EjbPackage.ENTERPRISE_BEANS__ENTITY_BEANS:
-				return getEntityBeans();
-			case EjbPackage.ENTERPRISE_BEANS__MESSAGE_DRIVEN_BEANS:
-				return getMessageDrivenBeans();
-			case EjbPackage.ENTERPRISE_BEANS__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.ENTERPRISE_BEANS__GROUP:
-				((FeatureMap.Internal)getGroup()).set(newValue);
-				return;
-			case EjbPackage.ENTERPRISE_BEANS__SESSION_BEANS:
-				getSessionBeans().clear();
-				getSessionBeans().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ENTERPRISE_BEANS__ENTITY_BEANS:
-				getEntityBeans().clear();
-				getEntityBeans().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ENTERPRISE_BEANS__MESSAGE_DRIVEN_BEANS:
-				getMessageDrivenBeans().clear();
-				getMessageDrivenBeans().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ENTERPRISE_BEANS__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.ENTERPRISE_BEANS__GROUP:
-				getGroup().clear();
-				return;
-			case EjbPackage.ENTERPRISE_BEANS__SESSION_BEANS:
-				getSessionBeans().clear();
-				return;
-			case EjbPackage.ENTERPRISE_BEANS__ENTITY_BEANS:
-				getEntityBeans().clear();
-				return;
-			case EjbPackage.ENTERPRISE_BEANS__MESSAGE_DRIVEN_BEANS:
-				getMessageDrivenBeans().clear();
-				return;
-			case EjbPackage.ENTERPRISE_BEANS__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.ENTERPRISE_BEANS__GROUP:
-				return group != null && !group.isEmpty();
-			case EjbPackage.ENTERPRISE_BEANS__SESSION_BEANS:
-				return !getSessionBeans().isEmpty();
-			case EjbPackage.ENTERPRISE_BEANS__ENTITY_BEANS:
-				return !getEntityBeans().isEmpty();
-			case EjbPackage.ENTERPRISE_BEANS__MESSAGE_DRIVEN_BEANS:
-				return !getMessageDrivenBeans().isEmpty();
-			case EjbPackage.ENTERPRISE_BEANS__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	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(')');
-		return result.toString();
-	}
-
-} //EnterpriseBeansImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EntityBeanImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EntityBeanImpl.java
deleted file mode 100644
index 12c793948..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EntityBeanImpl.java
+++ /dev/null
@@ -1,1689 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb.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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-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.EnvEntry;
-import org.eclipse.jst.javaee.core.Icon;
-import org.eclipse.jst.javaee.core.LifecycleCallback;
-import org.eclipse.jst.javaee.core.MessageDestinationRef;
-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.SecurityRoleRef;
-import org.eclipse.jst.javaee.core.ServiceRef;
-
-import org.eclipse.jst.javaee.ejb.CMPField;
-import org.eclipse.jst.javaee.ejb.CmpVersionType;
-import org.eclipse.jst.javaee.ejb.EntityBean;
-import org.eclipse.jst.javaee.ejb.PersistenceType;
-import org.eclipse.jst.javaee.ejb.Query;
-import org.eclipse.jst.javaee.ejb.SecurityIdentityType;
-
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Entity Bean</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EntityBeanImpl#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EntityBeanImpl#getDisplayNames <em>Display Names</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EntityBeanImpl#getIcons <em>Icons</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EntityBeanImpl#getEjbName <em>Ejb Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EntityBeanImpl#getMappedName <em>Mapped Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EntityBeanImpl#getHome <em>Home</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EntityBeanImpl#getRemote <em>Remote</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EntityBeanImpl#getLocalHome <em>Local Home</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EntityBeanImpl#getLocal <em>Local</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EntityBeanImpl#getEjbClass <em>Ejb Class</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EntityBeanImpl#getPersistenceType <em>Persistence Type</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EntityBeanImpl#getPrimKeyClass <em>Prim Key Class</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EntityBeanImpl#isReentrant <em>Reentrant</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EntityBeanImpl#getCmpVersion <em>Cmp Version</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EntityBeanImpl#getAbstractSchemaName <em>Abstract Schema Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EntityBeanImpl#getCmpFields <em>Cmp Fields</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EntityBeanImpl#getPrimkeyField <em>Primkey Field</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EntityBeanImpl#getEnvEntries <em>Env Entries</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EntityBeanImpl#getEjbRefs <em>Ejb Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EntityBeanImpl#getEjbLocalRefs <em>Ejb Local Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EntityBeanImpl#getServiceRefs <em>Service Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EntityBeanImpl#getResourceRefs <em>Resource Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EntityBeanImpl#getResourceEnvRefs <em>Resource Env Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EntityBeanImpl#getMessageDestinationRefs <em>Message Destination Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EntityBeanImpl#getPersistenceContextRefs <em>Persistence Context Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EntityBeanImpl#getPersistenceUnitRefs <em>Persistence Unit Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EntityBeanImpl#getPostConstructs <em>Post Constructs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EntityBeanImpl#getPreDestroys <em>Pre Destroys</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EntityBeanImpl#getSecurityRoleRefs <em>Security Role Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EntityBeanImpl#getSecurityIdentity <em>Security Identity</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EntityBeanImpl#getQueries <em>Queries</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EntityBeanImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class EntityBeanImpl extends EObjectImpl implements EntityBean {
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayNames() <em>Display Names</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayNames()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList displayNames = null;
-
-	/**
-	 * The cached value of the '{@link #getIcons() <em>Icons</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIcons()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList icons = null;
-
-	/**
-	 * The default value of the '{@link #getEjbName() <em>Ejb Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EJB_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getEjbName() <em>Ejb Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String ejbName = EJB_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getMappedName() <em>Mapped Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMappedName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MAPPED_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMappedName() <em>Mapped Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMappedName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String mappedName = MAPPED_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getHome() <em>Home</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHome()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String HOME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getHome() <em>Home</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHome()
-	 * @generated
-	 * @ordered
-	 */
-	protected String home = HOME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getRemote() <em>Remote</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRemote()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String REMOTE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getRemote() <em>Remote</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRemote()
-	 * @generated
-	 * @ordered
-	 */
-	protected String remote = REMOTE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLocalHome() <em>Local Home</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocalHome()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LOCAL_HOME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLocalHome() <em>Local Home</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocalHome()
-	 * @generated
-	 * @ordered
-	 */
-	protected String localHome = LOCAL_HOME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLocal() <em>Local</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocal()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LOCAL_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLocal() <em>Local</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocal()
-	 * @generated
-	 * @ordered
-	 */
-	protected String local = LOCAL_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getEjbClass() <em>Ejb Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EJB_CLASS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getEjbClass() <em>Ejb Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected String ejbClass = EJB_CLASS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPersistenceType() <em>Persistence Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPersistenceType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final PersistenceType PERSISTENCE_TYPE_EDEFAULT = PersistenceType.BEAN_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getPersistenceType() <em>Persistence Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPersistenceType()
-	 * @generated
-	 * @ordered
-	 */
-	protected PersistenceType persistenceType = PERSISTENCE_TYPE_EDEFAULT;
-
-	/**
-	 * This is true if the Persistence Type attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean persistenceTypeESet = false;
-
-	/**
-	 * The default value of the '{@link #getPrimKeyClass() <em>Prim Key Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPrimKeyClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PRIM_KEY_CLASS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPrimKeyClass() <em>Prim Key Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPrimKeyClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected String primKeyClass = PRIM_KEY_CLASS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isReentrant() <em>Reentrant</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isReentrant()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean REENTRANT_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isReentrant() <em>Reentrant</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isReentrant()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean reentrant = REENTRANT_EDEFAULT;
-
-	/**
-	 * This is true if the Reentrant attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean reentrantESet = false;
-
-	/**
-	 * The default value of the '{@link #getCmpVersion() <em>Cmp Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCmpVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final CmpVersionType CMP_VERSION_EDEFAULT = CmpVersionType._1X_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getCmpVersion() <em>Cmp Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCmpVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected CmpVersionType cmpVersion = CMP_VERSION_EDEFAULT;
-
-	/**
-	 * This is true if the Cmp Version attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean cmpVersionESet = false;
-
-	/**
-	 * The default value of the '{@link #getAbstractSchemaName() <em>Abstract Schema Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAbstractSchemaName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ABSTRACT_SCHEMA_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAbstractSchemaName() <em>Abstract Schema Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAbstractSchemaName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String abstractSchemaName = ABSTRACT_SCHEMA_NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getCmpFields() <em>Cmp Fields</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCmpFields()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList cmpFields = null;
-
-	/**
-	 * The default value of the '{@link #getPrimkeyField() <em>Primkey Field</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPrimkeyField()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PRIMKEY_FIELD_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPrimkeyField() <em>Primkey Field</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPrimkeyField()
-	 * @generated
-	 * @ordered
-	 */
-	protected String primkeyField = PRIMKEY_FIELD_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getEnvEntries() <em>Env Entries</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEnvEntries()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList envEntries = null;
-
-	/**
-	 * The cached value of the '{@link #getEjbRefs() <em>Ejb Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList ejbRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getEjbLocalRefs() <em>Ejb Local Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbLocalRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList ejbLocalRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getServiceRefs() <em>Service Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getServiceRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList serviceRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getResourceRefs() <em>Resource Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResourceRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList resourceRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getResourceEnvRefs() <em>Resource Env Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResourceEnvRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList resourceEnvRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getMessageDestinationRefs() <em>Message Destination Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessageDestinationRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList messageDestinationRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getPersistenceContextRefs() <em>Persistence Context Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPersistenceContextRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList persistenceContextRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getPersistenceUnitRefs() <em>Persistence Unit Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPersistenceUnitRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList persistenceUnitRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getPostConstructs() <em>Post Constructs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPostConstructs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList postConstructs = null;
-
-	/**
-	 * The cached value of the '{@link #getPreDestroys() <em>Pre Destroys</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPreDestroys()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList preDestroys = null;
-
-	/**
-	 * The cached value of the '{@link #getSecurityRoleRefs() <em>Security Role Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSecurityRoleRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList securityRoleRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getSecurityIdentity() <em>Security Identity</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSecurityIdentity()
-	 * @generated
-	 * @ordered
-	 */
-	protected SecurityIdentityType securityIdentity = null;
-
-	/**
-	 * The cached value of the '{@link #getQueries() <em>Queries</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getQueries()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList queries = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EntityBeanImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.ENTITY_BEAN;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.ENTITY_BEAN__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDisplayNames() {
-		if (displayNames == null) {
-			displayNames = new EObjectContainmentEList(DisplayName.class, this, EjbPackage.ENTITY_BEAN__DISPLAY_NAMES);
-		}
-		return displayNames;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getIcons() {
-		if (icons == null) {
-			icons = new EObjectContainmentEList(Icon.class, this, EjbPackage.ENTITY_BEAN__ICONS);
-		}
-		return icons;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getEjbName() {
-		return ejbName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEjbName(String newEjbName) {
-		String oldEjbName = ejbName;
-		ejbName = newEjbName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ENTITY_BEAN__EJB_NAME, oldEjbName, ejbName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getMappedName() {
-		return mappedName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMappedName(String newMappedName) {
-		String oldMappedName = mappedName;
-		mappedName = newMappedName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ENTITY_BEAN__MAPPED_NAME, oldMappedName, mappedName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getHome() {
-		return home;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHome(String newHome) {
-		String oldHome = home;
-		home = newHome;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ENTITY_BEAN__HOME, oldHome, home));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getRemote() {
-		return remote;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRemote(String newRemote) {
-		String oldRemote = remote;
-		remote = newRemote;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ENTITY_BEAN__REMOTE, oldRemote, remote));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLocalHome() {
-		return localHome;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLocalHome(String newLocalHome) {
-		String oldLocalHome = localHome;
-		localHome = newLocalHome;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ENTITY_BEAN__LOCAL_HOME, oldLocalHome, localHome));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLocal() {
-		return local;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLocal(String newLocal) {
-		String oldLocal = local;
-		local = newLocal;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ENTITY_BEAN__LOCAL, oldLocal, local));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getEjbClass() {
-		return ejbClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEjbClass(String newEjbClass) {
-		String oldEjbClass = ejbClass;
-		ejbClass = newEjbClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ENTITY_BEAN__EJB_CLASS, oldEjbClass, ejbClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PersistenceType getPersistenceType() {
-		return persistenceType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPersistenceType(PersistenceType newPersistenceType) {
-		PersistenceType oldPersistenceType = persistenceType;
-		persistenceType = newPersistenceType == null ? PERSISTENCE_TYPE_EDEFAULT : newPersistenceType;
-		boolean oldPersistenceTypeESet = persistenceTypeESet;
-		persistenceTypeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ENTITY_BEAN__PERSISTENCE_TYPE, oldPersistenceType, persistenceType, !oldPersistenceTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetPersistenceType() {
-		PersistenceType oldPersistenceType = persistenceType;
-		boolean oldPersistenceTypeESet = persistenceTypeESet;
-		persistenceType = PERSISTENCE_TYPE_EDEFAULT;
-		persistenceTypeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.ENTITY_BEAN__PERSISTENCE_TYPE, oldPersistenceType, PERSISTENCE_TYPE_EDEFAULT, oldPersistenceTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetPersistenceType() {
-		return persistenceTypeESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPrimKeyClass() {
-		return primKeyClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPrimKeyClass(String newPrimKeyClass) {
-		String oldPrimKeyClass = primKeyClass;
-		primKeyClass = newPrimKeyClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ENTITY_BEAN__PRIM_KEY_CLASS, oldPrimKeyClass, primKeyClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isReentrant() {
-		return reentrant;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setReentrant(boolean newReentrant) {
-		boolean oldReentrant = reentrant;
-		reentrant = newReentrant;
-		boolean oldReentrantESet = reentrantESet;
-		reentrantESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ENTITY_BEAN__REENTRANT, oldReentrant, reentrant, !oldReentrantESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetReentrant() {
-		boolean oldReentrant = reentrant;
-		boolean oldReentrantESet = reentrantESet;
-		reentrant = REENTRANT_EDEFAULT;
-		reentrantESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.ENTITY_BEAN__REENTRANT, oldReentrant, REENTRANT_EDEFAULT, oldReentrantESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetReentrant() {
-		return reentrantESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CmpVersionType getCmpVersion() {
-		return cmpVersion;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCmpVersion(CmpVersionType newCmpVersion) {
-		CmpVersionType oldCmpVersion = cmpVersion;
-		cmpVersion = newCmpVersion == null ? CMP_VERSION_EDEFAULT : newCmpVersion;
-		boolean oldCmpVersionESet = cmpVersionESet;
-		cmpVersionESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ENTITY_BEAN__CMP_VERSION, oldCmpVersion, cmpVersion, !oldCmpVersionESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetCmpVersion() {
-		CmpVersionType oldCmpVersion = cmpVersion;
-		boolean oldCmpVersionESet = cmpVersionESet;
-		cmpVersion = CMP_VERSION_EDEFAULT;
-		cmpVersionESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.ENTITY_BEAN__CMP_VERSION, oldCmpVersion, CMP_VERSION_EDEFAULT, oldCmpVersionESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetCmpVersion() {
-		return cmpVersionESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getAbstractSchemaName() {
-		return abstractSchemaName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAbstractSchemaName(String newAbstractSchemaName) {
-		String oldAbstractSchemaName = abstractSchemaName;
-		abstractSchemaName = newAbstractSchemaName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ENTITY_BEAN__ABSTRACT_SCHEMA_NAME, oldAbstractSchemaName, abstractSchemaName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getCmpFields() {
-		if (cmpFields == null) {
-			cmpFields = new EObjectContainmentEList(CMPField.class, this, EjbPackage.ENTITY_BEAN__CMP_FIELDS);
-		}
-		return cmpFields;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPrimkeyField() {
-		return primkeyField;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPrimkeyField(String newPrimkeyField) {
-		String oldPrimkeyField = primkeyField;
-		primkeyField = newPrimkeyField;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ENTITY_BEAN__PRIMKEY_FIELD, oldPrimkeyField, primkeyField));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getEnvEntries() {
-		if (envEntries == null) {
-			envEntries = new EObjectContainmentEList(EnvEntry.class, this, EjbPackage.ENTITY_BEAN__ENV_ENTRIES);
-		}
-		return envEntries;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getEjbRefs() {
-		if (ejbRefs == null) {
-			ejbRefs = new EObjectContainmentEList(EjbRef.class, this, EjbPackage.ENTITY_BEAN__EJB_REFS);
-		}
-		return ejbRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getEjbLocalRefs() {
-		if (ejbLocalRefs == null) {
-			ejbLocalRefs = new EObjectContainmentEList(EjbLocalRef.class, this, EjbPackage.ENTITY_BEAN__EJB_LOCAL_REFS);
-		}
-		return ejbLocalRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getServiceRefs() {
-		if (serviceRefs == null) {
-			serviceRefs = new EObjectContainmentEList(ServiceRef.class, this, EjbPackage.ENTITY_BEAN__SERVICE_REFS);
-		}
-		return serviceRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getResourceRefs() {
-		if (resourceRefs == null) {
-			resourceRefs = new EObjectContainmentEList(ResourceRef.class, this, EjbPackage.ENTITY_BEAN__RESOURCE_REFS);
-		}
-		return resourceRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getResourceEnvRefs() {
-		if (resourceEnvRefs == null) {
-			resourceEnvRefs = new EObjectContainmentEList(ResourceEnvRef.class, this, EjbPackage.ENTITY_BEAN__RESOURCE_ENV_REFS);
-		}
-		return resourceEnvRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getMessageDestinationRefs() {
-		if (messageDestinationRefs == null) {
-			messageDestinationRefs = new EObjectContainmentEList(MessageDestinationRef.class, this, EjbPackage.ENTITY_BEAN__MESSAGE_DESTINATION_REFS);
-		}
-		return messageDestinationRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPersistenceContextRefs() {
-		if (persistenceContextRefs == null) {
-			persistenceContextRefs = new EObjectContainmentEList(PersistenceContextRef.class, this, EjbPackage.ENTITY_BEAN__PERSISTENCE_CONTEXT_REFS);
-		}
-		return persistenceContextRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPersistenceUnitRefs() {
-		if (persistenceUnitRefs == null) {
-			persistenceUnitRefs = new EObjectContainmentEList(PersistenceUnitRef.class, this, EjbPackage.ENTITY_BEAN__PERSISTENCE_UNIT_REFS);
-		}
-		return persistenceUnitRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPostConstructs() {
-		if (postConstructs == null) {
-			postConstructs = new EObjectContainmentEList(LifecycleCallback.class, this, EjbPackage.ENTITY_BEAN__POST_CONSTRUCTS);
-		}
-		return postConstructs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPreDestroys() {
-		if (preDestroys == null) {
-			preDestroys = new EObjectContainmentEList(LifecycleCallback.class, this, EjbPackage.ENTITY_BEAN__PRE_DESTROYS);
-		}
-		return preDestroys;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getSecurityRoleRefs() {
-		if (securityRoleRefs == null) {
-			securityRoleRefs = new EObjectContainmentEList(SecurityRoleRef.class, this, EjbPackage.ENTITY_BEAN__SECURITY_ROLE_REFS);
-		}
-		return securityRoleRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SecurityIdentityType getSecurityIdentity() {
-		return securityIdentity;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetSecurityIdentity(SecurityIdentityType newSecurityIdentity, NotificationChain msgs) {
-		SecurityIdentityType oldSecurityIdentity = securityIdentity;
-		securityIdentity = newSecurityIdentity;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.ENTITY_BEAN__SECURITY_IDENTITY, oldSecurityIdentity, newSecurityIdentity);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSecurityIdentity(SecurityIdentityType newSecurityIdentity) {
-		if (newSecurityIdentity != securityIdentity) {
-			NotificationChain msgs = null;
-			if (securityIdentity != null)
-				msgs = ((InternalEObject)securityIdentity).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.ENTITY_BEAN__SECURITY_IDENTITY, null, msgs);
-			if (newSecurityIdentity != null)
-				msgs = ((InternalEObject)newSecurityIdentity).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EjbPackage.ENTITY_BEAN__SECURITY_IDENTITY, null, msgs);
-			msgs = basicSetSecurityIdentity(newSecurityIdentity, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ENTITY_BEAN__SECURITY_IDENTITY, newSecurityIdentity, newSecurityIdentity));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getQueries() {
-		if (queries == null) {
-			queries = new EObjectContainmentEList(Query.class, this, EjbPackage.ENTITY_BEAN__QUERIES);
-		}
-		return queries;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ENTITY_BEAN__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.ENTITY_BEAN__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-			case EjbPackage.ENTITY_BEAN__DISPLAY_NAMES:
-				return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
-			case EjbPackage.ENTITY_BEAN__ICONS:
-				return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
-			case EjbPackage.ENTITY_BEAN__CMP_FIELDS:
-				return ((InternalEList)getCmpFields()).basicRemove(otherEnd, msgs);
-			case EjbPackage.ENTITY_BEAN__ENV_ENTRIES:
-				return ((InternalEList)getEnvEntries()).basicRemove(otherEnd, msgs);
-			case EjbPackage.ENTITY_BEAN__EJB_REFS:
-				return ((InternalEList)getEjbRefs()).basicRemove(otherEnd, msgs);
-			case EjbPackage.ENTITY_BEAN__EJB_LOCAL_REFS:
-				return ((InternalEList)getEjbLocalRefs()).basicRemove(otherEnd, msgs);
-			case EjbPackage.ENTITY_BEAN__SERVICE_REFS:
-				return ((InternalEList)getServiceRefs()).basicRemove(otherEnd, msgs);
-			case EjbPackage.ENTITY_BEAN__RESOURCE_REFS:
-				return ((InternalEList)getResourceRefs()).basicRemove(otherEnd, msgs);
-			case EjbPackage.ENTITY_BEAN__RESOURCE_ENV_REFS:
-				return ((InternalEList)getResourceEnvRefs()).basicRemove(otherEnd, msgs);
-			case EjbPackage.ENTITY_BEAN__MESSAGE_DESTINATION_REFS:
-				return ((InternalEList)getMessageDestinationRefs()).basicRemove(otherEnd, msgs);
-			case EjbPackage.ENTITY_BEAN__PERSISTENCE_CONTEXT_REFS:
-				return ((InternalEList)getPersistenceContextRefs()).basicRemove(otherEnd, msgs);
-			case EjbPackage.ENTITY_BEAN__PERSISTENCE_UNIT_REFS:
-				return ((InternalEList)getPersistenceUnitRefs()).basicRemove(otherEnd, msgs);
-			case EjbPackage.ENTITY_BEAN__POST_CONSTRUCTS:
-				return ((InternalEList)getPostConstructs()).basicRemove(otherEnd, msgs);
-			case EjbPackage.ENTITY_BEAN__PRE_DESTROYS:
-				return ((InternalEList)getPreDestroys()).basicRemove(otherEnd, msgs);
-			case EjbPackage.ENTITY_BEAN__SECURITY_ROLE_REFS:
-				return ((InternalEList)getSecurityRoleRefs()).basicRemove(otherEnd, msgs);
-			case EjbPackage.ENTITY_BEAN__SECURITY_IDENTITY:
-				return basicSetSecurityIdentity(null, msgs);
-			case EjbPackage.ENTITY_BEAN__QUERIES:
-				return ((InternalEList)getQueries()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.ENTITY_BEAN__DESCRIPTIONS:
-				return getDescriptions();
-			case EjbPackage.ENTITY_BEAN__DISPLAY_NAMES:
-				return getDisplayNames();
-			case EjbPackage.ENTITY_BEAN__ICONS:
-				return getIcons();
-			case EjbPackage.ENTITY_BEAN__EJB_NAME:
-				return getEjbName();
-			case EjbPackage.ENTITY_BEAN__MAPPED_NAME:
-				return getMappedName();
-			case EjbPackage.ENTITY_BEAN__HOME:
-				return getHome();
-			case EjbPackage.ENTITY_BEAN__REMOTE:
-				return getRemote();
-			case EjbPackage.ENTITY_BEAN__LOCAL_HOME:
-				return getLocalHome();
-			case EjbPackage.ENTITY_BEAN__LOCAL:
-				return getLocal();
-			case EjbPackage.ENTITY_BEAN__EJB_CLASS:
-				return getEjbClass();
-			case EjbPackage.ENTITY_BEAN__PERSISTENCE_TYPE:
-				return getPersistenceType();
-			case EjbPackage.ENTITY_BEAN__PRIM_KEY_CLASS:
-				return getPrimKeyClass();
-			case EjbPackage.ENTITY_BEAN__REENTRANT:
-				return isReentrant() ? Boolean.TRUE : Boolean.FALSE;
-			case EjbPackage.ENTITY_BEAN__CMP_VERSION:
-				return getCmpVersion();
-			case EjbPackage.ENTITY_BEAN__ABSTRACT_SCHEMA_NAME:
-				return getAbstractSchemaName();
-			case EjbPackage.ENTITY_BEAN__CMP_FIELDS:
-				return getCmpFields();
-			case EjbPackage.ENTITY_BEAN__PRIMKEY_FIELD:
-				return getPrimkeyField();
-			case EjbPackage.ENTITY_BEAN__ENV_ENTRIES:
-				return getEnvEntries();
-			case EjbPackage.ENTITY_BEAN__EJB_REFS:
-				return getEjbRefs();
-			case EjbPackage.ENTITY_BEAN__EJB_LOCAL_REFS:
-				return getEjbLocalRefs();
-			case EjbPackage.ENTITY_BEAN__SERVICE_REFS:
-				return getServiceRefs();
-			case EjbPackage.ENTITY_BEAN__RESOURCE_REFS:
-				return getResourceRefs();
-			case EjbPackage.ENTITY_BEAN__RESOURCE_ENV_REFS:
-				return getResourceEnvRefs();
-			case EjbPackage.ENTITY_BEAN__MESSAGE_DESTINATION_REFS:
-				return getMessageDestinationRefs();
-			case EjbPackage.ENTITY_BEAN__PERSISTENCE_CONTEXT_REFS:
-				return getPersistenceContextRefs();
-			case EjbPackage.ENTITY_BEAN__PERSISTENCE_UNIT_REFS:
-				return getPersistenceUnitRefs();
-			case EjbPackage.ENTITY_BEAN__POST_CONSTRUCTS:
-				return getPostConstructs();
-			case EjbPackage.ENTITY_BEAN__PRE_DESTROYS:
-				return getPreDestroys();
-			case EjbPackage.ENTITY_BEAN__SECURITY_ROLE_REFS:
-				return getSecurityRoleRefs();
-			case EjbPackage.ENTITY_BEAN__SECURITY_IDENTITY:
-				return getSecurityIdentity();
-			case EjbPackage.ENTITY_BEAN__QUERIES:
-				return getQueries();
-			case EjbPackage.ENTITY_BEAN__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.ENTITY_BEAN__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ENTITY_BEAN__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				getDisplayNames().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ENTITY_BEAN__ICONS:
-				getIcons().clear();
-				getIcons().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ENTITY_BEAN__EJB_NAME:
-				setEjbName((String)newValue);
-				return;
-			case EjbPackage.ENTITY_BEAN__MAPPED_NAME:
-				setMappedName((String)newValue);
-				return;
-			case EjbPackage.ENTITY_BEAN__HOME:
-				setHome((String)newValue);
-				return;
-			case EjbPackage.ENTITY_BEAN__REMOTE:
-				setRemote((String)newValue);
-				return;
-			case EjbPackage.ENTITY_BEAN__LOCAL_HOME:
-				setLocalHome((String)newValue);
-				return;
-			case EjbPackage.ENTITY_BEAN__LOCAL:
-				setLocal((String)newValue);
-				return;
-			case EjbPackage.ENTITY_BEAN__EJB_CLASS:
-				setEjbClass((String)newValue);
-				return;
-			case EjbPackage.ENTITY_BEAN__PERSISTENCE_TYPE:
-				setPersistenceType((PersistenceType)newValue);
-				return;
-			case EjbPackage.ENTITY_BEAN__PRIM_KEY_CLASS:
-				setPrimKeyClass((String)newValue);
-				return;
-			case EjbPackage.ENTITY_BEAN__REENTRANT:
-				setReentrant(((Boolean)newValue).booleanValue());
-				return;
-			case EjbPackage.ENTITY_BEAN__CMP_VERSION:
-				setCmpVersion((CmpVersionType)newValue);
-				return;
-			case EjbPackage.ENTITY_BEAN__ABSTRACT_SCHEMA_NAME:
-				setAbstractSchemaName((String)newValue);
-				return;
-			case EjbPackage.ENTITY_BEAN__CMP_FIELDS:
-				getCmpFields().clear();
-				getCmpFields().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ENTITY_BEAN__PRIMKEY_FIELD:
-				setPrimkeyField((String)newValue);
-				return;
-			case EjbPackage.ENTITY_BEAN__ENV_ENTRIES:
-				getEnvEntries().clear();
-				getEnvEntries().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ENTITY_BEAN__EJB_REFS:
-				getEjbRefs().clear();
-				getEjbRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ENTITY_BEAN__EJB_LOCAL_REFS:
-				getEjbLocalRefs().clear();
-				getEjbLocalRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ENTITY_BEAN__SERVICE_REFS:
-				getServiceRefs().clear();
-				getServiceRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ENTITY_BEAN__RESOURCE_REFS:
-				getResourceRefs().clear();
-				getResourceRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ENTITY_BEAN__RESOURCE_ENV_REFS:
-				getResourceEnvRefs().clear();
-				getResourceEnvRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ENTITY_BEAN__MESSAGE_DESTINATION_REFS:
-				getMessageDestinationRefs().clear();
-				getMessageDestinationRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ENTITY_BEAN__PERSISTENCE_CONTEXT_REFS:
-				getPersistenceContextRefs().clear();
-				getPersistenceContextRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ENTITY_BEAN__PERSISTENCE_UNIT_REFS:
-				getPersistenceUnitRefs().clear();
-				getPersistenceUnitRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ENTITY_BEAN__POST_CONSTRUCTS:
-				getPostConstructs().clear();
-				getPostConstructs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ENTITY_BEAN__PRE_DESTROYS:
-				getPreDestroys().clear();
-				getPreDestroys().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ENTITY_BEAN__SECURITY_ROLE_REFS:
-				getSecurityRoleRefs().clear();
-				getSecurityRoleRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ENTITY_BEAN__SECURITY_IDENTITY:
-				setSecurityIdentity((SecurityIdentityType)newValue);
-				return;
-			case EjbPackage.ENTITY_BEAN__QUERIES:
-				getQueries().clear();
-				getQueries().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ENTITY_BEAN__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.ENTITY_BEAN__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case EjbPackage.ENTITY_BEAN__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				return;
-			case EjbPackage.ENTITY_BEAN__ICONS:
-				getIcons().clear();
-				return;
-			case EjbPackage.ENTITY_BEAN__EJB_NAME:
-				setEjbName(EJB_NAME_EDEFAULT);
-				return;
-			case EjbPackage.ENTITY_BEAN__MAPPED_NAME:
-				setMappedName(MAPPED_NAME_EDEFAULT);
-				return;
-			case EjbPackage.ENTITY_BEAN__HOME:
-				setHome(HOME_EDEFAULT);
-				return;
-			case EjbPackage.ENTITY_BEAN__REMOTE:
-				setRemote(REMOTE_EDEFAULT);
-				return;
-			case EjbPackage.ENTITY_BEAN__LOCAL_HOME:
-				setLocalHome(LOCAL_HOME_EDEFAULT);
-				return;
-			case EjbPackage.ENTITY_BEAN__LOCAL:
-				setLocal(LOCAL_EDEFAULT);
-				return;
-			case EjbPackage.ENTITY_BEAN__EJB_CLASS:
-				setEjbClass(EJB_CLASS_EDEFAULT);
-				return;
-			case EjbPackage.ENTITY_BEAN__PERSISTENCE_TYPE:
-				unsetPersistenceType();
-				return;
-			case EjbPackage.ENTITY_BEAN__PRIM_KEY_CLASS:
-				setPrimKeyClass(PRIM_KEY_CLASS_EDEFAULT);
-				return;
-			case EjbPackage.ENTITY_BEAN__REENTRANT:
-				unsetReentrant();
-				return;
-			case EjbPackage.ENTITY_BEAN__CMP_VERSION:
-				unsetCmpVersion();
-				return;
-			case EjbPackage.ENTITY_BEAN__ABSTRACT_SCHEMA_NAME:
-				setAbstractSchemaName(ABSTRACT_SCHEMA_NAME_EDEFAULT);
-				return;
-			case EjbPackage.ENTITY_BEAN__CMP_FIELDS:
-				getCmpFields().clear();
-				return;
-			case EjbPackage.ENTITY_BEAN__PRIMKEY_FIELD:
-				setPrimkeyField(PRIMKEY_FIELD_EDEFAULT);
-				return;
-			case EjbPackage.ENTITY_BEAN__ENV_ENTRIES:
-				getEnvEntries().clear();
-				return;
-			case EjbPackage.ENTITY_BEAN__EJB_REFS:
-				getEjbRefs().clear();
-				return;
-			case EjbPackage.ENTITY_BEAN__EJB_LOCAL_REFS:
-				getEjbLocalRefs().clear();
-				return;
-			case EjbPackage.ENTITY_BEAN__SERVICE_REFS:
-				getServiceRefs().clear();
-				return;
-			case EjbPackage.ENTITY_BEAN__RESOURCE_REFS:
-				getResourceRefs().clear();
-				return;
-			case EjbPackage.ENTITY_BEAN__RESOURCE_ENV_REFS:
-				getResourceEnvRefs().clear();
-				return;
-			case EjbPackage.ENTITY_BEAN__MESSAGE_DESTINATION_REFS:
-				getMessageDestinationRefs().clear();
-				return;
-			case EjbPackage.ENTITY_BEAN__PERSISTENCE_CONTEXT_REFS:
-				getPersistenceContextRefs().clear();
-				return;
-			case EjbPackage.ENTITY_BEAN__PERSISTENCE_UNIT_REFS:
-				getPersistenceUnitRefs().clear();
-				return;
-			case EjbPackage.ENTITY_BEAN__POST_CONSTRUCTS:
-				getPostConstructs().clear();
-				return;
-			case EjbPackage.ENTITY_BEAN__PRE_DESTROYS:
-				getPreDestroys().clear();
-				return;
-			case EjbPackage.ENTITY_BEAN__SECURITY_ROLE_REFS:
-				getSecurityRoleRefs().clear();
-				return;
-			case EjbPackage.ENTITY_BEAN__SECURITY_IDENTITY:
-				setSecurityIdentity((SecurityIdentityType)null);
-				return;
-			case EjbPackage.ENTITY_BEAN__QUERIES:
-				getQueries().clear();
-				return;
-			case EjbPackage.ENTITY_BEAN__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.ENTITY_BEAN__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case EjbPackage.ENTITY_BEAN__DISPLAY_NAMES:
-				return displayNames != null && !displayNames.isEmpty();
-			case EjbPackage.ENTITY_BEAN__ICONS:
-				return icons != null && !icons.isEmpty();
-			case EjbPackage.ENTITY_BEAN__EJB_NAME:
-				return EJB_NAME_EDEFAULT == null ? ejbName != null : !EJB_NAME_EDEFAULT.equals(ejbName);
-			case EjbPackage.ENTITY_BEAN__MAPPED_NAME:
-				return MAPPED_NAME_EDEFAULT == null ? mappedName != null : !MAPPED_NAME_EDEFAULT.equals(mappedName);
-			case EjbPackage.ENTITY_BEAN__HOME:
-				return HOME_EDEFAULT == null ? home != null : !HOME_EDEFAULT.equals(home);
-			case EjbPackage.ENTITY_BEAN__REMOTE:
-				return REMOTE_EDEFAULT == null ? remote != null : !REMOTE_EDEFAULT.equals(remote);
-			case EjbPackage.ENTITY_BEAN__LOCAL_HOME:
-				return LOCAL_HOME_EDEFAULT == null ? localHome != null : !LOCAL_HOME_EDEFAULT.equals(localHome);
-			case EjbPackage.ENTITY_BEAN__LOCAL:
-				return LOCAL_EDEFAULT == null ? local != null : !LOCAL_EDEFAULT.equals(local);
-			case EjbPackage.ENTITY_BEAN__EJB_CLASS:
-				return EJB_CLASS_EDEFAULT == null ? ejbClass != null : !EJB_CLASS_EDEFAULT.equals(ejbClass);
-			case EjbPackage.ENTITY_BEAN__PERSISTENCE_TYPE:
-				return isSetPersistenceType();
-			case EjbPackage.ENTITY_BEAN__PRIM_KEY_CLASS:
-				return PRIM_KEY_CLASS_EDEFAULT == null ? primKeyClass != null : !PRIM_KEY_CLASS_EDEFAULT.equals(primKeyClass);
-			case EjbPackage.ENTITY_BEAN__REENTRANT:
-				return isSetReentrant();
-			case EjbPackage.ENTITY_BEAN__CMP_VERSION:
-				return isSetCmpVersion();
-			case EjbPackage.ENTITY_BEAN__ABSTRACT_SCHEMA_NAME:
-				return ABSTRACT_SCHEMA_NAME_EDEFAULT == null ? abstractSchemaName != null : !ABSTRACT_SCHEMA_NAME_EDEFAULT.equals(abstractSchemaName);
-			case EjbPackage.ENTITY_BEAN__CMP_FIELDS:
-				return cmpFields != null && !cmpFields.isEmpty();
-			case EjbPackage.ENTITY_BEAN__PRIMKEY_FIELD:
-				return PRIMKEY_FIELD_EDEFAULT == null ? primkeyField != null : !PRIMKEY_FIELD_EDEFAULT.equals(primkeyField);
-			case EjbPackage.ENTITY_BEAN__ENV_ENTRIES:
-				return envEntries != null && !envEntries.isEmpty();
-			case EjbPackage.ENTITY_BEAN__EJB_REFS:
-				return ejbRefs != null && !ejbRefs.isEmpty();
-			case EjbPackage.ENTITY_BEAN__EJB_LOCAL_REFS:
-				return ejbLocalRefs != null && !ejbLocalRefs.isEmpty();
-			case EjbPackage.ENTITY_BEAN__SERVICE_REFS:
-				return serviceRefs != null && !serviceRefs.isEmpty();
-			case EjbPackage.ENTITY_BEAN__RESOURCE_REFS:
-				return resourceRefs != null && !resourceRefs.isEmpty();
-			case EjbPackage.ENTITY_BEAN__RESOURCE_ENV_REFS:
-				return resourceEnvRefs != null && !resourceEnvRefs.isEmpty();
-			case EjbPackage.ENTITY_BEAN__MESSAGE_DESTINATION_REFS:
-				return messageDestinationRefs != null && !messageDestinationRefs.isEmpty();
-			case EjbPackage.ENTITY_BEAN__PERSISTENCE_CONTEXT_REFS:
-				return persistenceContextRefs != null && !persistenceContextRefs.isEmpty();
-			case EjbPackage.ENTITY_BEAN__PERSISTENCE_UNIT_REFS:
-				return persistenceUnitRefs != null && !persistenceUnitRefs.isEmpty();
-			case EjbPackage.ENTITY_BEAN__POST_CONSTRUCTS:
-				return postConstructs != null && !postConstructs.isEmpty();
-			case EjbPackage.ENTITY_BEAN__PRE_DESTROYS:
-				return preDestroys != null && !preDestroys.isEmpty();
-			case EjbPackage.ENTITY_BEAN__SECURITY_ROLE_REFS:
-				return securityRoleRefs != null && !securityRoleRefs.isEmpty();
-			case EjbPackage.ENTITY_BEAN__SECURITY_IDENTITY:
-				return securityIdentity != null;
-			case EjbPackage.ENTITY_BEAN__QUERIES:
-				return queries != null && !queries.isEmpty();
-			case EjbPackage.ENTITY_BEAN__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (ejbName: "); //$NON-NLS-1$
-		result.append(ejbName);
-		result.append(", mappedName: "); //$NON-NLS-1$
-		result.append(mappedName);
-		result.append(", home: "); //$NON-NLS-1$
-		result.append(home);
-		result.append(", remote: "); //$NON-NLS-1$
-		result.append(remote);
-		result.append(", localHome: "); //$NON-NLS-1$
-		result.append(localHome);
-		result.append(", local: "); //$NON-NLS-1$
-		result.append(local);
-		result.append(", ejbClass: "); //$NON-NLS-1$
-		result.append(ejbClass);
-		result.append(", persistenceType: "); //$NON-NLS-1$
-		if (persistenceTypeESet) result.append(persistenceType); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(", primKeyClass: "); //$NON-NLS-1$
-		result.append(primKeyClass);
-		result.append(", reentrant: "); //$NON-NLS-1$
-		if (reentrantESet) result.append(reentrant); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(", cmpVersion: "); //$NON-NLS-1$
-		if (cmpVersionESet) result.append(cmpVersion); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(", abstractSchemaName: "); //$NON-NLS-1$
-		result.append(abstractSchemaName);
-		result.append(", primkeyField: "); //$NON-NLS-1$
-		result.append(primkeyField);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //EntityBeanImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/ExcludeListImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/ExcludeListImpl.java
deleted file mode 100644
index fddba20e4..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/ExcludeListImpl.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb.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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jst.javaee.core.Description;
-
-import org.eclipse.jst.javaee.ejb.ExcludeList;
-import org.eclipse.jst.javaee.ejb.MethodType;
-
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Exclude List</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.ExcludeListImpl#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.ExcludeListImpl#getMethods <em>Methods</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.ExcludeListImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ExcludeListImpl extends EObjectImpl implements ExcludeList {
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The cached value of the '{@link #getMethods() <em>Methods</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMethods()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList methods = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ExcludeListImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.EXCLUDE_LIST;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.EXCLUDE_LIST__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getMethods() {
-		if (methods == null) {
-			methods = new EObjectContainmentEList(MethodType.class, this, EjbPackage.EXCLUDE_LIST__METHODS);
-		}
-		return methods;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EXCLUDE_LIST__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.EXCLUDE_LIST__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-			case EjbPackage.EXCLUDE_LIST__METHODS:
-				return ((InternalEList)getMethods()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.EXCLUDE_LIST__DESCRIPTIONS:
-				return getDescriptions();
-			case EjbPackage.EXCLUDE_LIST__METHODS:
-				return getMethods();
-			case EjbPackage.EXCLUDE_LIST__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.EXCLUDE_LIST__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case EjbPackage.EXCLUDE_LIST__METHODS:
-				getMethods().clear();
-				getMethods().addAll((Collection)newValue);
-				return;
-			case EjbPackage.EXCLUDE_LIST__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.EXCLUDE_LIST__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case EjbPackage.EXCLUDE_LIST__METHODS:
-				getMethods().clear();
-				return;
-			case EjbPackage.EXCLUDE_LIST__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.EXCLUDE_LIST__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case EjbPackage.EXCLUDE_LIST__METHODS:
-				return methods != null && !methods.isEmpty();
-			case EjbPackage.EXCLUDE_LIST__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	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();
-	}
-
-} //ExcludeListImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/InitMethodTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/InitMethodTypeImpl.java
deleted file mode 100644
index 3590b33ed..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/InitMethodTypeImpl.java
+++ /dev/null
@@ -1,312 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb.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.ejb.InitMethodType;
-import org.eclipse.jst.javaee.ejb.NamedMethodType;
-
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Init Method Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InitMethodTypeImpl#getCreateMethod <em>Create Method</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InitMethodTypeImpl#getBeanMethod <em>Bean Method</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InitMethodTypeImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class InitMethodTypeImpl extends EObjectImpl implements InitMethodType {
-	/**
-	 * The cached value of the '{@link #getCreateMethod() <em>Create Method</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCreateMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected NamedMethodType createMethod = null;
-
-	/**
-	 * The cached value of the '{@link #getBeanMethod() <em>Bean Method</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBeanMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected NamedMethodType beanMethod = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected InitMethodTypeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.INIT_METHOD_TYPE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NamedMethodType getCreateMethod() {
-		return createMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetCreateMethod(NamedMethodType newCreateMethod, NotificationChain msgs) {
-		NamedMethodType oldCreateMethod = createMethod;
-		createMethod = newCreateMethod;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.INIT_METHOD_TYPE__CREATE_METHOD, oldCreateMethod, newCreateMethod);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCreateMethod(NamedMethodType newCreateMethod) {
-		if (newCreateMethod != createMethod) {
-			NotificationChain msgs = null;
-			if (createMethod != null)
-				msgs = ((InternalEObject)createMethod).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.INIT_METHOD_TYPE__CREATE_METHOD, null, msgs);
-			if (newCreateMethod != null)
-				msgs = ((InternalEObject)newCreateMethod).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EjbPackage.INIT_METHOD_TYPE__CREATE_METHOD, null, msgs);
-			msgs = basicSetCreateMethod(newCreateMethod, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.INIT_METHOD_TYPE__CREATE_METHOD, newCreateMethod, newCreateMethod));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NamedMethodType getBeanMethod() {
-		return beanMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetBeanMethod(NamedMethodType newBeanMethod, NotificationChain msgs) {
-		NamedMethodType oldBeanMethod = beanMethod;
-		beanMethod = newBeanMethod;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.INIT_METHOD_TYPE__BEAN_METHOD, oldBeanMethod, newBeanMethod);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBeanMethod(NamedMethodType newBeanMethod) {
-		if (newBeanMethod != beanMethod) {
-			NotificationChain msgs = null;
-			if (beanMethod != null)
-				msgs = ((InternalEObject)beanMethod).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.INIT_METHOD_TYPE__BEAN_METHOD, null, msgs);
-			if (newBeanMethod != null)
-				msgs = ((InternalEObject)newBeanMethod).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EjbPackage.INIT_METHOD_TYPE__BEAN_METHOD, null, msgs);
-			msgs = basicSetBeanMethod(newBeanMethod, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.INIT_METHOD_TYPE__BEAN_METHOD, newBeanMethod, newBeanMethod));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.INIT_METHOD_TYPE__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.INIT_METHOD_TYPE__CREATE_METHOD:
-				return basicSetCreateMethod(null, msgs);
-			case EjbPackage.INIT_METHOD_TYPE__BEAN_METHOD:
-				return basicSetBeanMethod(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.INIT_METHOD_TYPE__CREATE_METHOD:
-				return getCreateMethod();
-			case EjbPackage.INIT_METHOD_TYPE__BEAN_METHOD:
-				return getBeanMethod();
-			case EjbPackage.INIT_METHOD_TYPE__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.INIT_METHOD_TYPE__CREATE_METHOD:
-				setCreateMethod((NamedMethodType)newValue);
-				return;
-			case EjbPackage.INIT_METHOD_TYPE__BEAN_METHOD:
-				setBeanMethod((NamedMethodType)newValue);
-				return;
-			case EjbPackage.INIT_METHOD_TYPE__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.INIT_METHOD_TYPE__CREATE_METHOD:
-				setCreateMethod((NamedMethodType)null);
-				return;
-			case EjbPackage.INIT_METHOD_TYPE__BEAN_METHOD:
-				setBeanMethod((NamedMethodType)null);
-				return;
-			case EjbPackage.INIT_METHOD_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.INIT_METHOD_TYPE__CREATE_METHOD:
-				return createMethod != null;
-			case EjbPackage.INIT_METHOD_TYPE__BEAN_METHOD:
-				return beanMethod != null;
-			case EjbPackage.INIT_METHOD_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	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();
-	}
-
-} //InitMethodTypeImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/InterceptorBindingTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/InterceptorBindingTypeImpl.java
deleted file mode 100644
index abb00e712..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/InterceptorBindingTypeImpl.java
+++ /dev/null
@@ -1,626 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb.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.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jst.javaee.core.Description;
-
-import org.eclipse.jst.javaee.ejb.InterceptorBindingType;
-import org.eclipse.jst.javaee.ejb.InterceptorOrderType;
-import org.eclipse.jst.javaee.ejb.NamedMethodType;
-
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Interceptor Binding Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorBindingTypeImpl#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorBindingTypeImpl#getEjbName <em>Ejb Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorBindingTypeImpl#getInterceptorClasses <em>Interceptor Classes</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorBindingTypeImpl#getInterceptorOrder <em>Interceptor Order</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorBindingTypeImpl#isExcludeDefaultInterceptors <em>Exclude Default Interceptors</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorBindingTypeImpl#isExcludeClassInterceptors <em>Exclude Class Interceptors</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorBindingTypeImpl#getMethod <em>Method</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorBindingTypeImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class InterceptorBindingTypeImpl extends EObjectImpl implements InterceptorBindingType {
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The default value of the '{@link #getEjbName() <em>Ejb Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EJB_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getEjbName() <em>Ejb Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String ejbName = EJB_NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getInterceptorClasses() <em>Interceptor Classes</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInterceptorClasses()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList interceptorClasses = null;
-
-	/**
-	 * The cached value of the '{@link #getInterceptorOrder() <em>Interceptor Order</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInterceptorOrder()
-	 * @generated
-	 * @ordered
-	 */
-	protected InterceptorOrderType interceptorOrder = null;
-
-	/**
-	 * The default value of the '{@link #isExcludeDefaultInterceptors() <em>Exclude Default Interceptors</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isExcludeDefaultInterceptors()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean EXCLUDE_DEFAULT_INTERCEPTORS_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isExcludeDefaultInterceptors() <em>Exclude Default Interceptors</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isExcludeDefaultInterceptors()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean excludeDefaultInterceptors = EXCLUDE_DEFAULT_INTERCEPTORS_EDEFAULT;
-
-	/**
-	 * This is true if the Exclude Default Interceptors attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean excludeDefaultInterceptorsESet = false;
-
-	/**
-	 * The default value of the '{@link #isExcludeClassInterceptors() <em>Exclude Class Interceptors</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isExcludeClassInterceptors()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean EXCLUDE_CLASS_INTERCEPTORS_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isExcludeClassInterceptors() <em>Exclude Class Interceptors</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isExcludeClassInterceptors()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean excludeClassInterceptors = EXCLUDE_CLASS_INTERCEPTORS_EDEFAULT;
-
-	/**
-	 * This is true if the Exclude Class Interceptors attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean excludeClassInterceptorsESet = false;
-
-	/**
-	 * The cached value of the '{@link #getMethod() <em>Method</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected NamedMethodType method = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected InterceptorBindingTypeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.INTERCEPTOR_BINDING_TYPE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.INTERCEPTOR_BINDING_TYPE__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getEjbName() {
-		return ejbName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEjbName(String newEjbName) {
-		String oldEjbName = ejbName;
-		ejbName = newEjbName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.INTERCEPTOR_BINDING_TYPE__EJB_NAME, oldEjbName, ejbName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getInterceptorClasses() {
-		if (interceptorClasses == null) {
-			interceptorClasses = new EDataTypeEList(String.class, this, EjbPackage.INTERCEPTOR_BINDING_TYPE__INTERCEPTOR_CLASSES);
-		}
-		return interceptorClasses;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public InterceptorOrderType getInterceptorOrder() {
-		return interceptorOrder;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetInterceptorOrder(InterceptorOrderType newInterceptorOrder, NotificationChain msgs) {
-		InterceptorOrderType oldInterceptorOrder = interceptorOrder;
-		interceptorOrder = newInterceptorOrder;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.INTERCEPTOR_BINDING_TYPE__INTERCEPTOR_ORDER, oldInterceptorOrder, newInterceptorOrder);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setInterceptorOrder(InterceptorOrderType newInterceptorOrder) {
-		if (newInterceptorOrder != interceptorOrder) {
-			NotificationChain msgs = null;
-			if (interceptorOrder != null)
-				msgs = ((InternalEObject)interceptorOrder).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.INTERCEPTOR_BINDING_TYPE__INTERCEPTOR_ORDER, null, msgs);
-			if (newInterceptorOrder != null)
-				msgs = ((InternalEObject)newInterceptorOrder).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EjbPackage.INTERCEPTOR_BINDING_TYPE__INTERCEPTOR_ORDER, null, msgs);
-			msgs = basicSetInterceptorOrder(newInterceptorOrder, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.INTERCEPTOR_BINDING_TYPE__INTERCEPTOR_ORDER, newInterceptorOrder, newInterceptorOrder));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isExcludeDefaultInterceptors() {
-		return excludeDefaultInterceptors;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setExcludeDefaultInterceptors(boolean newExcludeDefaultInterceptors) {
-		boolean oldExcludeDefaultInterceptors = excludeDefaultInterceptors;
-		excludeDefaultInterceptors = newExcludeDefaultInterceptors;
-		boolean oldExcludeDefaultInterceptorsESet = excludeDefaultInterceptorsESet;
-		excludeDefaultInterceptorsESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.INTERCEPTOR_BINDING_TYPE__EXCLUDE_DEFAULT_INTERCEPTORS, oldExcludeDefaultInterceptors, excludeDefaultInterceptors, !oldExcludeDefaultInterceptorsESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetExcludeDefaultInterceptors() {
-		boolean oldExcludeDefaultInterceptors = excludeDefaultInterceptors;
-		boolean oldExcludeDefaultInterceptorsESet = excludeDefaultInterceptorsESet;
-		excludeDefaultInterceptors = EXCLUDE_DEFAULT_INTERCEPTORS_EDEFAULT;
-		excludeDefaultInterceptorsESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.INTERCEPTOR_BINDING_TYPE__EXCLUDE_DEFAULT_INTERCEPTORS, oldExcludeDefaultInterceptors, EXCLUDE_DEFAULT_INTERCEPTORS_EDEFAULT, oldExcludeDefaultInterceptorsESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetExcludeDefaultInterceptors() {
-		return excludeDefaultInterceptorsESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isExcludeClassInterceptors() {
-		return excludeClassInterceptors;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setExcludeClassInterceptors(boolean newExcludeClassInterceptors) {
-		boolean oldExcludeClassInterceptors = excludeClassInterceptors;
-		excludeClassInterceptors = newExcludeClassInterceptors;
-		boolean oldExcludeClassInterceptorsESet = excludeClassInterceptorsESet;
-		excludeClassInterceptorsESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.INTERCEPTOR_BINDING_TYPE__EXCLUDE_CLASS_INTERCEPTORS, oldExcludeClassInterceptors, excludeClassInterceptors, !oldExcludeClassInterceptorsESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetExcludeClassInterceptors() {
-		boolean oldExcludeClassInterceptors = excludeClassInterceptors;
-		boolean oldExcludeClassInterceptorsESet = excludeClassInterceptorsESet;
-		excludeClassInterceptors = EXCLUDE_CLASS_INTERCEPTORS_EDEFAULT;
-		excludeClassInterceptorsESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.INTERCEPTOR_BINDING_TYPE__EXCLUDE_CLASS_INTERCEPTORS, oldExcludeClassInterceptors, EXCLUDE_CLASS_INTERCEPTORS_EDEFAULT, oldExcludeClassInterceptorsESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetExcludeClassInterceptors() {
-		return excludeClassInterceptorsESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NamedMethodType getMethod() {
-		return method;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetMethod(NamedMethodType newMethod, NotificationChain msgs) {
-		NamedMethodType oldMethod = method;
-		method = newMethod;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.INTERCEPTOR_BINDING_TYPE__METHOD, oldMethod, newMethod);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMethod(NamedMethodType newMethod) {
-		if (newMethod != method) {
-			NotificationChain msgs = null;
-			if (method != null)
-				msgs = ((InternalEObject)method).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.INTERCEPTOR_BINDING_TYPE__METHOD, null, msgs);
-			if (newMethod != null)
-				msgs = ((InternalEObject)newMethod).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EjbPackage.INTERCEPTOR_BINDING_TYPE__METHOD, null, msgs);
-			msgs = basicSetMethod(newMethod, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.INTERCEPTOR_BINDING_TYPE__METHOD, newMethod, newMethod));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.INTERCEPTOR_BINDING_TYPE__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.INTERCEPTOR_BINDING_TYPE__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-			case EjbPackage.INTERCEPTOR_BINDING_TYPE__INTERCEPTOR_ORDER:
-				return basicSetInterceptorOrder(null, msgs);
-			case EjbPackage.INTERCEPTOR_BINDING_TYPE__METHOD:
-				return basicSetMethod(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.INTERCEPTOR_BINDING_TYPE__DESCRIPTIONS:
-				return getDescriptions();
-			case EjbPackage.INTERCEPTOR_BINDING_TYPE__EJB_NAME:
-				return getEjbName();
-			case EjbPackage.INTERCEPTOR_BINDING_TYPE__INTERCEPTOR_CLASSES:
-				return getInterceptorClasses();
-			case EjbPackage.INTERCEPTOR_BINDING_TYPE__INTERCEPTOR_ORDER:
-				return getInterceptorOrder();
-			case EjbPackage.INTERCEPTOR_BINDING_TYPE__EXCLUDE_DEFAULT_INTERCEPTORS:
-				return isExcludeDefaultInterceptors() ? Boolean.TRUE : Boolean.FALSE;
-			case EjbPackage.INTERCEPTOR_BINDING_TYPE__EXCLUDE_CLASS_INTERCEPTORS:
-				return isExcludeClassInterceptors() ? Boolean.TRUE : Boolean.FALSE;
-			case EjbPackage.INTERCEPTOR_BINDING_TYPE__METHOD:
-				return getMethod();
-			case EjbPackage.INTERCEPTOR_BINDING_TYPE__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.INTERCEPTOR_BINDING_TYPE__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case EjbPackage.INTERCEPTOR_BINDING_TYPE__EJB_NAME:
-				setEjbName((String)newValue);
-				return;
-			case EjbPackage.INTERCEPTOR_BINDING_TYPE__INTERCEPTOR_CLASSES:
-				getInterceptorClasses().clear();
-				getInterceptorClasses().addAll((Collection)newValue);
-				return;
-			case EjbPackage.INTERCEPTOR_BINDING_TYPE__INTERCEPTOR_ORDER:
-				setInterceptorOrder((InterceptorOrderType)newValue);
-				return;
-			case EjbPackage.INTERCEPTOR_BINDING_TYPE__EXCLUDE_DEFAULT_INTERCEPTORS:
-				setExcludeDefaultInterceptors(((Boolean)newValue).booleanValue());
-				return;
-			case EjbPackage.INTERCEPTOR_BINDING_TYPE__EXCLUDE_CLASS_INTERCEPTORS:
-				setExcludeClassInterceptors(((Boolean)newValue).booleanValue());
-				return;
-			case EjbPackage.INTERCEPTOR_BINDING_TYPE__METHOD:
-				setMethod((NamedMethodType)newValue);
-				return;
-			case EjbPackage.INTERCEPTOR_BINDING_TYPE__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.INTERCEPTOR_BINDING_TYPE__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case EjbPackage.INTERCEPTOR_BINDING_TYPE__EJB_NAME:
-				setEjbName(EJB_NAME_EDEFAULT);
-				return;
-			case EjbPackage.INTERCEPTOR_BINDING_TYPE__INTERCEPTOR_CLASSES:
-				getInterceptorClasses().clear();
-				return;
-			case EjbPackage.INTERCEPTOR_BINDING_TYPE__INTERCEPTOR_ORDER:
-				setInterceptorOrder((InterceptorOrderType)null);
-				return;
-			case EjbPackage.INTERCEPTOR_BINDING_TYPE__EXCLUDE_DEFAULT_INTERCEPTORS:
-				unsetExcludeDefaultInterceptors();
-				return;
-			case EjbPackage.INTERCEPTOR_BINDING_TYPE__EXCLUDE_CLASS_INTERCEPTORS:
-				unsetExcludeClassInterceptors();
-				return;
-			case EjbPackage.INTERCEPTOR_BINDING_TYPE__METHOD:
-				setMethod((NamedMethodType)null);
-				return;
-			case EjbPackage.INTERCEPTOR_BINDING_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.INTERCEPTOR_BINDING_TYPE__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case EjbPackage.INTERCEPTOR_BINDING_TYPE__EJB_NAME:
-				return EJB_NAME_EDEFAULT == null ? ejbName != null : !EJB_NAME_EDEFAULT.equals(ejbName);
-			case EjbPackage.INTERCEPTOR_BINDING_TYPE__INTERCEPTOR_CLASSES:
-				return interceptorClasses != null && !interceptorClasses.isEmpty();
-			case EjbPackage.INTERCEPTOR_BINDING_TYPE__INTERCEPTOR_ORDER:
-				return interceptorOrder != null;
-			case EjbPackage.INTERCEPTOR_BINDING_TYPE__EXCLUDE_DEFAULT_INTERCEPTORS:
-				return isSetExcludeDefaultInterceptors();
-			case EjbPackage.INTERCEPTOR_BINDING_TYPE__EXCLUDE_CLASS_INTERCEPTORS:
-				return isSetExcludeClassInterceptors();
-			case EjbPackage.INTERCEPTOR_BINDING_TYPE__METHOD:
-				return method != null;
-			case EjbPackage.INTERCEPTOR_BINDING_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (ejbName: "); //$NON-NLS-1$
-		result.append(ejbName);
-		result.append(", interceptorClasses: "); //$NON-NLS-1$
-		result.append(interceptorClasses);
-		result.append(", excludeDefaultInterceptors: "); //$NON-NLS-1$
-		if (excludeDefaultInterceptorsESet) result.append(excludeDefaultInterceptors); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(", excludeClassInterceptors: "); //$NON-NLS-1$
-		if (excludeClassInterceptorsESet) result.append(excludeClassInterceptors); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //InterceptorBindingTypeImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/InterceptorOrderTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/InterceptorOrderTypeImpl.java
deleted file mode 100644
index 08d09c960..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/InterceptorOrderTypeImpl.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb.internal.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-
-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.ejb.InterceptorOrderType;
-
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Interceptor Order Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorOrderTypeImpl#getInterceptorClasses <em>Interceptor Classes</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorOrderTypeImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class InterceptorOrderTypeImpl extends EObjectImpl implements InterceptorOrderType {
-	/**
-	 * The cached value of the '{@link #getInterceptorClasses() <em>Interceptor Classes</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInterceptorClasses()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList interceptorClasses = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected InterceptorOrderTypeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.INTERCEPTOR_ORDER_TYPE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getInterceptorClasses() {
-		if (interceptorClasses == null) {
-			interceptorClasses = new EDataTypeEList(String.class, this, EjbPackage.INTERCEPTOR_ORDER_TYPE__INTERCEPTOR_CLASSES);
-		}
-		return interceptorClasses;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.INTERCEPTOR_ORDER_TYPE__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.INTERCEPTOR_ORDER_TYPE__INTERCEPTOR_CLASSES:
-				return getInterceptorClasses();
-			case EjbPackage.INTERCEPTOR_ORDER_TYPE__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.INTERCEPTOR_ORDER_TYPE__INTERCEPTOR_CLASSES:
-				getInterceptorClasses().clear();
-				getInterceptorClasses().addAll((Collection)newValue);
-				return;
-			case EjbPackage.INTERCEPTOR_ORDER_TYPE__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.INTERCEPTOR_ORDER_TYPE__INTERCEPTOR_CLASSES:
-				getInterceptorClasses().clear();
-				return;
-			case EjbPackage.INTERCEPTOR_ORDER_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.INTERCEPTOR_ORDER_TYPE__INTERCEPTOR_CLASSES:
-				return interceptorClasses != null && !interceptorClasses.isEmpty();
-			case EjbPackage.INTERCEPTOR_ORDER_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (interceptorClasses: "); //$NON-NLS-1$
-		result.append(interceptorClasses);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //InterceptorOrderTypeImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/InterceptorTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/InterceptorTypeImpl.java
deleted file mode 100644
index 641f4e5da..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/InterceptorTypeImpl.java
+++ /dev/null
@@ -1,794 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb.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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jst.javaee.core.Description;
-import org.eclipse.jst.javaee.core.EjbLocalRef;
-import org.eclipse.jst.javaee.core.EjbRef;
-import org.eclipse.jst.javaee.core.EnvEntry;
-import org.eclipse.jst.javaee.core.LifecycleCallback;
-import org.eclipse.jst.javaee.core.MessageDestinationRef;
-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.ServiceRef;
-
-import org.eclipse.jst.javaee.ejb.AroundInvokeType;
-import org.eclipse.jst.javaee.ejb.InterceptorType;
-
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Interceptor Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getInterceptorClass <em>Interceptor Class</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getAroundInvokes <em>Around Invokes</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getEnvEntries <em>Env Entries</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getEjbRefs <em>Ejb Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getEjbLocalRefs <em>Ejb Local Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getServiceRefs <em>Service Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getResourceRefs <em>Resource Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getResourceEnvRefs <em>Resource Env Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getMessageDestinationRefs <em>Message Destination Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getPersistenceContextRefs <em>Persistence Context Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getPersistenceUnitRefs <em>Persistence Unit Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getPostConstructs <em>Post Constructs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getPreDestroys <em>Pre Destroys</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getPostActivates <em>Post Activates</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getPrePassivates <em>Pre Passivates</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class InterceptorTypeImpl extends EObjectImpl implements InterceptorType {
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The default value of the '{@link #getInterceptorClass() <em>Interceptor Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInterceptorClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String INTERCEPTOR_CLASS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getInterceptorClass() <em>Interceptor Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInterceptorClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected String interceptorClass = INTERCEPTOR_CLASS_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getAroundInvokes() <em>Around Invokes</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAroundInvokes()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList aroundInvokes = null;
-
-	/**
-	 * The cached value of the '{@link #getEnvEntries() <em>Env Entries</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEnvEntries()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList envEntries = null;
-
-	/**
-	 * The cached value of the '{@link #getEjbRefs() <em>Ejb Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList ejbRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getEjbLocalRefs() <em>Ejb Local Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbLocalRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList ejbLocalRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getServiceRefs() <em>Service Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getServiceRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList serviceRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getResourceRefs() <em>Resource Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResourceRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList resourceRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getResourceEnvRefs() <em>Resource Env Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResourceEnvRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList resourceEnvRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getMessageDestinationRefs() <em>Message Destination Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessageDestinationRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList messageDestinationRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getPersistenceContextRefs() <em>Persistence Context Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPersistenceContextRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList persistenceContextRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getPersistenceUnitRefs() <em>Persistence Unit Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPersistenceUnitRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList persistenceUnitRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getPostConstructs() <em>Post Constructs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPostConstructs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList postConstructs = null;
-
-	/**
-	 * The cached value of the '{@link #getPreDestroys() <em>Pre Destroys</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPreDestroys()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList preDestroys = null;
-
-	/**
-	 * The cached value of the '{@link #getPostActivates() <em>Post Activates</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPostActivates()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList postActivates = null;
-
-	/**
-	 * The cached value of the '{@link #getPrePassivates() <em>Pre Passivates</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPrePassivates()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList prePassivates = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected InterceptorTypeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.INTERCEPTOR_TYPE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.INTERCEPTOR_TYPE__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getInterceptorClass() {
-		return interceptorClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setInterceptorClass(String newInterceptorClass) {
-		String oldInterceptorClass = interceptorClass;
-		interceptorClass = newInterceptorClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.INTERCEPTOR_TYPE__INTERCEPTOR_CLASS, oldInterceptorClass, interceptorClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getAroundInvokes() {
-		if (aroundInvokes == null) {
-			aroundInvokes = new EObjectContainmentEList(AroundInvokeType.class, this, EjbPackage.INTERCEPTOR_TYPE__AROUND_INVOKES);
-		}
-		return aroundInvokes;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getEnvEntries() {
-		if (envEntries == null) {
-			envEntries = new EObjectContainmentEList(EnvEntry.class, this, EjbPackage.INTERCEPTOR_TYPE__ENV_ENTRIES);
-		}
-		return envEntries;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getEjbRefs() {
-		if (ejbRefs == null) {
-			ejbRefs = new EObjectContainmentEList(EjbRef.class, this, EjbPackage.INTERCEPTOR_TYPE__EJB_REFS);
-		}
-		return ejbRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getEjbLocalRefs() {
-		if (ejbLocalRefs == null) {
-			ejbLocalRefs = new EObjectContainmentEList(EjbLocalRef.class, this, EjbPackage.INTERCEPTOR_TYPE__EJB_LOCAL_REFS);
-		}
-		return ejbLocalRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getServiceRefs() {
-		if (serviceRefs == null) {
-			serviceRefs = new EObjectContainmentEList(ServiceRef.class, this, EjbPackage.INTERCEPTOR_TYPE__SERVICE_REFS);
-		}
-		return serviceRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getResourceRefs() {
-		if (resourceRefs == null) {
-			resourceRefs = new EObjectContainmentEList(ResourceRef.class, this, EjbPackage.INTERCEPTOR_TYPE__RESOURCE_REFS);
-		}
-		return resourceRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getResourceEnvRefs() {
-		if (resourceEnvRefs == null) {
-			resourceEnvRefs = new EObjectContainmentEList(ResourceEnvRef.class, this, EjbPackage.INTERCEPTOR_TYPE__RESOURCE_ENV_REFS);
-		}
-		return resourceEnvRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getMessageDestinationRefs() {
-		if (messageDestinationRefs == null) {
-			messageDestinationRefs = new EObjectContainmentEList(MessageDestinationRef.class, this, EjbPackage.INTERCEPTOR_TYPE__MESSAGE_DESTINATION_REFS);
-		}
-		return messageDestinationRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPersistenceContextRefs() {
-		if (persistenceContextRefs == null) {
-			persistenceContextRefs = new EObjectContainmentEList(PersistenceContextRef.class, this, EjbPackage.INTERCEPTOR_TYPE__PERSISTENCE_CONTEXT_REFS);
-		}
-		return persistenceContextRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPersistenceUnitRefs() {
-		if (persistenceUnitRefs == null) {
-			persistenceUnitRefs = new EObjectContainmentEList(PersistenceUnitRef.class, this, EjbPackage.INTERCEPTOR_TYPE__PERSISTENCE_UNIT_REFS);
-		}
-		return persistenceUnitRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPostConstructs() {
-		if (postConstructs == null) {
-			postConstructs = new EObjectContainmentEList(LifecycleCallback.class, this, EjbPackage.INTERCEPTOR_TYPE__POST_CONSTRUCTS);
-		}
-		return postConstructs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPreDestroys() {
-		if (preDestroys == null) {
-			preDestroys = new EObjectContainmentEList(LifecycleCallback.class, this, EjbPackage.INTERCEPTOR_TYPE__PRE_DESTROYS);
-		}
-		return preDestroys;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPostActivates() {
-		if (postActivates == null) {
-			postActivates = new EObjectContainmentEList(LifecycleCallback.class, this, EjbPackage.INTERCEPTOR_TYPE__POST_ACTIVATES);
-		}
-		return postActivates;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPrePassivates() {
-		if (prePassivates == null) {
-			prePassivates = new EObjectContainmentEList(LifecycleCallback.class, this, EjbPackage.INTERCEPTOR_TYPE__PRE_PASSIVATES);
-		}
-		return prePassivates;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.INTERCEPTOR_TYPE__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.INTERCEPTOR_TYPE__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-			case EjbPackage.INTERCEPTOR_TYPE__AROUND_INVOKES:
-				return ((InternalEList)getAroundInvokes()).basicRemove(otherEnd, msgs);
-			case EjbPackage.INTERCEPTOR_TYPE__ENV_ENTRIES:
-				return ((InternalEList)getEnvEntries()).basicRemove(otherEnd, msgs);
-			case EjbPackage.INTERCEPTOR_TYPE__EJB_REFS:
-				return ((InternalEList)getEjbRefs()).basicRemove(otherEnd, msgs);
-			case EjbPackage.INTERCEPTOR_TYPE__EJB_LOCAL_REFS:
-				return ((InternalEList)getEjbLocalRefs()).basicRemove(otherEnd, msgs);
-			case EjbPackage.INTERCEPTOR_TYPE__SERVICE_REFS:
-				return ((InternalEList)getServiceRefs()).basicRemove(otherEnd, msgs);
-			case EjbPackage.INTERCEPTOR_TYPE__RESOURCE_REFS:
-				return ((InternalEList)getResourceRefs()).basicRemove(otherEnd, msgs);
-			case EjbPackage.INTERCEPTOR_TYPE__RESOURCE_ENV_REFS:
-				return ((InternalEList)getResourceEnvRefs()).basicRemove(otherEnd, msgs);
-			case EjbPackage.INTERCEPTOR_TYPE__MESSAGE_DESTINATION_REFS:
-				return ((InternalEList)getMessageDestinationRefs()).basicRemove(otherEnd, msgs);
-			case EjbPackage.INTERCEPTOR_TYPE__PERSISTENCE_CONTEXT_REFS:
-				return ((InternalEList)getPersistenceContextRefs()).basicRemove(otherEnd, msgs);
-			case EjbPackage.INTERCEPTOR_TYPE__PERSISTENCE_UNIT_REFS:
-				return ((InternalEList)getPersistenceUnitRefs()).basicRemove(otherEnd, msgs);
-			case EjbPackage.INTERCEPTOR_TYPE__POST_CONSTRUCTS:
-				return ((InternalEList)getPostConstructs()).basicRemove(otherEnd, msgs);
-			case EjbPackage.INTERCEPTOR_TYPE__PRE_DESTROYS:
-				return ((InternalEList)getPreDestroys()).basicRemove(otherEnd, msgs);
-			case EjbPackage.INTERCEPTOR_TYPE__POST_ACTIVATES:
-				return ((InternalEList)getPostActivates()).basicRemove(otherEnd, msgs);
-			case EjbPackage.INTERCEPTOR_TYPE__PRE_PASSIVATES:
-				return ((InternalEList)getPrePassivates()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.INTERCEPTOR_TYPE__DESCRIPTIONS:
-				return getDescriptions();
-			case EjbPackage.INTERCEPTOR_TYPE__INTERCEPTOR_CLASS:
-				return getInterceptorClass();
-			case EjbPackage.INTERCEPTOR_TYPE__AROUND_INVOKES:
-				return getAroundInvokes();
-			case EjbPackage.INTERCEPTOR_TYPE__ENV_ENTRIES:
-				return getEnvEntries();
-			case EjbPackage.INTERCEPTOR_TYPE__EJB_REFS:
-				return getEjbRefs();
-			case EjbPackage.INTERCEPTOR_TYPE__EJB_LOCAL_REFS:
-				return getEjbLocalRefs();
-			case EjbPackage.INTERCEPTOR_TYPE__SERVICE_REFS:
-				return getServiceRefs();
-			case EjbPackage.INTERCEPTOR_TYPE__RESOURCE_REFS:
-				return getResourceRefs();
-			case EjbPackage.INTERCEPTOR_TYPE__RESOURCE_ENV_REFS:
-				return getResourceEnvRefs();
-			case EjbPackage.INTERCEPTOR_TYPE__MESSAGE_DESTINATION_REFS:
-				return getMessageDestinationRefs();
-			case EjbPackage.INTERCEPTOR_TYPE__PERSISTENCE_CONTEXT_REFS:
-				return getPersistenceContextRefs();
-			case EjbPackage.INTERCEPTOR_TYPE__PERSISTENCE_UNIT_REFS:
-				return getPersistenceUnitRefs();
-			case EjbPackage.INTERCEPTOR_TYPE__POST_CONSTRUCTS:
-				return getPostConstructs();
-			case EjbPackage.INTERCEPTOR_TYPE__PRE_DESTROYS:
-				return getPreDestroys();
-			case EjbPackage.INTERCEPTOR_TYPE__POST_ACTIVATES:
-				return getPostActivates();
-			case EjbPackage.INTERCEPTOR_TYPE__PRE_PASSIVATES:
-				return getPrePassivates();
-			case EjbPackage.INTERCEPTOR_TYPE__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.INTERCEPTOR_TYPE__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case EjbPackage.INTERCEPTOR_TYPE__INTERCEPTOR_CLASS:
-				setInterceptorClass((String)newValue);
-				return;
-			case EjbPackage.INTERCEPTOR_TYPE__AROUND_INVOKES:
-				getAroundInvokes().clear();
-				getAroundInvokes().addAll((Collection)newValue);
-				return;
-			case EjbPackage.INTERCEPTOR_TYPE__ENV_ENTRIES:
-				getEnvEntries().clear();
-				getEnvEntries().addAll((Collection)newValue);
-				return;
-			case EjbPackage.INTERCEPTOR_TYPE__EJB_REFS:
-				getEjbRefs().clear();
-				getEjbRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.INTERCEPTOR_TYPE__EJB_LOCAL_REFS:
-				getEjbLocalRefs().clear();
-				getEjbLocalRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.INTERCEPTOR_TYPE__SERVICE_REFS:
-				getServiceRefs().clear();
-				getServiceRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.INTERCEPTOR_TYPE__RESOURCE_REFS:
-				getResourceRefs().clear();
-				getResourceRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.INTERCEPTOR_TYPE__RESOURCE_ENV_REFS:
-				getResourceEnvRefs().clear();
-				getResourceEnvRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.INTERCEPTOR_TYPE__MESSAGE_DESTINATION_REFS:
-				getMessageDestinationRefs().clear();
-				getMessageDestinationRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.INTERCEPTOR_TYPE__PERSISTENCE_CONTEXT_REFS:
-				getPersistenceContextRefs().clear();
-				getPersistenceContextRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.INTERCEPTOR_TYPE__PERSISTENCE_UNIT_REFS:
-				getPersistenceUnitRefs().clear();
-				getPersistenceUnitRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.INTERCEPTOR_TYPE__POST_CONSTRUCTS:
-				getPostConstructs().clear();
-				getPostConstructs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.INTERCEPTOR_TYPE__PRE_DESTROYS:
-				getPreDestroys().clear();
-				getPreDestroys().addAll((Collection)newValue);
-				return;
-			case EjbPackage.INTERCEPTOR_TYPE__POST_ACTIVATES:
-				getPostActivates().clear();
-				getPostActivates().addAll((Collection)newValue);
-				return;
-			case EjbPackage.INTERCEPTOR_TYPE__PRE_PASSIVATES:
-				getPrePassivates().clear();
-				getPrePassivates().addAll((Collection)newValue);
-				return;
-			case EjbPackage.INTERCEPTOR_TYPE__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.INTERCEPTOR_TYPE__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case EjbPackage.INTERCEPTOR_TYPE__INTERCEPTOR_CLASS:
-				setInterceptorClass(INTERCEPTOR_CLASS_EDEFAULT);
-				return;
-			case EjbPackage.INTERCEPTOR_TYPE__AROUND_INVOKES:
-				getAroundInvokes().clear();
-				return;
-			case EjbPackage.INTERCEPTOR_TYPE__ENV_ENTRIES:
-				getEnvEntries().clear();
-				return;
-			case EjbPackage.INTERCEPTOR_TYPE__EJB_REFS:
-				getEjbRefs().clear();
-				return;
-			case EjbPackage.INTERCEPTOR_TYPE__EJB_LOCAL_REFS:
-				getEjbLocalRefs().clear();
-				return;
-			case EjbPackage.INTERCEPTOR_TYPE__SERVICE_REFS:
-				getServiceRefs().clear();
-				return;
-			case EjbPackage.INTERCEPTOR_TYPE__RESOURCE_REFS:
-				getResourceRefs().clear();
-				return;
-			case EjbPackage.INTERCEPTOR_TYPE__RESOURCE_ENV_REFS:
-				getResourceEnvRefs().clear();
-				return;
-			case EjbPackage.INTERCEPTOR_TYPE__MESSAGE_DESTINATION_REFS:
-				getMessageDestinationRefs().clear();
-				return;
-			case EjbPackage.INTERCEPTOR_TYPE__PERSISTENCE_CONTEXT_REFS:
-				getPersistenceContextRefs().clear();
-				return;
-			case EjbPackage.INTERCEPTOR_TYPE__PERSISTENCE_UNIT_REFS:
-				getPersistenceUnitRefs().clear();
-				return;
-			case EjbPackage.INTERCEPTOR_TYPE__POST_CONSTRUCTS:
-				getPostConstructs().clear();
-				return;
-			case EjbPackage.INTERCEPTOR_TYPE__PRE_DESTROYS:
-				getPreDestroys().clear();
-				return;
-			case EjbPackage.INTERCEPTOR_TYPE__POST_ACTIVATES:
-				getPostActivates().clear();
-				return;
-			case EjbPackage.INTERCEPTOR_TYPE__PRE_PASSIVATES:
-				getPrePassivates().clear();
-				return;
-			case EjbPackage.INTERCEPTOR_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.INTERCEPTOR_TYPE__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case EjbPackage.INTERCEPTOR_TYPE__INTERCEPTOR_CLASS:
-				return INTERCEPTOR_CLASS_EDEFAULT == null ? interceptorClass != null : !INTERCEPTOR_CLASS_EDEFAULT.equals(interceptorClass);
-			case EjbPackage.INTERCEPTOR_TYPE__AROUND_INVOKES:
-				return aroundInvokes != null && !aroundInvokes.isEmpty();
-			case EjbPackage.INTERCEPTOR_TYPE__ENV_ENTRIES:
-				return envEntries != null && !envEntries.isEmpty();
-			case EjbPackage.INTERCEPTOR_TYPE__EJB_REFS:
-				return ejbRefs != null && !ejbRefs.isEmpty();
-			case EjbPackage.INTERCEPTOR_TYPE__EJB_LOCAL_REFS:
-				return ejbLocalRefs != null && !ejbLocalRefs.isEmpty();
-			case EjbPackage.INTERCEPTOR_TYPE__SERVICE_REFS:
-				return serviceRefs != null && !serviceRefs.isEmpty();
-			case EjbPackage.INTERCEPTOR_TYPE__RESOURCE_REFS:
-				return resourceRefs != null && !resourceRefs.isEmpty();
-			case EjbPackage.INTERCEPTOR_TYPE__RESOURCE_ENV_REFS:
-				return resourceEnvRefs != null && !resourceEnvRefs.isEmpty();
-			case EjbPackage.INTERCEPTOR_TYPE__MESSAGE_DESTINATION_REFS:
-				return messageDestinationRefs != null && !messageDestinationRefs.isEmpty();
-			case EjbPackage.INTERCEPTOR_TYPE__PERSISTENCE_CONTEXT_REFS:
-				return persistenceContextRefs != null && !persistenceContextRefs.isEmpty();
-			case EjbPackage.INTERCEPTOR_TYPE__PERSISTENCE_UNIT_REFS:
-				return persistenceUnitRefs != null && !persistenceUnitRefs.isEmpty();
-			case EjbPackage.INTERCEPTOR_TYPE__POST_CONSTRUCTS:
-				return postConstructs != null && !postConstructs.isEmpty();
-			case EjbPackage.INTERCEPTOR_TYPE__PRE_DESTROYS:
-				return preDestroys != null && !preDestroys.isEmpty();
-			case EjbPackage.INTERCEPTOR_TYPE__POST_ACTIVATES:
-				return postActivates != null && !postActivates.isEmpty();
-			case EjbPackage.INTERCEPTOR_TYPE__PRE_PASSIVATES:
-				return prePassivates != null && !prePassivates.isEmpty();
-			case EjbPackage.INTERCEPTOR_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (interceptorClass: "); //$NON-NLS-1$
-		result.append(interceptorClass);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //InterceptorTypeImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/InterceptorsTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/InterceptorsTypeImpl.java
deleted file mode 100644
index 83f5196e8..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/InterceptorsTypeImpl.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb.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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jst.javaee.core.Description;
-
-import org.eclipse.jst.javaee.ejb.InterceptorType;
-import org.eclipse.jst.javaee.ejb.InterceptorsType;
-
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Interceptors Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorsTypeImpl#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorsTypeImpl#getInterceptors <em>Interceptors</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorsTypeImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class InterceptorsTypeImpl extends EObjectImpl implements InterceptorsType {
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The cached value of the '{@link #getInterceptors() <em>Interceptors</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInterceptors()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList interceptors = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected InterceptorsTypeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.INTERCEPTORS_TYPE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.INTERCEPTORS_TYPE__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getInterceptors() {
-		if (interceptors == null) {
-			interceptors = new EObjectContainmentEList(InterceptorType.class, this, EjbPackage.INTERCEPTORS_TYPE__INTERCEPTORS);
-		}
-		return interceptors;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.INTERCEPTORS_TYPE__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.INTERCEPTORS_TYPE__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-			case EjbPackage.INTERCEPTORS_TYPE__INTERCEPTORS:
-				return ((InternalEList)getInterceptors()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.INTERCEPTORS_TYPE__DESCRIPTIONS:
-				return getDescriptions();
-			case EjbPackage.INTERCEPTORS_TYPE__INTERCEPTORS:
-				return getInterceptors();
-			case EjbPackage.INTERCEPTORS_TYPE__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.INTERCEPTORS_TYPE__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case EjbPackage.INTERCEPTORS_TYPE__INTERCEPTORS:
-				getInterceptors().clear();
-				getInterceptors().addAll((Collection)newValue);
-				return;
-			case EjbPackage.INTERCEPTORS_TYPE__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.INTERCEPTORS_TYPE__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case EjbPackage.INTERCEPTORS_TYPE__INTERCEPTORS:
-				getInterceptors().clear();
-				return;
-			case EjbPackage.INTERCEPTORS_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.INTERCEPTORS_TYPE__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case EjbPackage.INTERCEPTORS_TYPE__INTERCEPTORS:
-				return interceptors != null && !interceptors.isEmpty();
-			case EjbPackage.INTERCEPTORS_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	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();
-	}
-
-} //InterceptorsTypeImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/MessageDrivenBeanImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/MessageDrivenBeanImpl.java
deleted file mode 100644
index b19d6530d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/MessageDrivenBeanImpl.java
+++ /dev/null
@@ -1,1356 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb.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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-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.EnvEntry;
-import org.eclipse.jst.javaee.core.Icon;
-import org.eclipse.jst.javaee.core.LifecycleCallback;
-import org.eclipse.jst.javaee.core.MessageDestinationRef;
-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.ServiceRef;
-
-import org.eclipse.jst.javaee.ejb.ActivationConfig;
-import org.eclipse.jst.javaee.ejb.AroundInvokeType;
-import org.eclipse.jst.javaee.ejb.MessageDrivenBean;
-import org.eclipse.jst.javaee.ejb.NamedMethodType;
-import org.eclipse.jst.javaee.ejb.SecurityIdentityType;
-import org.eclipse.jst.javaee.ejb.TransactionType;
-
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Message Driven Bean</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getDisplayNames <em>Display Names</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getIcons <em>Icons</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getEjbName <em>Ejb Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getMappedName <em>Mapped Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getEjbClass <em>Ejb Class</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getMessagingType <em>Messaging Type</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getTimeoutMethod <em>Timeout Method</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getTransactionType <em>Transaction Type</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getMessageDestinationType <em>Message Destination Type</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getMessageDestinationLink <em>Message Destination Link</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getActivationConfig <em>Activation Config</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getAroundInvokes <em>Around Invokes</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getEnvEntries <em>Env Entries</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getEjbRefs <em>Ejb Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getEjbLocalRefs <em>Ejb Local Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getServiceRefs <em>Service Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getResourceRefs <em>Resource Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getResourceEnvRefs <em>Resource Env Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getMessageDestinationRefs <em>Message Destination Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getPersistenceContextRefs <em>Persistence Context Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getPersistenceUnitRefs <em>Persistence Unit Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getPostConstructs <em>Post Constructs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getPreDestroys <em>Pre Destroys</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getSecurityIdentity <em>Security Identity</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MessageDrivenBeanImpl extends EObjectImpl implements MessageDrivenBean {
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayNames() <em>Display Names</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayNames()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList displayNames = null;
-
-	/**
-	 * The cached value of the '{@link #getIcons() <em>Icons</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIcons()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList icons = null;
-
-	/**
-	 * The default value of the '{@link #getEjbName() <em>Ejb Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EJB_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getEjbName() <em>Ejb Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String ejbName = EJB_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getMappedName() <em>Mapped Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMappedName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MAPPED_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMappedName() <em>Mapped Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMappedName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String mappedName = MAPPED_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getEjbClass() <em>Ejb Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EJB_CLASS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getEjbClass() <em>Ejb Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected String ejbClass = EJB_CLASS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getMessagingType() <em>Messaging Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessagingType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MESSAGING_TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMessagingType() <em>Messaging Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessagingType()
-	 * @generated
-	 * @ordered
-	 */
-	protected String messagingType = MESSAGING_TYPE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getTimeoutMethod() <em>Timeout Method</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTimeoutMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected NamedMethodType timeoutMethod = null;
-
-	/**
-	 * The default value of the '{@link #getTransactionType() <em>Transaction Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTransactionType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final TransactionType TRANSACTION_TYPE_EDEFAULT = TransactionType.BEAN_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getTransactionType() <em>Transaction Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTransactionType()
-	 * @generated
-	 * @ordered
-	 */
-	protected TransactionType transactionType = TRANSACTION_TYPE_EDEFAULT;
-
-	/**
-	 * This is true if the Transaction Type attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean transactionTypeESet = false;
-
-	/**
-	 * The default value of the '{@link #getMessageDestinationType() <em>Message Destination Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessageDestinationType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MESSAGE_DESTINATION_TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMessageDestinationType() <em>Message Destination Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessageDestinationType()
-	 * @generated
-	 * @ordered
-	 */
-	protected String messageDestinationType = MESSAGE_DESTINATION_TYPE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getMessageDestinationLink() <em>Message Destination Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessageDestinationLink()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MESSAGE_DESTINATION_LINK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMessageDestinationLink() <em>Message Destination Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessageDestinationLink()
-	 * @generated
-	 * @ordered
-	 */
-	protected String messageDestinationLink = MESSAGE_DESTINATION_LINK_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getActivationConfig() <em>Activation Config</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActivationConfig()
-	 * @generated
-	 * @ordered
-	 */
-	protected ActivationConfig activationConfig = null;
-
-	/**
-	 * The cached value of the '{@link #getAroundInvokes() <em>Around Invokes</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAroundInvokes()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList aroundInvokes = null;
-
-	/**
-	 * The cached value of the '{@link #getEnvEntries() <em>Env Entries</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEnvEntries()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList envEntries = null;
-
-	/**
-	 * The cached value of the '{@link #getEjbRefs() <em>Ejb Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList ejbRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getEjbLocalRefs() <em>Ejb Local Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbLocalRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList ejbLocalRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getServiceRefs() <em>Service Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getServiceRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList serviceRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getResourceRefs() <em>Resource Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResourceRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList resourceRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getResourceEnvRefs() <em>Resource Env Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResourceEnvRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList resourceEnvRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getMessageDestinationRefs() <em>Message Destination Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessageDestinationRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList messageDestinationRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getPersistenceContextRefs() <em>Persistence Context Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPersistenceContextRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList persistenceContextRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getPersistenceUnitRefs() <em>Persistence Unit Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPersistenceUnitRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList persistenceUnitRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getPostConstructs() <em>Post Constructs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPostConstructs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList postConstructs = null;
-
-	/**
-	 * The cached value of the '{@link #getPreDestroys() <em>Pre Destroys</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPreDestroys()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList preDestroys = null;
-
-	/**
-	 * The cached value of the '{@link #getSecurityIdentity() <em>Security Identity</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSecurityIdentity()
-	 * @generated
-	 * @ordered
-	 */
-	protected SecurityIdentityType securityIdentity = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MessageDrivenBeanImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.MESSAGE_DRIVEN_BEAN;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDisplayNames() {
-		if (displayNames == null) {
-			displayNames = new EObjectContainmentEList(DisplayName.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__DISPLAY_NAMES);
-		}
-		return displayNames;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getIcons() {
-		if (icons == null) {
-			icons = new EObjectContainmentEList(Icon.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__ICONS);
-		}
-		return icons;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getEjbName() {
-		return ejbName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEjbName(String newEjbName) {
-		String oldEjbName = ejbName;
-		ejbName = newEjbName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.MESSAGE_DRIVEN_BEAN__EJB_NAME, oldEjbName, ejbName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getMappedName() {
-		return mappedName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMappedName(String newMappedName) {
-		String oldMappedName = mappedName;
-		mappedName = newMappedName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.MESSAGE_DRIVEN_BEAN__MAPPED_NAME, oldMappedName, mappedName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getEjbClass() {
-		return ejbClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEjbClass(String newEjbClass) {
-		String oldEjbClass = ejbClass;
-		ejbClass = newEjbClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.MESSAGE_DRIVEN_BEAN__EJB_CLASS, oldEjbClass, ejbClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getMessagingType() {
-		return messagingType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMessagingType(String newMessagingType) {
-		String oldMessagingType = messagingType;
-		messagingType = newMessagingType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.MESSAGE_DRIVEN_BEAN__MESSAGING_TYPE, oldMessagingType, messagingType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NamedMethodType getTimeoutMethod() {
-		return timeoutMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetTimeoutMethod(NamedMethodType newTimeoutMethod, NotificationChain msgs) {
-		NamedMethodType oldTimeoutMethod = timeoutMethod;
-		timeoutMethod = newTimeoutMethod;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.MESSAGE_DRIVEN_BEAN__TIMEOUT_METHOD, oldTimeoutMethod, newTimeoutMethod);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTimeoutMethod(NamedMethodType newTimeoutMethod) {
-		if (newTimeoutMethod != timeoutMethod) {
-			NotificationChain msgs = null;
-			if (timeoutMethod != null)
-				msgs = ((InternalEObject)timeoutMethod).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.MESSAGE_DRIVEN_BEAN__TIMEOUT_METHOD, null, msgs);
-			if (newTimeoutMethod != null)
-				msgs = ((InternalEObject)newTimeoutMethod).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EjbPackage.MESSAGE_DRIVEN_BEAN__TIMEOUT_METHOD, null, msgs);
-			msgs = basicSetTimeoutMethod(newTimeoutMethod, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.MESSAGE_DRIVEN_BEAN__TIMEOUT_METHOD, newTimeoutMethod, newTimeoutMethod));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TransactionType getTransactionType() {
-		return transactionType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTransactionType(TransactionType newTransactionType) {
-		TransactionType oldTransactionType = transactionType;
-		transactionType = newTransactionType == null ? TRANSACTION_TYPE_EDEFAULT : newTransactionType;
-		boolean oldTransactionTypeESet = transactionTypeESet;
-		transactionTypeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.MESSAGE_DRIVEN_BEAN__TRANSACTION_TYPE, oldTransactionType, transactionType, !oldTransactionTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetTransactionType() {
-		TransactionType oldTransactionType = transactionType;
-		boolean oldTransactionTypeESet = transactionTypeESet;
-		transactionType = TRANSACTION_TYPE_EDEFAULT;
-		transactionTypeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.MESSAGE_DRIVEN_BEAN__TRANSACTION_TYPE, oldTransactionType, TRANSACTION_TYPE_EDEFAULT, oldTransactionTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetTransactionType() {
-		return transactionTypeESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getMessageDestinationType() {
-		return messageDestinationType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMessageDestinationType(String newMessageDestinationType) {
-		String oldMessageDestinationType = messageDestinationType;
-		messageDestinationType = newMessageDestinationType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.MESSAGE_DRIVEN_BEAN__MESSAGE_DESTINATION_TYPE, oldMessageDestinationType, messageDestinationType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getMessageDestinationLink() {
-		return messageDestinationLink;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMessageDestinationLink(String newMessageDestinationLink) {
-		String oldMessageDestinationLink = messageDestinationLink;
-		messageDestinationLink = newMessageDestinationLink;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.MESSAGE_DRIVEN_BEAN__MESSAGE_DESTINATION_LINK, oldMessageDestinationLink, messageDestinationLink));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ActivationConfig getActivationConfig() {
-		return activationConfig;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetActivationConfig(ActivationConfig newActivationConfig, NotificationChain msgs) {
-		ActivationConfig oldActivationConfig = activationConfig;
-		activationConfig = newActivationConfig;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.MESSAGE_DRIVEN_BEAN__ACTIVATION_CONFIG, oldActivationConfig, newActivationConfig);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setActivationConfig(ActivationConfig newActivationConfig) {
-		if (newActivationConfig != activationConfig) {
-			NotificationChain msgs = null;
-			if (activationConfig != null)
-				msgs = ((InternalEObject)activationConfig).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.MESSAGE_DRIVEN_BEAN__ACTIVATION_CONFIG, null, msgs);
-			if (newActivationConfig != null)
-				msgs = ((InternalEObject)newActivationConfig).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EjbPackage.MESSAGE_DRIVEN_BEAN__ACTIVATION_CONFIG, null, msgs);
-			msgs = basicSetActivationConfig(newActivationConfig, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.MESSAGE_DRIVEN_BEAN__ACTIVATION_CONFIG, newActivationConfig, newActivationConfig));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getAroundInvokes() {
-		if (aroundInvokes == null) {
-			aroundInvokes = new EObjectContainmentEList(AroundInvokeType.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__AROUND_INVOKES);
-		}
-		return aroundInvokes;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getEnvEntries() {
-		if (envEntries == null) {
-			envEntries = new EObjectContainmentEList(EnvEntry.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__ENV_ENTRIES);
-		}
-		return envEntries;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getEjbRefs() {
-		if (ejbRefs == null) {
-			ejbRefs = new EObjectContainmentEList(EjbRef.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__EJB_REFS);
-		}
-		return ejbRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getEjbLocalRefs() {
-		if (ejbLocalRefs == null) {
-			ejbLocalRefs = new EObjectContainmentEList(EjbLocalRef.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__EJB_LOCAL_REFS);
-		}
-		return ejbLocalRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getServiceRefs() {
-		if (serviceRefs == null) {
-			serviceRefs = new EObjectContainmentEList(ServiceRef.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__SERVICE_REFS);
-		}
-		return serviceRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getResourceRefs() {
-		if (resourceRefs == null) {
-			resourceRefs = new EObjectContainmentEList(ResourceRef.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__RESOURCE_REFS);
-		}
-		return resourceRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getResourceEnvRefs() {
-		if (resourceEnvRefs == null) {
-			resourceEnvRefs = new EObjectContainmentEList(ResourceEnvRef.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__RESOURCE_ENV_REFS);
-		}
-		return resourceEnvRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getMessageDestinationRefs() {
-		if (messageDestinationRefs == null) {
-			messageDestinationRefs = new EObjectContainmentEList(MessageDestinationRef.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__MESSAGE_DESTINATION_REFS);
-		}
-		return messageDestinationRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPersistenceContextRefs() {
-		if (persistenceContextRefs == null) {
-			persistenceContextRefs = new EObjectContainmentEList(PersistenceContextRef.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__PERSISTENCE_CONTEXT_REFS);
-		}
-		return persistenceContextRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPersistenceUnitRefs() {
-		if (persistenceUnitRefs == null) {
-			persistenceUnitRefs = new EObjectContainmentEList(PersistenceUnitRef.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__PERSISTENCE_UNIT_REFS);
-		}
-		return persistenceUnitRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPostConstructs() {
-		if (postConstructs == null) {
-			postConstructs = new EObjectContainmentEList(LifecycleCallback.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__POST_CONSTRUCTS);
-		}
-		return postConstructs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPreDestroys() {
-		if (preDestroys == null) {
-			preDestroys = new EObjectContainmentEList(LifecycleCallback.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__PRE_DESTROYS);
-		}
-		return preDestroys;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SecurityIdentityType getSecurityIdentity() {
-		return securityIdentity;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetSecurityIdentity(SecurityIdentityType newSecurityIdentity, NotificationChain msgs) {
-		SecurityIdentityType oldSecurityIdentity = securityIdentity;
-		securityIdentity = newSecurityIdentity;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.MESSAGE_DRIVEN_BEAN__SECURITY_IDENTITY, oldSecurityIdentity, newSecurityIdentity);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSecurityIdentity(SecurityIdentityType newSecurityIdentity) {
-		if (newSecurityIdentity != securityIdentity) {
-			NotificationChain msgs = null;
-			if (securityIdentity != null)
-				msgs = ((InternalEObject)securityIdentity).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.MESSAGE_DRIVEN_BEAN__SECURITY_IDENTITY, null, msgs);
-			if (newSecurityIdentity != null)
-				msgs = ((InternalEObject)newSecurityIdentity).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EjbPackage.MESSAGE_DRIVEN_BEAN__SECURITY_IDENTITY, null, msgs);
-			msgs = basicSetSecurityIdentity(newSecurityIdentity, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.MESSAGE_DRIVEN_BEAN__SECURITY_IDENTITY, newSecurityIdentity, newSecurityIdentity));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.MESSAGE_DRIVEN_BEAN__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__DISPLAY_NAMES:
-				return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__ICONS:
-				return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__TIMEOUT_METHOD:
-				return basicSetTimeoutMethod(null, msgs);
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__ACTIVATION_CONFIG:
-				return basicSetActivationConfig(null, msgs);
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__AROUND_INVOKES:
-				return ((InternalEList)getAroundInvokes()).basicRemove(otherEnd, msgs);
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__ENV_ENTRIES:
-				return ((InternalEList)getEnvEntries()).basicRemove(otherEnd, msgs);
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__EJB_REFS:
-				return ((InternalEList)getEjbRefs()).basicRemove(otherEnd, msgs);
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__EJB_LOCAL_REFS:
-				return ((InternalEList)getEjbLocalRefs()).basicRemove(otherEnd, msgs);
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__SERVICE_REFS:
-				return ((InternalEList)getServiceRefs()).basicRemove(otherEnd, msgs);
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__RESOURCE_REFS:
-				return ((InternalEList)getResourceRefs()).basicRemove(otherEnd, msgs);
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__RESOURCE_ENV_REFS:
-				return ((InternalEList)getResourceEnvRefs()).basicRemove(otherEnd, msgs);
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__MESSAGE_DESTINATION_REFS:
-				return ((InternalEList)getMessageDestinationRefs()).basicRemove(otherEnd, msgs);
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__PERSISTENCE_CONTEXT_REFS:
-				return ((InternalEList)getPersistenceContextRefs()).basicRemove(otherEnd, msgs);
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__PERSISTENCE_UNIT_REFS:
-				return ((InternalEList)getPersistenceUnitRefs()).basicRemove(otherEnd, msgs);
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__POST_CONSTRUCTS:
-				return ((InternalEList)getPostConstructs()).basicRemove(otherEnd, msgs);
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__PRE_DESTROYS:
-				return ((InternalEList)getPreDestroys()).basicRemove(otherEnd, msgs);
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__SECURITY_IDENTITY:
-				return basicSetSecurityIdentity(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__DESCRIPTIONS:
-				return getDescriptions();
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__DISPLAY_NAMES:
-				return getDisplayNames();
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__ICONS:
-				return getIcons();
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__EJB_NAME:
-				return getEjbName();
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__MAPPED_NAME:
-				return getMappedName();
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__EJB_CLASS:
-				return getEjbClass();
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__MESSAGING_TYPE:
-				return getMessagingType();
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__TIMEOUT_METHOD:
-				return getTimeoutMethod();
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__TRANSACTION_TYPE:
-				return getTransactionType();
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__MESSAGE_DESTINATION_TYPE:
-				return getMessageDestinationType();
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__MESSAGE_DESTINATION_LINK:
-				return getMessageDestinationLink();
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__ACTIVATION_CONFIG:
-				return getActivationConfig();
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__AROUND_INVOKES:
-				return getAroundInvokes();
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__ENV_ENTRIES:
-				return getEnvEntries();
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__EJB_REFS:
-				return getEjbRefs();
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__EJB_LOCAL_REFS:
-				return getEjbLocalRefs();
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__SERVICE_REFS:
-				return getServiceRefs();
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__RESOURCE_REFS:
-				return getResourceRefs();
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__RESOURCE_ENV_REFS:
-				return getResourceEnvRefs();
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__MESSAGE_DESTINATION_REFS:
-				return getMessageDestinationRefs();
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__PERSISTENCE_CONTEXT_REFS:
-				return getPersistenceContextRefs();
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__PERSISTENCE_UNIT_REFS:
-				return getPersistenceUnitRefs();
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__POST_CONSTRUCTS:
-				return getPostConstructs();
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__PRE_DESTROYS:
-				return getPreDestroys();
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__SECURITY_IDENTITY:
-				return getSecurityIdentity();
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				getDisplayNames().addAll((Collection)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__ICONS:
-				getIcons().clear();
-				getIcons().addAll((Collection)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__EJB_NAME:
-				setEjbName((String)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__MAPPED_NAME:
-				setMappedName((String)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__EJB_CLASS:
-				setEjbClass((String)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__MESSAGING_TYPE:
-				setMessagingType((String)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__TIMEOUT_METHOD:
-				setTimeoutMethod((NamedMethodType)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__TRANSACTION_TYPE:
-				setTransactionType((TransactionType)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__MESSAGE_DESTINATION_TYPE:
-				setMessageDestinationType((String)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__MESSAGE_DESTINATION_LINK:
-				setMessageDestinationLink((String)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__ACTIVATION_CONFIG:
-				setActivationConfig((ActivationConfig)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__AROUND_INVOKES:
-				getAroundInvokes().clear();
-				getAroundInvokes().addAll((Collection)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__ENV_ENTRIES:
-				getEnvEntries().clear();
-				getEnvEntries().addAll((Collection)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__EJB_REFS:
-				getEjbRefs().clear();
-				getEjbRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__EJB_LOCAL_REFS:
-				getEjbLocalRefs().clear();
-				getEjbLocalRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__SERVICE_REFS:
-				getServiceRefs().clear();
-				getServiceRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__RESOURCE_REFS:
-				getResourceRefs().clear();
-				getResourceRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__RESOURCE_ENV_REFS:
-				getResourceEnvRefs().clear();
-				getResourceEnvRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__MESSAGE_DESTINATION_REFS:
-				getMessageDestinationRefs().clear();
-				getMessageDestinationRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__PERSISTENCE_CONTEXT_REFS:
-				getPersistenceContextRefs().clear();
-				getPersistenceContextRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__PERSISTENCE_UNIT_REFS:
-				getPersistenceUnitRefs().clear();
-				getPersistenceUnitRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__POST_CONSTRUCTS:
-				getPostConstructs().clear();
-				getPostConstructs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__PRE_DESTROYS:
-				getPreDestroys().clear();
-				getPreDestroys().addAll((Collection)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__SECURITY_IDENTITY:
-				setSecurityIdentity((SecurityIdentityType)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__ICONS:
-				getIcons().clear();
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__EJB_NAME:
-				setEjbName(EJB_NAME_EDEFAULT);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__MAPPED_NAME:
-				setMappedName(MAPPED_NAME_EDEFAULT);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__EJB_CLASS:
-				setEjbClass(EJB_CLASS_EDEFAULT);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__MESSAGING_TYPE:
-				setMessagingType(MESSAGING_TYPE_EDEFAULT);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__TIMEOUT_METHOD:
-				setTimeoutMethod((NamedMethodType)null);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__TRANSACTION_TYPE:
-				unsetTransactionType();
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__MESSAGE_DESTINATION_TYPE:
-				setMessageDestinationType(MESSAGE_DESTINATION_TYPE_EDEFAULT);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__MESSAGE_DESTINATION_LINK:
-				setMessageDestinationLink(MESSAGE_DESTINATION_LINK_EDEFAULT);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__ACTIVATION_CONFIG:
-				setActivationConfig((ActivationConfig)null);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__AROUND_INVOKES:
-				getAroundInvokes().clear();
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__ENV_ENTRIES:
-				getEnvEntries().clear();
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__EJB_REFS:
-				getEjbRefs().clear();
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__EJB_LOCAL_REFS:
-				getEjbLocalRefs().clear();
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__SERVICE_REFS:
-				getServiceRefs().clear();
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__RESOURCE_REFS:
-				getResourceRefs().clear();
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__RESOURCE_ENV_REFS:
-				getResourceEnvRefs().clear();
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__MESSAGE_DESTINATION_REFS:
-				getMessageDestinationRefs().clear();
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__PERSISTENCE_CONTEXT_REFS:
-				getPersistenceContextRefs().clear();
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__PERSISTENCE_UNIT_REFS:
-				getPersistenceUnitRefs().clear();
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__POST_CONSTRUCTS:
-				getPostConstructs().clear();
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__PRE_DESTROYS:
-				getPreDestroys().clear();
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__SECURITY_IDENTITY:
-				setSecurityIdentity((SecurityIdentityType)null);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__DISPLAY_NAMES:
-				return displayNames != null && !displayNames.isEmpty();
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__ICONS:
-				return icons != null && !icons.isEmpty();
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__EJB_NAME:
-				return EJB_NAME_EDEFAULT == null ? ejbName != null : !EJB_NAME_EDEFAULT.equals(ejbName);
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__MAPPED_NAME:
-				return MAPPED_NAME_EDEFAULT == null ? mappedName != null : !MAPPED_NAME_EDEFAULT.equals(mappedName);
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__EJB_CLASS:
-				return EJB_CLASS_EDEFAULT == null ? ejbClass != null : !EJB_CLASS_EDEFAULT.equals(ejbClass);
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__MESSAGING_TYPE:
-				return MESSAGING_TYPE_EDEFAULT == null ? messagingType != null : !MESSAGING_TYPE_EDEFAULT.equals(messagingType);
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__TIMEOUT_METHOD:
-				return timeoutMethod != null;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__TRANSACTION_TYPE:
-				return isSetTransactionType();
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__MESSAGE_DESTINATION_TYPE:
-				return MESSAGE_DESTINATION_TYPE_EDEFAULT == null ? messageDestinationType != null : !MESSAGE_DESTINATION_TYPE_EDEFAULT.equals(messageDestinationType);
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__MESSAGE_DESTINATION_LINK:
-				return MESSAGE_DESTINATION_LINK_EDEFAULT == null ? messageDestinationLink != null : !MESSAGE_DESTINATION_LINK_EDEFAULT.equals(messageDestinationLink);
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__ACTIVATION_CONFIG:
-				return activationConfig != null;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__AROUND_INVOKES:
-				return aroundInvokes != null && !aroundInvokes.isEmpty();
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__ENV_ENTRIES:
-				return envEntries != null && !envEntries.isEmpty();
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__EJB_REFS:
-				return ejbRefs != null && !ejbRefs.isEmpty();
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__EJB_LOCAL_REFS:
-				return ejbLocalRefs != null && !ejbLocalRefs.isEmpty();
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__SERVICE_REFS:
-				return serviceRefs != null && !serviceRefs.isEmpty();
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__RESOURCE_REFS:
-				return resourceRefs != null && !resourceRefs.isEmpty();
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__RESOURCE_ENV_REFS:
-				return resourceEnvRefs != null && !resourceEnvRefs.isEmpty();
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__MESSAGE_DESTINATION_REFS:
-				return messageDestinationRefs != null && !messageDestinationRefs.isEmpty();
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__PERSISTENCE_CONTEXT_REFS:
-				return persistenceContextRefs != null && !persistenceContextRefs.isEmpty();
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__PERSISTENCE_UNIT_REFS:
-				return persistenceUnitRefs != null && !persistenceUnitRefs.isEmpty();
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__POST_CONSTRUCTS:
-				return postConstructs != null && !postConstructs.isEmpty();
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__PRE_DESTROYS:
-				return preDestroys != null && !preDestroys.isEmpty();
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__SECURITY_IDENTITY:
-				return securityIdentity != null;
-			case EjbPackage.MESSAGE_DRIVEN_BEAN__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (ejbName: "); //$NON-NLS-1$
-		result.append(ejbName);
-		result.append(", mappedName: "); //$NON-NLS-1$
-		result.append(mappedName);
-		result.append(", ejbClass: "); //$NON-NLS-1$
-		result.append(ejbClass);
-		result.append(", messagingType: "); //$NON-NLS-1$
-		result.append(messagingType);
-		result.append(", transactionType: "); //$NON-NLS-1$
-		if (transactionTypeESet) result.append(transactionType); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(", messageDestinationType: "); //$NON-NLS-1$
-		result.append(messageDestinationType);
-		result.append(", messageDestinationLink: "); //$NON-NLS-1$
-		result.append(messageDestinationLink);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //MessageDrivenBeanImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/MethodParamsImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/MethodParamsImpl.java
deleted file mode 100644
index 7459feabb..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/MethodParamsImpl.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb.internal.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-
-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.ejb.MethodParams;
-
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Method Params</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MethodParamsImpl#getMethodParams <em>Method Params</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MethodParamsImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MethodParamsImpl extends EObjectImpl implements MethodParams {
-	/**
-	 * The cached value of the '{@link #getMethodParams() <em>Method Params</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMethodParams()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList methodParams = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MethodParamsImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.METHOD_PARAMS;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getMethodParams() {
-		if (methodParams == null) {
-			methodParams = new EDataTypeEList(String.class, this, EjbPackage.METHOD_PARAMS__METHOD_PARAMS);
-		}
-		return methodParams;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.METHOD_PARAMS__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.METHOD_PARAMS__METHOD_PARAMS:
-				return getMethodParams();
-			case EjbPackage.METHOD_PARAMS__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.METHOD_PARAMS__METHOD_PARAMS:
-				getMethodParams().clear();
-				getMethodParams().addAll((Collection)newValue);
-				return;
-			case EjbPackage.METHOD_PARAMS__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.METHOD_PARAMS__METHOD_PARAMS:
-				getMethodParams().clear();
-				return;
-			case EjbPackage.METHOD_PARAMS__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.METHOD_PARAMS__METHOD_PARAMS:
-				return methodParams != null && !methodParams.isEmpty();
-			case EjbPackage.METHOD_PARAMS__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (methodParams: "); //$NON-NLS-1$
-		result.append(methodParams);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //MethodParamsImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/MethodPermissionImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/MethodPermissionImpl.java
deleted file mode 100644
index 0ca67af40..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/MethodPermissionImpl.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb.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.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jst.javaee.core.Description;
-import org.eclipse.jst.javaee.core.EmptyType;
-
-import org.eclipse.jst.javaee.ejb.MethodPermission;
-import org.eclipse.jst.javaee.ejb.MethodType;
-
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Method Permission</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MethodPermissionImpl#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MethodPermissionImpl#getRoleNames <em>Role Names</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MethodPermissionImpl#getUnchecked <em>Unchecked</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MethodPermissionImpl#getMethods <em>Methods</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MethodPermissionImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MethodPermissionImpl extends EObjectImpl implements MethodPermission {
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The cached value of the '{@link #getRoleNames() <em>Role Names</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRoleNames()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList roleNames = null;
-
-	/**
-	 * The cached value of the '{@link #getUnchecked() <em>Unchecked</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUnchecked()
-	 * @generated
-	 * @ordered
-	 */
-	protected EmptyType unchecked = null;
-
-	/**
-	 * The cached value of the '{@link #getMethods() <em>Methods</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMethods()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList methods = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MethodPermissionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.METHOD_PERMISSION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.METHOD_PERMISSION__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getRoleNames() {
-		if (roleNames == null) {
-			roleNames = new EDataTypeEList(String.class, this, EjbPackage.METHOD_PERMISSION__ROLE_NAMES);
-		}
-		return roleNames;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EmptyType getUnchecked() {
-		return unchecked;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetUnchecked(EmptyType newUnchecked, NotificationChain msgs) {
-		EmptyType oldUnchecked = unchecked;
-		unchecked = newUnchecked;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.METHOD_PERMISSION__UNCHECKED, oldUnchecked, newUnchecked);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setUnchecked(EmptyType newUnchecked) {
-		if (newUnchecked != unchecked) {
-			NotificationChain msgs = null;
-			if (unchecked != null)
-				msgs = ((InternalEObject)unchecked).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.METHOD_PERMISSION__UNCHECKED, null, msgs);
-			if (newUnchecked != null)
-				msgs = ((InternalEObject)newUnchecked).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EjbPackage.METHOD_PERMISSION__UNCHECKED, null, msgs);
-			msgs = basicSetUnchecked(newUnchecked, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.METHOD_PERMISSION__UNCHECKED, newUnchecked, newUnchecked));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getMethods() {
-		if (methods == null) {
-			methods = new EObjectContainmentEList(MethodType.class, this, EjbPackage.METHOD_PERMISSION__METHODS);
-		}
-		return methods;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.METHOD_PERMISSION__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.METHOD_PERMISSION__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-			case EjbPackage.METHOD_PERMISSION__UNCHECKED:
-				return basicSetUnchecked(null, msgs);
-			case EjbPackage.METHOD_PERMISSION__METHODS:
-				return ((InternalEList)getMethods()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.METHOD_PERMISSION__DESCRIPTIONS:
-				return getDescriptions();
-			case EjbPackage.METHOD_PERMISSION__ROLE_NAMES:
-				return getRoleNames();
-			case EjbPackage.METHOD_PERMISSION__UNCHECKED:
-				return getUnchecked();
-			case EjbPackage.METHOD_PERMISSION__METHODS:
-				return getMethods();
-			case EjbPackage.METHOD_PERMISSION__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.METHOD_PERMISSION__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case EjbPackage.METHOD_PERMISSION__ROLE_NAMES:
-				getRoleNames().clear();
-				getRoleNames().addAll((Collection)newValue);
-				return;
-			case EjbPackage.METHOD_PERMISSION__UNCHECKED:
-				setUnchecked((EmptyType)newValue);
-				return;
-			case EjbPackage.METHOD_PERMISSION__METHODS:
-				getMethods().clear();
-				getMethods().addAll((Collection)newValue);
-				return;
-			case EjbPackage.METHOD_PERMISSION__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.METHOD_PERMISSION__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case EjbPackage.METHOD_PERMISSION__ROLE_NAMES:
-				getRoleNames().clear();
-				return;
-			case EjbPackage.METHOD_PERMISSION__UNCHECKED:
-				setUnchecked((EmptyType)null);
-				return;
-			case EjbPackage.METHOD_PERMISSION__METHODS:
-				getMethods().clear();
-				return;
-			case EjbPackage.METHOD_PERMISSION__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.METHOD_PERMISSION__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case EjbPackage.METHOD_PERMISSION__ROLE_NAMES:
-				return roleNames != null && !roleNames.isEmpty();
-			case EjbPackage.METHOD_PERMISSION__UNCHECKED:
-				return unchecked != null;
-			case EjbPackage.METHOD_PERMISSION__METHODS:
-				return methods != null && !methods.isEmpty();
-			case EjbPackage.METHOD_PERMISSION__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (roleNames: "); //$NON-NLS-1$
-		result.append(roleNames);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //MethodPermissionImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/MethodTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/MethodTypeImpl.java
deleted file mode 100644
index 0f87a8bd6..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/MethodTypeImpl.java
+++ /dev/null
@@ -1,489 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb.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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jst.javaee.core.Description;
-
-import org.eclipse.jst.javaee.ejb.MethodInterfaceType;
-import org.eclipse.jst.javaee.ejb.MethodParams;
-import org.eclipse.jst.javaee.ejb.MethodType;
-
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Method Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MethodTypeImpl#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MethodTypeImpl#getEjbName <em>Ejb Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MethodTypeImpl#getMethodIntf <em>Method Intf</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MethodTypeImpl#getMethodName <em>Method Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MethodTypeImpl#getMethodParams <em>Method Params</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MethodTypeImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MethodTypeImpl extends EObjectImpl implements MethodType {
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The default value of the '{@link #getEjbName() <em>Ejb Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EJB_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getEjbName() <em>Ejb Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String ejbName = EJB_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getMethodIntf() <em>Method Intf</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMethodIntf()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final MethodInterfaceType METHOD_INTF_EDEFAULT = MethodInterfaceType.HOME_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getMethodIntf() <em>Method Intf</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMethodIntf()
-	 * @generated
-	 * @ordered
-	 */
-	protected MethodInterfaceType methodIntf = METHOD_INTF_EDEFAULT;
-
-	/**
-	 * This is true if the Method Intf attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean methodIntfESet = false;
-
-	/**
-	 * The default value of the '{@link #getMethodName() <em>Method Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMethodName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String METHOD_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMethodName() <em>Method Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMethodName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String methodName = METHOD_NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getMethodParams() <em>Method Params</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMethodParams()
-	 * @generated
-	 * @ordered
-	 */
-	protected MethodParams methodParams = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MethodTypeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.METHOD_TYPE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.METHOD_TYPE__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getEjbName() {
-		return ejbName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEjbName(String newEjbName) {
-		String oldEjbName = ejbName;
-		ejbName = newEjbName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.METHOD_TYPE__EJB_NAME, oldEjbName, ejbName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MethodInterfaceType getMethodIntf() {
-		return methodIntf;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMethodIntf(MethodInterfaceType newMethodIntf) {
-		MethodInterfaceType oldMethodIntf = methodIntf;
-		methodIntf = newMethodIntf == null ? METHOD_INTF_EDEFAULT : newMethodIntf;
-		boolean oldMethodIntfESet = methodIntfESet;
-		methodIntfESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.METHOD_TYPE__METHOD_INTF, oldMethodIntf, methodIntf, !oldMethodIntfESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetMethodIntf() {
-		MethodInterfaceType oldMethodIntf = methodIntf;
-		boolean oldMethodIntfESet = methodIntfESet;
-		methodIntf = METHOD_INTF_EDEFAULT;
-		methodIntfESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.METHOD_TYPE__METHOD_INTF, oldMethodIntf, METHOD_INTF_EDEFAULT, oldMethodIntfESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetMethodIntf() {
-		return methodIntfESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getMethodName() {
-		return methodName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMethodName(String newMethodName) {
-		String oldMethodName = methodName;
-		methodName = newMethodName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.METHOD_TYPE__METHOD_NAME, oldMethodName, methodName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MethodParams getMethodParams() {
-		return methodParams;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetMethodParams(MethodParams newMethodParams, NotificationChain msgs) {
-		MethodParams oldMethodParams = methodParams;
-		methodParams = newMethodParams;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.METHOD_TYPE__METHOD_PARAMS, oldMethodParams, newMethodParams);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMethodParams(MethodParams newMethodParams) {
-		if (newMethodParams != methodParams) {
-			NotificationChain msgs = null;
-			if (methodParams != null)
-				msgs = ((InternalEObject)methodParams).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.METHOD_TYPE__METHOD_PARAMS, null, msgs);
-			if (newMethodParams != null)
-				msgs = ((InternalEObject)newMethodParams).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EjbPackage.METHOD_TYPE__METHOD_PARAMS, null, msgs);
-			msgs = basicSetMethodParams(newMethodParams, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.METHOD_TYPE__METHOD_PARAMS, newMethodParams, newMethodParams));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.METHOD_TYPE__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.METHOD_TYPE__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-			case EjbPackage.METHOD_TYPE__METHOD_PARAMS:
-				return basicSetMethodParams(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.METHOD_TYPE__DESCRIPTIONS:
-				return getDescriptions();
-			case EjbPackage.METHOD_TYPE__EJB_NAME:
-				return getEjbName();
-			case EjbPackage.METHOD_TYPE__METHOD_INTF:
-				return getMethodIntf();
-			case EjbPackage.METHOD_TYPE__METHOD_NAME:
-				return getMethodName();
-			case EjbPackage.METHOD_TYPE__METHOD_PARAMS:
-				return getMethodParams();
-			case EjbPackage.METHOD_TYPE__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.METHOD_TYPE__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case EjbPackage.METHOD_TYPE__EJB_NAME:
-				setEjbName((String)newValue);
-				return;
-			case EjbPackage.METHOD_TYPE__METHOD_INTF:
-				setMethodIntf((MethodInterfaceType)newValue);
-				return;
-			case EjbPackage.METHOD_TYPE__METHOD_NAME:
-				setMethodName((String)newValue);
-				return;
-			case EjbPackage.METHOD_TYPE__METHOD_PARAMS:
-				setMethodParams((MethodParams)newValue);
-				return;
-			case EjbPackage.METHOD_TYPE__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.METHOD_TYPE__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case EjbPackage.METHOD_TYPE__EJB_NAME:
-				setEjbName(EJB_NAME_EDEFAULT);
-				return;
-			case EjbPackage.METHOD_TYPE__METHOD_INTF:
-				unsetMethodIntf();
-				return;
-			case EjbPackage.METHOD_TYPE__METHOD_NAME:
-				setMethodName(METHOD_NAME_EDEFAULT);
-				return;
-			case EjbPackage.METHOD_TYPE__METHOD_PARAMS:
-				setMethodParams((MethodParams)null);
-				return;
-			case EjbPackage.METHOD_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.METHOD_TYPE__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case EjbPackage.METHOD_TYPE__EJB_NAME:
-				return EJB_NAME_EDEFAULT == null ? ejbName != null : !EJB_NAME_EDEFAULT.equals(ejbName);
-			case EjbPackage.METHOD_TYPE__METHOD_INTF:
-				return isSetMethodIntf();
-			case EjbPackage.METHOD_TYPE__METHOD_NAME:
-				return METHOD_NAME_EDEFAULT == null ? methodName != null : !METHOD_NAME_EDEFAULT.equals(methodName);
-			case EjbPackage.METHOD_TYPE__METHOD_PARAMS:
-				return methodParams != null;
-			case EjbPackage.METHOD_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (ejbName: "); //$NON-NLS-1$
-		result.append(ejbName);
-		result.append(", methodIntf: "); //$NON-NLS-1$
-		if (methodIntfESet) result.append(methodIntf); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(", methodName: "); //$NON-NLS-1$
-		result.append(methodName);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //MethodTypeImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/NamedMethodTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/NamedMethodTypeImpl.java
deleted file mode 100644
index 3c5e56474..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/NamedMethodTypeImpl.java
+++ /dev/null
@@ -1,300 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb.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.ejb.MethodParams;
-import org.eclipse.jst.javaee.ejb.NamedMethodType;
-
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Named Method Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.NamedMethodTypeImpl#getMethodName <em>Method Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.NamedMethodTypeImpl#getMethodParams <em>Method Params</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.NamedMethodTypeImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class NamedMethodTypeImpl extends EObjectImpl implements NamedMethodType {
-	/**
-	 * The default value of the '{@link #getMethodName() <em>Method Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMethodName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String METHOD_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMethodName() <em>Method Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMethodName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String methodName = METHOD_NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getMethodParams() <em>Method Params</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMethodParams()
-	 * @generated
-	 * @ordered
-	 */
-	protected MethodParams methodParams = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected NamedMethodTypeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.NAMED_METHOD_TYPE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getMethodName() {
-		return methodName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMethodName(String newMethodName) {
-		String oldMethodName = methodName;
-		methodName = newMethodName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.NAMED_METHOD_TYPE__METHOD_NAME, oldMethodName, methodName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MethodParams getMethodParams() {
-		return methodParams;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetMethodParams(MethodParams newMethodParams, NotificationChain msgs) {
-		MethodParams oldMethodParams = methodParams;
-		methodParams = newMethodParams;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.NAMED_METHOD_TYPE__METHOD_PARAMS, oldMethodParams, newMethodParams);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMethodParams(MethodParams newMethodParams) {
-		if (newMethodParams != methodParams) {
-			NotificationChain msgs = null;
-			if (methodParams != null)
-				msgs = ((InternalEObject)methodParams).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.NAMED_METHOD_TYPE__METHOD_PARAMS, null, msgs);
-			if (newMethodParams != null)
-				msgs = ((InternalEObject)newMethodParams).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EjbPackage.NAMED_METHOD_TYPE__METHOD_PARAMS, null, msgs);
-			msgs = basicSetMethodParams(newMethodParams, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.NAMED_METHOD_TYPE__METHOD_PARAMS, newMethodParams, newMethodParams));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.NAMED_METHOD_TYPE__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.NAMED_METHOD_TYPE__METHOD_PARAMS:
-				return basicSetMethodParams(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.NAMED_METHOD_TYPE__METHOD_NAME:
-				return getMethodName();
-			case EjbPackage.NAMED_METHOD_TYPE__METHOD_PARAMS:
-				return getMethodParams();
-			case EjbPackage.NAMED_METHOD_TYPE__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.NAMED_METHOD_TYPE__METHOD_NAME:
-				setMethodName((String)newValue);
-				return;
-			case EjbPackage.NAMED_METHOD_TYPE__METHOD_PARAMS:
-				setMethodParams((MethodParams)newValue);
-				return;
-			case EjbPackage.NAMED_METHOD_TYPE__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.NAMED_METHOD_TYPE__METHOD_NAME:
-				setMethodName(METHOD_NAME_EDEFAULT);
-				return;
-			case EjbPackage.NAMED_METHOD_TYPE__METHOD_PARAMS:
-				setMethodParams((MethodParams)null);
-				return;
-			case EjbPackage.NAMED_METHOD_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.NAMED_METHOD_TYPE__METHOD_NAME:
-				return METHOD_NAME_EDEFAULT == null ? methodName != null : !METHOD_NAME_EDEFAULT.equals(methodName);
-			case EjbPackage.NAMED_METHOD_TYPE__METHOD_PARAMS:
-				return methodParams != null;
-			case EjbPackage.NAMED_METHOD_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (methodName: "); //$NON-NLS-1$
-		result.append(methodName);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //NamedMethodTypeImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/QueryImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/QueryImpl.java
deleted file mode 100644
index 3b6c94dfb..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/QueryImpl.java
+++ /dev/null
@@ -1,457 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb.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.core.Description;
-
-import org.eclipse.jst.javaee.ejb.Query;
-import org.eclipse.jst.javaee.ejb.QueryMethod;
-import org.eclipse.jst.javaee.ejb.ResultTypeMappingType;
-
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Query</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.QueryImpl#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.QueryImpl#getQueryMethod <em>Query Method</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.QueryImpl#getResultTypeMapping <em>Result Type Mapping</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.QueryImpl#getEjbQl <em>Ejb Ql</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.QueryImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class QueryImpl extends EObjectImpl implements Query {
-	/**
-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected Description description = null;
-
-	/**
-	 * The cached value of the '{@link #getQueryMethod() <em>Query Method</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getQueryMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected QueryMethod queryMethod = null;
-
-	/**
-	 * The default value of the '{@link #getResultTypeMapping() <em>Result Type Mapping</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResultTypeMapping()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final ResultTypeMappingType RESULT_TYPE_MAPPING_EDEFAULT = ResultTypeMappingType.LOCAL_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getResultTypeMapping() <em>Result Type Mapping</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResultTypeMapping()
-	 * @generated
-	 * @ordered
-	 */
-	protected ResultTypeMappingType resultTypeMapping = RESULT_TYPE_MAPPING_EDEFAULT;
-
-	/**
-	 * This is true if the Result Type Mapping attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean resultTypeMappingESet = false;
-
-	/**
-	 * The default value of the '{@link #getEjbQl() <em>Ejb Ql</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbQl()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EJB_QL_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getEjbQl() <em>Ejb Ql</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbQl()
-	 * @generated
-	 * @ordered
-	 */
-	protected String ejbQl = EJB_QL_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected QueryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.QUERY;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Description getDescription() {
-		return description;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetDescription(Description newDescription, NotificationChain msgs) {
-		Description oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.QUERY__DESCRIPTION, oldDescription, newDescription);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDescription(Description newDescription) {
-		if (newDescription != description) {
-			NotificationChain msgs = null;
-			if (description != null)
-				msgs = ((InternalEObject)description).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.QUERY__DESCRIPTION, null, msgs);
-			if (newDescription != null)
-				msgs = ((InternalEObject)newDescription).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EjbPackage.QUERY__DESCRIPTION, null, msgs);
-			msgs = basicSetDescription(newDescription, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.QUERY__DESCRIPTION, newDescription, newDescription));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public QueryMethod getQueryMethod() {
-		return queryMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetQueryMethod(QueryMethod newQueryMethod, NotificationChain msgs) {
-		QueryMethod oldQueryMethod = queryMethod;
-		queryMethod = newQueryMethod;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.QUERY__QUERY_METHOD, oldQueryMethod, newQueryMethod);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setQueryMethod(QueryMethod newQueryMethod) {
-		if (newQueryMethod != queryMethod) {
-			NotificationChain msgs = null;
-			if (queryMethod != null)
-				msgs = ((InternalEObject)queryMethod).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.QUERY__QUERY_METHOD, null, msgs);
-			if (newQueryMethod != null)
-				msgs = ((InternalEObject)newQueryMethod).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EjbPackage.QUERY__QUERY_METHOD, null, msgs);
-			msgs = basicSetQueryMethod(newQueryMethod, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.QUERY__QUERY_METHOD, newQueryMethod, newQueryMethod));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResultTypeMappingType getResultTypeMapping() {
-		return resultTypeMapping;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setResultTypeMapping(ResultTypeMappingType newResultTypeMapping) {
-		ResultTypeMappingType oldResultTypeMapping = resultTypeMapping;
-		resultTypeMapping = newResultTypeMapping == null ? RESULT_TYPE_MAPPING_EDEFAULT : newResultTypeMapping;
-		boolean oldResultTypeMappingESet = resultTypeMappingESet;
-		resultTypeMappingESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.QUERY__RESULT_TYPE_MAPPING, oldResultTypeMapping, resultTypeMapping, !oldResultTypeMappingESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetResultTypeMapping() {
-		ResultTypeMappingType oldResultTypeMapping = resultTypeMapping;
-		boolean oldResultTypeMappingESet = resultTypeMappingESet;
-		resultTypeMapping = RESULT_TYPE_MAPPING_EDEFAULT;
-		resultTypeMappingESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.QUERY__RESULT_TYPE_MAPPING, oldResultTypeMapping, RESULT_TYPE_MAPPING_EDEFAULT, oldResultTypeMappingESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetResultTypeMapping() {
-		return resultTypeMappingESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getEjbQl() {
-		return ejbQl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEjbQl(String newEjbQl) {
-		String oldEjbQl = ejbQl;
-		ejbQl = newEjbQl;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.QUERY__EJB_QL, oldEjbQl, ejbQl));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.QUERY__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.QUERY__DESCRIPTION:
-				return basicSetDescription(null, msgs);
-			case EjbPackage.QUERY__QUERY_METHOD:
-				return basicSetQueryMethod(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.QUERY__DESCRIPTION:
-				return getDescription();
-			case EjbPackage.QUERY__QUERY_METHOD:
-				return getQueryMethod();
-			case EjbPackage.QUERY__RESULT_TYPE_MAPPING:
-				return getResultTypeMapping();
-			case EjbPackage.QUERY__EJB_QL:
-				return getEjbQl();
-			case EjbPackage.QUERY__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.QUERY__DESCRIPTION:
-				setDescription((Description)newValue);
-				return;
-			case EjbPackage.QUERY__QUERY_METHOD:
-				setQueryMethod((QueryMethod)newValue);
-				return;
-			case EjbPackage.QUERY__RESULT_TYPE_MAPPING:
-				setResultTypeMapping((ResultTypeMappingType)newValue);
-				return;
-			case EjbPackage.QUERY__EJB_QL:
-				setEjbQl((String)newValue);
-				return;
-			case EjbPackage.QUERY__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.QUERY__DESCRIPTION:
-				setDescription((Description)null);
-				return;
-			case EjbPackage.QUERY__QUERY_METHOD:
-				setQueryMethod((QueryMethod)null);
-				return;
-			case EjbPackage.QUERY__RESULT_TYPE_MAPPING:
-				unsetResultTypeMapping();
-				return;
-			case EjbPackage.QUERY__EJB_QL:
-				setEjbQl(EJB_QL_EDEFAULT);
-				return;
-			case EjbPackage.QUERY__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.QUERY__DESCRIPTION:
-				return description != null;
-			case EjbPackage.QUERY__QUERY_METHOD:
-				return queryMethod != null;
-			case EjbPackage.QUERY__RESULT_TYPE_MAPPING:
-				return isSetResultTypeMapping();
-			case EjbPackage.QUERY__EJB_QL:
-				return EJB_QL_EDEFAULT == null ? ejbQl != null : !EJB_QL_EDEFAULT.equals(ejbQl);
-			case EjbPackage.QUERY__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (resultTypeMapping: "); //$NON-NLS-1$
-		if (resultTypeMappingESet) result.append(resultTypeMapping); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(", ejbQl: "); //$NON-NLS-1$
-		result.append(ejbQl);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //QueryImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/QueryMethodImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/QueryMethodImpl.java
deleted file mode 100644
index 5c2987dc7..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/QueryMethodImpl.java
+++ /dev/null
@@ -1,300 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb.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.ejb.MethodParams;
-import org.eclipse.jst.javaee.ejb.QueryMethod;
-
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Query Method</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.QueryMethodImpl#getMethodName <em>Method Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.QueryMethodImpl#getMethodParams <em>Method Params</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.QueryMethodImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class QueryMethodImpl extends EObjectImpl implements QueryMethod {
-	/**
-	 * The default value of the '{@link #getMethodName() <em>Method Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMethodName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String METHOD_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMethodName() <em>Method Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMethodName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String methodName = METHOD_NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getMethodParams() <em>Method Params</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMethodParams()
-	 * @generated
-	 * @ordered
-	 */
-	protected MethodParams methodParams = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected QueryMethodImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.QUERY_METHOD;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getMethodName() {
-		return methodName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMethodName(String newMethodName) {
-		String oldMethodName = methodName;
-		methodName = newMethodName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.QUERY_METHOD__METHOD_NAME, oldMethodName, methodName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MethodParams getMethodParams() {
-		return methodParams;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetMethodParams(MethodParams newMethodParams, NotificationChain msgs) {
-		MethodParams oldMethodParams = methodParams;
-		methodParams = newMethodParams;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.QUERY_METHOD__METHOD_PARAMS, oldMethodParams, newMethodParams);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMethodParams(MethodParams newMethodParams) {
-		if (newMethodParams != methodParams) {
-			NotificationChain msgs = null;
-			if (methodParams != null)
-				msgs = ((InternalEObject)methodParams).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.QUERY_METHOD__METHOD_PARAMS, null, msgs);
-			if (newMethodParams != null)
-				msgs = ((InternalEObject)newMethodParams).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EjbPackage.QUERY_METHOD__METHOD_PARAMS, null, msgs);
-			msgs = basicSetMethodParams(newMethodParams, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.QUERY_METHOD__METHOD_PARAMS, newMethodParams, newMethodParams));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.QUERY_METHOD__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.QUERY_METHOD__METHOD_PARAMS:
-				return basicSetMethodParams(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.QUERY_METHOD__METHOD_NAME:
-				return getMethodName();
-			case EjbPackage.QUERY_METHOD__METHOD_PARAMS:
-				return getMethodParams();
-			case EjbPackage.QUERY_METHOD__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.QUERY_METHOD__METHOD_NAME:
-				setMethodName((String)newValue);
-				return;
-			case EjbPackage.QUERY_METHOD__METHOD_PARAMS:
-				setMethodParams((MethodParams)newValue);
-				return;
-			case EjbPackage.QUERY_METHOD__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.QUERY_METHOD__METHOD_NAME:
-				setMethodName(METHOD_NAME_EDEFAULT);
-				return;
-			case EjbPackage.QUERY_METHOD__METHOD_PARAMS:
-				setMethodParams((MethodParams)null);
-				return;
-			case EjbPackage.QUERY_METHOD__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.QUERY_METHOD__METHOD_NAME:
-				return METHOD_NAME_EDEFAULT == null ? methodName != null : !METHOD_NAME_EDEFAULT.equals(methodName);
-			case EjbPackage.QUERY_METHOD__METHOD_PARAMS:
-				return methodParams != null;
-			case EjbPackage.QUERY_METHOD__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (methodName: "); //$NON-NLS-1$
-		result.append(methodName);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //QueryMethodImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/RelationshipRoleSourceTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/RelationshipRoleSourceTypeImpl.java
deleted file mode 100644
index 4ae8f59f5..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/RelationshipRoleSourceTypeImpl.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb.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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jst.javaee.core.Description;
-
-import org.eclipse.jst.javaee.ejb.RelationshipRoleSourceType;
-
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Relationship Role Source Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.RelationshipRoleSourceTypeImpl#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.RelationshipRoleSourceTypeImpl#getEjbName <em>Ejb Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.RelationshipRoleSourceTypeImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class RelationshipRoleSourceTypeImpl extends EObjectImpl implements RelationshipRoleSourceType {
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The default value of the '{@link #getEjbName() <em>Ejb Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EJB_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getEjbName() <em>Ejb Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String ejbName = EJB_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RelationshipRoleSourceTypeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.RELATIONSHIP_ROLE_SOURCE_TYPE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.RELATIONSHIP_ROLE_SOURCE_TYPE__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getEjbName() {
-		return ejbName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEjbName(String newEjbName) {
-		String oldEjbName = ejbName;
-		ejbName = newEjbName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.RELATIONSHIP_ROLE_SOURCE_TYPE__EJB_NAME, oldEjbName, ejbName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.RELATIONSHIP_ROLE_SOURCE_TYPE__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.RELATIONSHIP_ROLE_SOURCE_TYPE__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.RELATIONSHIP_ROLE_SOURCE_TYPE__DESCRIPTIONS:
-				return getDescriptions();
-			case EjbPackage.RELATIONSHIP_ROLE_SOURCE_TYPE__EJB_NAME:
-				return getEjbName();
-			case EjbPackage.RELATIONSHIP_ROLE_SOURCE_TYPE__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.RELATIONSHIP_ROLE_SOURCE_TYPE__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case EjbPackage.RELATIONSHIP_ROLE_SOURCE_TYPE__EJB_NAME:
-				setEjbName((String)newValue);
-				return;
-			case EjbPackage.RELATIONSHIP_ROLE_SOURCE_TYPE__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.RELATIONSHIP_ROLE_SOURCE_TYPE__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case EjbPackage.RELATIONSHIP_ROLE_SOURCE_TYPE__EJB_NAME:
-				setEjbName(EJB_NAME_EDEFAULT);
-				return;
-			case EjbPackage.RELATIONSHIP_ROLE_SOURCE_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.RELATIONSHIP_ROLE_SOURCE_TYPE__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case EjbPackage.RELATIONSHIP_ROLE_SOURCE_TYPE__EJB_NAME:
-				return EJB_NAME_EDEFAULT == null ? ejbName != null : !EJB_NAME_EDEFAULT.equals(ejbName);
-			case EjbPackage.RELATIONSHIP_ROLE_SOURCE_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (ejbName: "); //$NON-NLS-1$
-		result.append(ejbName);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //RelationshipRoleSourceTypeImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/RelationshipsImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/RelationshipsImpl.java
deleted file mode 100644
index 11c5d786a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/RelationshipsImpl.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb.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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jst.javaee.core.Description;
-
-import org.eclipse.jst.javaee.ejb.EJBRelation;
-import org.eclipse.jst.javaee.ejb.Relationships;
-
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Relationships</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.RelationshipsImpl#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.RelationshipsImpl#getEjbRelations <em>Ejb Relations</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.RelationshipsImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class RelationshipsImpl extends EObjectImpl implements Relationships {
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The cached value of the '{@link #getEjbRelations() <em>Ejb Relations</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbRelations()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList ejbRelations = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RelationshipsImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.RELATIONSHIPS;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.RELATIONSHIPS__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getEjbRelations() {
-		if (ejbRelations == null) {
-			ejbRelations = new EObjectContainmentEList(EJBRelation.class, this, EjbPackage.RELATIONSHIPS__EJB_RELATIONS);
-		}
-		return ejbRelations;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.RELATIONSHIPS__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.RELATIONSHIPS__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-			case EjbPackage.RELATIONSHIPS__EJB_RELATIONS:
-				return ((InternalEList)getEjbRelations()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.RELATIONSHIPS__DESCRIPTIONS:
-				return getDescriptions();
-			case EjbPackage.RELATIONSHIPS__EJB_RELATIONS:
-				return getEjbRelations();
-			case EjbPackage.RELATIONSHIPS__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.RELATIONSHIPS__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case EjbPackage.RELATIONSHIPS__EJB_RELATIONS:
-				getEjbRelations().clear();
-				getEjbRelations().addAll((Collection)newValue);
-				return;
-			case EjbPackage.RELATIONSHIPS__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.RELATIONSHIPS__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case EjbPackage.RELATIONSHIPS__EJB_RELATIONS:
-				getEjbRelations().clear();
-				return;
-			case EjbPackage.RELATIONSHIPS__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.RELATIONSHIPS__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case EjbPackage.RELATIONSHIPS__EJB_RELATIONS:
-				return ejbRelations != null && !ejbRelations.isEmpty();
-			case EjbPackage.RELATIONSHIPS__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	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();
-	}
-
-} //RelationshipsImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/RemoveMethodTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/RemoveMethodTypeImpl.java
deleted file mode 100644
index 248029f95..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/RemoveMethodTypeImpl.java
+++ /dev/null
@@ -1,334 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb.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.ejb.NamedMethodType;
-import org.eclipse.jst.javaee.ejb.RemoveMethodType;
-
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Remove Method Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.RemoveMethodTypeImpl#getBeanMethod <em>Bean Method</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.RemoveMethodTypeImpl#isRetainIfException <em>Retain If Exception</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.RemoveMethodTypeImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class RemoveMethodTypeImpl extends EObjectImpl implements RemoveMethodType {
-	/**
-	 * The cached value of the '{@link #getBeanMethod() <em>Bean Method</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBeanMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected NamedMethodType beanMethod = null;
-
-	/**
-	 * The default value of the '{@link #isRetainIfException() <em>Retain If Exception</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isRetainIfException()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean RETAIN_IF_EXCEPTION_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isRetainIfException() <em>Retain If Exception</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isRetainIfException()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean retainIfException = RETAIN_IF_EXCEPTION_EDEFAULT;
-
-	/**
-	 * This is true if the Retain If Exception attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean retainIfExceptionESet = false;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RemoveMethodTypeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.REMOVE_METHOD_TYPE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NamedMethodType getBeanMethod() {
-		return beanMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetBeanMethod(NamedMethodType newBeanMethod, NotificationChain msgs) {
-		NamedMethodType oldBeanMethod = beanMethod;
-		beanMethod = newBeanMethod;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.REMOVE_METHOD_TYPE__BEAN_METHOD, oldBeanMethod, newBeanMethod);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBeanMethod(NamedMethodType newBeanMethod) {
-		if (newBeanMethod != beanMethod) {
-			NotificationChain msgs = null;
-			if (beanMethod != null)
-				msgs = ((InternalEObject)beanMethod).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.REMOVE_METHOD_TYPE__BEAN_METHOD, null, msgs);
-			if (newBeanMethod != null)
-				msgs = ((InternalEObject)newBeanMethod).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EjbPackage.REMOVE_METHOD_TYPE__BEAN_METHOD, null, msgs);
-			msgs = basicSetBeanMethod(newBeanMethod, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.REMOVE_METHOD_TYPE__BEAN_METHOD, newBeanMethod, newBeanMethod));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isRetainIfException() {
-		return retainIfException;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRetainIfException(boolean newRetainIfException) {
-		boolean oldRetainIfException = retainIfException;
-		retainIfException = newRetainIfException;
-		boolean oldRetainIfExceptionESet = retainIfExceptionESet;
-		retainIfExceptionESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.REMOVE_METHOD_TYPE__RETAIN_IF_EXCEPTION, oldRetainIfException, retainIfException, !oldRetainIfExceptionESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetRetainIfException() {
-		boolean oldRetainIfException = retainIfException;
-		boolean oldRetainIfExceptionESet = retainIfExceptionESet;
-		retainIfException = RETAIN_IF_EXCEPTION_EDEFAULT;
-		retainIfExceptionESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.REMOVE_METHOD_TYPE__RETAIN_IF_EXCEPTION, oldRetainIfException, RETAIN_IF_EXCEPTION_EDEFAULT, oldRetainIfExceptionESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetRetainIfException() {
-		return retainIfExceptionESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.REMOVE_METHOD_TYPE__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.REMOVE_METHOD_TYPE__BEAN_METHOD:
-				return basicSetBeanMethod(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.REMOVE_METHOD_TYPE__BEAN_METHOD:
-				return getBeanMethod();
-			case EjbPackage.REMOVE_METHOD_TYPE__RETAIN_IF_EXCEPTION:
-				return isRetainIfException() ? Boolean.TRUE : Boolean.FALSE;
-			case EjbPackage.REMOVE_METHOD_TYPE__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.REMOVE_METHOD_TYPE__BEAN_METHOD:
-				setBeanMethod((NamedMethodType)newValue);
-				return;
-			case EjbPackage.REMOVE_METHOD_TYPE__RETAIN_IF_EXCEPTION:
-				setRetainIfException(((Boolean)newValue).booleanValue());
-				return;
-			case EjbPackage.REMOVE_METHOD_TYPE__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.REMOVE_METHOD_TYPE__BEAN_METHOD:
-				setBeanMethod((NamedMethodType)null);
-				return;
-			case EjbPackage.REMOVE_METHOD_TYPE__RETAIN_IF_EXCEPTION:
-				unsetRetainIfException();
-				return;
-			case EjbPackage.REMOVE_METHOD_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.REMOVE_METHOD_TYPE__BEAN_METHOD:
-				return beanMethod != null;
-			case EjbPackage.REMOVE_METHOD_TYPE__RETAIN_IF_EXCEPTION:
-				return isSetRetainIfException();
-			case EjbPackage.REMOVE_METHOD_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (retainIfException: "); //$NON-NLS-1$
-		if (retainIfExceptionESet) result.append(retainIfException); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //RemoveMethodTypeImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/SecurityIdentityTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/SecurityIdentityTypeImpl.java
deleted file mode 100644
index 11d20ed90..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/SecurityIdentityTypeImpl.java
+++ /dev/null
@@ -1,359 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb.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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jst.javaee.core.Description;
-import org.eclipse.jst.javaee.core.EmptyType;
-import org.eclipse.jst.javaee.core.RunAs;
-
-import org.eclipse.jst.javaee.ejb.SecurityIdentityType;
-
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Security Identity Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SecurityIdentityTypeImpl#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SecurityIdentityTypeImpl#getUseCallerIdentity <em>Use Caller Identity</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SecurityIdentityTypeImpl#getRunAs <em>Run As</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SecurityIdentityTypeImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SecurityIdentityTypeImpl extends EObjectImpl implements SecurityIdentityType {
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The cached value of the '{@link #getUseCallerIdentity() <em>Use Caller Identity</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUseCallerIdentity()
-	 * @generated
-	 * @ordered
-	 */
-	protected EmptyType useCallerIdentity = null;
-
-	/**
-	 * The cached value of the '{@link #getRunAs() <em>Run As</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRunAs()
-	 * @generated
-	 * @ordered
-	 */
-	protected RunAs runAs = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SecurityIdentityTypeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.SECURITY_IDENTITY_TYPE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.SECURITY_IDENTITY_TYPE__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EmptyType getUseCallerIdentity() {
-		return useCallerIdentity;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetUseCallerIdentity(EmptyType newUseCallerIdentity, NotificationChain msgs) {
-		EmptyType oldUseCallerIdentity = useCallerIdentity;
-		useCallerIdentity = newUseCallerIdentity;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.SECURITY_IDENTITY_TYPE__USE_CALLER_IDENTITY, oldUseCallerIdentity, newUseCallerIdentity);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setUseCallerIdentity(EmptyType newUseCallerIdentity) {
-		if (newUseCallerIdentity != useCallerIdentity) {
-			NotificationChain msgs = null;
-			if (useCallerIdentity != null)
-				msgs = ((InternalEObject)useCallerIdentity).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.SECURITY_IDENTITY_TYPE__USE_CALLER_IDENTITY, null, msgs);
-			if (newUseCallerIdentity != null)
-				msgs = ((InternalEObject)newUseCallerIdentity).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EjbPackage.SECURITY_IDENTITY_TYPE__USE_CALLER_IDENTITY, null, msgs);
-			msgs = basicSetUseCallerIdentity(newUseCallerIdentity, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.SECURITY_IDENTITY_TYPE__USE_CALLER_IDENTITY, newUseCallerIdentity, newUseCallerIdentity));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RunAs getRunAs() {
-		return runAs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetRunAs(RunAs newRunAs, NotificationChain msgs) {
-		RunAs oldRunAs = runAs;
-		runAs = newRunAs;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.SECURITY_IDENTITY_TYPE__RUN_AS, oldRunAs, newRunAs);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRunAs(RunAs newRunAs) {
-		if (newRunAs != runAs) {
-			NotificationChain msgs = null;
-			if (runAs != null)
-				msgs = ((InternalEObject)runAs).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.SECURITY_IDENTITY_TYPE__RUN_AS, null, msgs);
-			if (newRunAs != null)
-				msgs = ((InternalEObject)newRunAs).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EjbPackage.SECURITY_IDENTITY_TYPE__RUN_AS, null, msgs);
-			msgs = basicSetRunAs(newRunAs, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.SECURITY_IDENTITY_TYPE__RUN_AS, newRunAs, newRunAs));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.SECURITY_IDENTITY_TYPE__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.SECURITY_IDENTITY_TYPE__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-			case EjbPackage.SECURITY_IDENTITY_TYPE__USE_CALLER_IDENTITY:
-				return basicSetUseCallerIdentity(null, msgs);
-			case EjbPackage.SECURITY_IDENTITY_TYPE__RUN_AS:
-				return basicSetRunAs(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.SECURITY_IDENTITY_TYPE__DESCRIPTIONS:
-				return getDescriptions();
-			case EjbPackage.SECURITY_IDENTITY_TYPE__USE_CALLER_IDENTITY:
-				return getUseCallerIdentity();
-			case EjbPackage.SECURITY_IDENTITY_TYPE__RUN_AS:
-				return getRunAs();
-			case EjbPackage.SECURITY_IDENTITY_TYPE__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.SECURITY_IDENTITY_TYPE__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case EjbPackage.SECURITY_IDENTITY_TYPE__USE_CALLER_IDENTITY:
-				setUseCallerIdentity((EmptyType)newValue);
-				return;
-			case EjbPackage.SECURITY_IDENTITY_TYPE__RUN_AS:
-				setRunAs((RunAs)newValue);
-				return;
-			case EjbPackage.SECURITY_IDENTITY_TYPE__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.SECURITY_IDENTITY_TYPE__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case EjbPackage.SECURITY_IDENTITY_TYPE__USE_CALLER_IDENTITY:
-				setUseCallerIdentity((EmptyType)null);
-				return;
-			case EjbPackage.SECURITY_IDENTITY_TYPE__RUN_AS:
-				setRunAs((RunAs)null);
-				return;
-			case EjbPackage.SECURITY_IDENTITY_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.SECURITY_IDENTITY_TYPE__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case EjbPackage.SECURITY_IDENTITY_TYPE__USE_CALLER_IDENTITY:
-				return useCallerIdentity != null;
-			case EjbPackage.SECURITY_IDENTITY_TYPE__RUN_AS:
-				return runAs != null;
-			case EjbPackage.SECURITY_IDENTITY_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	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();
-	}
-
-} //SecurityIdentityTypeImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/SessionBeanImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/SessionBeanImpl.java
deleted file mode 100644
index 9c240d765..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/SessionBeanImpl.java
+++ /dev/null
@@ -1,1742 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb.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.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-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.EnvEntry;
-import org.eclipse.jst.javaee.core.Icon;
-import org.eclipse.jst.javaee.core.LifecycleCallback;
-import org.eclipse.jst.javaee.core.MessageDestinationRef;
-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.SecurityRoleRef;
-import org.eclipse.jst.javaee.core.ServiceRef;
-
-import org.eclipse.jst.javaee.ejb.AroundInvokeType;
-import org.eclipse.jst.javaee.ejb.InitMethodType;
-import org.eclipse.jst.javaee.ejb.NamedMethodType;
-import org.eclipse.jst.javaee.ejb.RemoveMethodType;
-import org.eclipse.jst.javaee.ejb.SecurityIdentityType;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-import org.eclipse.jst.javaee.ejb.SessionType;
-import org.eclipse.jst.javaee.ejb.TransactionType;
-
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Session Bean</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getDisplayNames <em>Display Names</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getIcons <em>Icons</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getEjbName <em>Ejb Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getMappedName <em>Mapped Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getHome <em>Home</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getRemote <em>Remote</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getLocalHome <em>Local Home</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getLocal <em>Local</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getBusinessLocals <em>Business Locals</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getBusinessRemotes <em>Business Remotes</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getServiceEndpoint <em>Service Endpoint</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getEjbClass <em>Ejb Class</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getSessionType <em>Session Type</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getTimeoutMethod <em>Timeout Method</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getInitMethods <em>Init Methods</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getRemoveMethods <em>Remove Methods</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getTransactionType <em>Transaction Type</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getAroundInvokes <em>Around Invokes</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getEnvEntries <em>Env Entries</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getEjbRefs <em>Ejb Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getEjbLocalRefs <em>Ejb Local Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getServiceRefs <em>Service Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getResourceRefs <em>Resource Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getResourceEnvRefs <em>Resource Env Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getMessageDestinationRefs <em>Message Destination Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getPersistenceContextRefs <em>Persistence Context Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getPersistenceUnitRefs <em>Persistence Unit Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getPostConstructs <em>Post Constructs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getPreDestroys <em>Pre Destroys</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getPostActivates <em>Post Activates</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getPrePassivates <em>Pre Passivates</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getSecurityRoleRefs <em>Security Role Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getSecurityIdentities <em>Security Identities</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SessionBeanImpl extends EObjectImpl implements SessionBean {
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayNames() <em>Display Names</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayNames()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList displayNames = null;
-
-	/**
-	 * The cached value of the '{@link #getIcons() <em>Icons</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIcons()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList icons = null;
-
-	/**
-	 * The default value of the '{@link #getEjbName() <em>Ejb Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EJB_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getEjbName() <em>Ejb Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String ejbName = EJB_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getMappedName() <em>Mapped Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMappedName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MAPPED_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMappedName() <em>Mapped Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMappedName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String mappedName = MAPPED_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getHome() <em>Home</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHome()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String HOME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getHome() <em>Home</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHome()
-	 * @generated
-	 * @ordered
-	 */
-	protected String home = HOME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getRemote() <em>Remote</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRemote()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String REMOTE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getRemote() <em>Remote</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRemote()
-	 * @generated
-	 * @ordered
-	 */
-	protected String remote = REMOTE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLocalHome() <em>Local Home</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocalHome()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LOCAL_HOME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLocalHome() <em>Local Home</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocalHome()
-	 * @generated
-	 * @ordered
-	 */
-	protected String localHome = LOCAL_HOME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLocal() <em>Local</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocal()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LOCAL_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLocal() <em>Local</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocal()
-	 * @generated
-	 * @ordered
-	 */
-	protected String local = LOCAL_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getBusinessLocals() <em>Business Locals</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBusinessLocals()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList businessLocals = null;
-
-	/**
-	 * The cached value of the '{@link #getBusinessRemotes() <em>Business Remotes</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBusinessRemotes()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList businessRemotes = null;
-
-	/**
-	 * The default value of the '{@link #getServiceEndpoint() <em>Service Endpoint</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getServiceEndpoint()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SERVICE_ENDPOINT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getServiceEndpoint() <em>Service Endpoint</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getServiceEndpoint()
-	 * @generated
-	 * @ordered
-	 */
-	protected String serviceEndpoint = SERVICE_ENDPOINT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getEjbClass() <em>Ejb Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EJB_CLASS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getEjbClass() <em>Ejb Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected String ejbClass = EJB_CLASS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getSessionType() <em>Session Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSessionType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final SessionType SESSION_TYPE_EDEFAULT = SessionType.STATEFUL_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getSessionType() <em>Session Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSessionType()
-	 * @generated
-	 * @ordered
-	 */
-	protected SessionType sessionType = SESSION_TYPE_EDEFAULT;
-
-	/**
-	 * This is true if the Session Type attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean sessionTypeESet = false;
-
-	/**
-	 * The cached value of the '{@link #getTimeoutMethod() <em>Timeout Method</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTimeoutMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected NamedMethodType timeoutMethod = null;
-
-	/**
-	 * The cached value of the '{@link #getInitMethods() <em>Init Methods</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInitMethods()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList initMethods = null;
-
-	/**
-	 * The cached value of the '{@link #getRemoveMethods() <em>Remove Methods</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRemoveMethods()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList removeMethods = null;
-
-	/**
-	 * The default value of the '{@link #getTransactionType() <em>Transaction Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTransactionType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final TransactionType TRANSACTION_TYPE_EDEFAULT = TransactionType.BEAN_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getTransactionType() <em>Transaction Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTransactionType()
-	 * @generated
-	 * @ordered
-	 */
-	protected TransactionType transactionType = TRANSACTION_TYPE_EDEFAULT;
-
-	/**
-	 * This is true if the Transaction Type attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean transactionTypeESet = false;
-
-	/**
-	 * The cached value of the '{@link #getAroundInvokes() <em>Around Invokes</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAroundInvokes()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList aroundInvokes = null;
-
-	/**
-	 * The cached value of the '{@link #getEnvEntries() <em>Env Entries</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEnvEntries()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList envEntries = null;
-
-	/**
-	 * The cached value of the '{@link #getEjbRefs() <em>Ejb Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList ejbRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getEjbLocalRefs() <em>Ejb Local Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbLocalRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList ejbLocalRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getServiceRefs() <em>Service Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getServiceRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList serviceRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getResourceRefs() <em>Resource Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResourceRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList resourceRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getResourceEnvRefs() <em>Resource Env Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResourceEnvRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList resourceEnvRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getMessageDestinationRefs() <em>Message Destination Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessageDestinationRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList messageDestinationRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getPersistenceContextRefs() <em>Persistence Context Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPersistenceContextRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList persistenceContextRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getPersistenceUnitRefs() <em>Persistence Unit Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPersistenceUnitRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList persistenceUnitRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getPostConstructs() <em>Post Constructs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPostConstructs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList postConstructs = null;
-
-	/**
-	 * The cached value of the '{@link #getPreDestroys() <em>Pre Destroys</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPreDestroys()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList preDestroys = null;
-
-	/**
-	 * The cached value of the '{@link #getPostActivates() <em>Post Activates</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPostActivates()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList postActivates = null;
-
-	/**
-	 * The cached value of the '{@link #getPrePassivates() <em>Pre Passivates</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPrePassivates()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList prePassivates = null;
-
-	/**
-	 * The cached value of the '{@link #getSecurityRoleRefs() <em>Security Role Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSecurityRoleRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList securityRoleRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getSecurityIdentities() <em>Security Identities</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSecurityIdentities()
-	 * @generated
-	 * @ordered
-	 */
-	protected SecurityIdentityType securityIdentities = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SessionBeanImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.SESSION_BEAN;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.SESSION_BEAN__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDisplayNames() {
-		if (displayNames == null) {
-			displayNames = new EObjectContainmentEList(DisplayName.class, this, EjbPackage.SESSION_BEAN__DISPLAY_NAMES);
-		}
-		return displayNames;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getIcons() {
-		if (icons == null) {
-			icons = new EObjectContainmentEList(Icon.class, this, EjbPackage.SESSION_BEAN__ICONS);
-		}
-		return icons;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getEjbName() {
-		return ejbName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEjbName(String newEjbName) {
-		String oldEjbName = ejbName;
-		ejbName = newEjbName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.SESSION_BEAN__EJB_NAME, oldEjbName, ejbName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getMappedName() {
-		return mappedName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMappedName(String newMappedName) {
-		String oldMappedName = mappedName;
-		mappedName = newMappedName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.SESSION_BEAN__MAPPED_NAME, oldMappedName, mappedName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getHome() {
-		return home;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHome(String newHome) {
-		String oldHome = home;
-		home = newHome;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.SESSION_BEAN__HOME, oldHome, home));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getRemote() {
-		return remote;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRemote(String newRemote) {
-		String oldRemote = remote;
-		remote = newRemote;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.SESSION_BEAN__REMOTE, oldRemote, remote));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLocalHome() {
-		return localHome;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLocalHome(String newLocalHome) {
-		String oldLocalHome = localHome;
-		localHome = newLocalHome;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.SESSION_BEAN__LOCAL_HOME, oldLocalHome, localHome));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLocal() {
-		return local;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLocal(String newLocal) {
-		String oldLocal = local;
-		local = newLocal;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.SESSION_BEAN__LOCAL, oldLocal, local));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getBusinessLocals() {
-		if (businessLocals == null) {
-			businessLocals = new EDataTypeEList(String.class, this, EjbPackage.SESSION_BEAN__BUSINESS_LOCALS);
-		}
-		return businessLocals;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getBusinessRemotes() {
-		if (businessRemotes == null) {
-			businessRemotes = new EDataTypeEList(String.class, this, EjbPackage.SESSION_BEAN__BUSINESS_REMOTES);
-		}
-		return businessRemotes;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getServiceEndpoint() {
-		return serviceEndpoint;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setServiceEndpoint(String newServiceEndpoint) {
-		String oldServiceEndpoint = serviceEndpoint;
-		serviceEndpoint = newServiceEndpoint;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.SESSION_BEAN__SERVICE_ENDPOINT, oldServiceEndpoint, serviceEndpoint));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getEjbClass() {
-		return ejbClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEjbClass(String newEjbClass) {
-		String oldEjbClass = ejbClass;
-		ejbClass = newEjbClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.SESSION_BEAN__EJB_CLASS, oldEjbClass, ejbClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SessionType getSessionType() {
-		return sessionType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSessionType(SessionType newSessionType) {
-		SessionType oldSessionType = sessionType;
-		sessionType = newSessionType == null ? SESSION_TYPE_EDEFAULT : newSessionType;
-		boolean oldSessionTypeESet = sessionTypeESet;
-		sessionTypeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.SESSION_BEAN__SESSION_TYPE, oldSessionType, sessionType, !oldSessionTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetSessionType() {
-		SessionType oldSessionType = sessionType;
-		boolean oldSessionTypeESet = sessionTypeESet;
-		sessionType = SESSION_TYPE_EDEFAULT;
-		sessionTypeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.SESSION_BEAN__SESSION_TYPE, oldSessionType, SESSION_TYPE_EDEFAULT, oldSessionTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetSessionType() {
-		return sessionTypeESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NamedMethodType getTimeoutMethod() {
-		return timeoutMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetTimeoutMethod(NamedMethodType newTimeoutMethod, NotificationChain msgs) {
-		NamedMethodType oldTimeoutMethod = timeoutMethod;
-		timeoutMethod = newTimeoutMethod;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.SESSION_BEAN__TIMEOUT_METHOD, oldTimeoutMethod, newTimeoutMethod);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTimeoutMethod(NamedMethodType newTimeoutMethod) {
-		if (newTimeoutMethod != timeoutMethod) {
-			NotificationChain msgs = null;
-			if (timeoutMethod != null)
-				msgs = ((InternalEObject)timeoutMethod).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.SESSION_BEAN__TIMEOUT_METHOD, null, msgs);
-			if (newTimeoutMethod != null)
-				msgs = ((InternalEObject)newTimeoutMethod).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EjbPackage.SESSION_BEAN__TIMEOUT_METHOD, null, msgs);
-			msgs = basicSetTimeoutMethod(newTimeoutMethod, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.SESSION_BEAN__TIMEOUT_METHOD, newTimeoutMethod, newTimeoutMethod));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getInitMethods() {
-		if (initMethods == null) {
-			initMethods = new EObjectContainmentEList(InitMethodType.class, this, EjbPackage.SESSION_BEAN__INIT_METHODS);
-		}
-		return initMethods;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getRemoveMethods() {
-		if (removeMethods == null) {
-			removeMethods = new EObjectContainmentEList(RemoveMethodType.class, this, EjbPackage.SESSION_BEAN__REMOVE_METHODS);
-		}
-		return removeMethods;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TransactionType getTransactionType() {
-		return transactionType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTransactionType(TransactionType newTransactionType) {
-		TransactionType oldTransactionType = transactionType;
-		transactionType = newTransactionType == null ? TRANSACTION_TYPE_EDEFAULT : newTransactionType;
-		boolean oldTransactionTypeESet = transactionTypeESet;
-		transactionTypeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.SESSION_BEAN__TRANSACTION_TYPE, oldTransactionType, transactionType, !oldTransactionTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetTransactionType() {
-		TransactionType oldTransactionType = transactionType;
-		boolean oldTransactionTypeESet = transactionTypeESet;
-		transactionType = TRANSACTION_TYPE_EDEFAULT;
-		transactionTypeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.SESSION_BEAN__TRANSACTION_TYPE, oldTransactionType, TRANSACTION_TYPE_EDEFAULT, oldTransactionTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetTransactionType() {
-		return transactionTypeESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getAroundInvokes() {
-		if (aroundInvokes == null) {
-			aroundInvokes = new EObjectContainmentEList(AroundInvokeType.class, this, EjbPackage.SESSION_BEAN__AROUND_INVOKES);
-		}
-		return aroundInvokes;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getEnvEntries() {
-		if (envEntries == null) {
-			envEntries = new EObjectContainmentEList(EnvEntry.class, this, EjbPackage.SESSION_BEAN__ENV_ENTRIES);
-		}
-		return envEntries;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getEjbRefs() {
-		if (ejbRefs == null) {
-			ejbRefs = new EObjectContainmentEList(EjbRef.class, this, EjbPackage.SESSION_BEAN__EJB_REFS);
-		}
-		return ejbRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getEjbLocalRefs() {
-		if (ejbLocalRefs == null) {
-			ejbLocalRefs = new EObjectContainmentEList(EjbLocalRef.class, this, EjbPackage.SESSION_BEAN__EJB_LOCAL_REFS);
-		}
-		return ejbLocalRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getServiceRefs() {
-		if (serviceRefs == null) {
-			serviceRefs = new EObjectContainmentEList(ServiceRef.class, this, EjbPackage.SESSION_BEAN__SERVICE_REFS);
-		}
-		return serviceRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getResourceRefs() {
-		if (resourceRefs == null) {
-			resourceRefs = new EObjectContainmentEList(ResourceRef.class, this, EjbPackage.SESSION_BEAN__RESOURCE_REFS);
-		}
-		return resourceRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getResourceEnvRefs() {
-		if (resourceEnvRefs == null) {
-			resourceEnvRefs = new EObjectContainmentEList(ResourceEnvRef.class, this, EjbPackage.SESSION_BEAN__RESOURCE_ENV_REFS);
-		}
-		return resourceEnvRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getMessageDestinationRefs() {
-		if (messageDestinationRefs == null) {
-			messageDestinationRefs = new EObjectContainmentEList(MessageDestinationRef.class, this, EjbPackage.SESSION_BEAN__MESSAGE_DESTINATION_REFS);
-		}
-		return messageDestinationRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPersistenceContextRefs() {
-		if (persistenceContextRefs == null) {
-			persistenceContextRefs = new EObjectContainmentEList(PersistenceContextRef.class, this, EjbPackage.SESSION_BEAN__PERSISTENCE_CONTEXT_REFS);
-		}
-		return persistenceContextRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPersistenceUnitRefs() {
-		if (persistenceUnitRefs == null) {
-			persistenceUnitRefs = new EObjectContainmentEList(PersistenceUnitRef.class, this, EjbPackage.SESSION_BEAN__PERSISTENCE_UNIT_REFS);
-		}
-		return persistenceUnitRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPostConstructs() {
-		if (postConstructs == null) {
-			postConstructs = new EObjectContainmentEList(LifecycleCallback.class, this, EjbPackage.SESSION_BEAN__POST_CONSTRUCTS);
-		}
-		return postConstructs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPreDestroys() {
-		if (preDestroys == null) {
-			preDestroys = new EObjectContainmentEList(LifecycleCallback.class, this, EjbPackage.SESSION_BEAN__PRE_DESTROYS);
-		}
-		return preDestroys;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPostActivates() {
-		if (postActivates == null) {
-			postActivates = new EObjectContainmentEList(LifecycleCallback.class, this, EjbPackage.SESSION_BEAN__POST_ACTIVATES);
-		}
-		return postActivates;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPrePassivates() {
-		if (prePassivates == null) {
-			prePassivates = new EObjectContainmentEList(LifecycleCallback.class, this, EjbPackage.SESSION_BEAN__PRE_PASSIVATES);
-		}
-		return prePassivates;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getSecurityRoleRefs() {
-		if (securityRoleRefs == null) {
-			securityRoleRefs = new EObjectContainmentEList(SecurityRoleRef.class, this, EjbPackage.SESSION_BEAN__SECURITY_ROLE_REFS);
-		}
-		return securityRoleRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SecurityIdentityType getSecurityIdentities() {
-		return securityIdentities;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetSecurityIdentities(SecurityIdentityType newSecurityIdentities, NotificationChain msgs) {
-		SecurityIdentityType oldSecurityIdentities = securityIdentities;
-		securityIdentities = newSecurityIdentities;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.SESSION_BEAN__SECURITY_IDENTITIES, oldSecurityIdentities, newSecurityIdentities);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSecurityIdentities(SecurityIdentityType newSecurityIdentities) {
-		if (newSecurityIdentities != securityIdentities) {
-			NotificationChain msgs = null;
-			if (securityIdentities != null)
-				msgs = ((InternalEObject)securityIdentities).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.SESSION_BEAN__SECURITY_IDENTITIES, null, msgs);
-			if (newSecurityIdentities != null)
-				msgs = ((InternalEObject)newSecurityIdentities).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EjbPackage.SESSION_BEAN__SECURITY_IDENTITIES, null, msgs);
-			msgs = basicSetSecurityIdentities(newSecurityIdentities, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.SESSION_BEAN__SECURITY_IDENTITIES, newSecurityIdentities, newSecurityIdentities));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.SESSION_BEAN__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.SESSION_BEAN__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-			case EjbPackage.SESSION_BEAN__DISPLAY_NAMES:
-				return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
-			case EjbPackage.SESSION_BEAN__ICONS:
-				return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
-			case EjbPackage.SESSION_BEAN__TIMEOUT_METHOD:
-				return basicSetTimeoutMethod(null, msgs);
-			case EjbPackage.SESSION_BEAN__INIT_METHODS:
-				return ((InternalEList)getInitMethods()).basicRemove(otherEnd, msgs);
-			case EjbPackage.SESSION_BEAN__REMOVE_METHODS:
-				return ((InternalEList)getRemoveMethods()).basicRemove(otherEnd, msgs);
-			case EjbPackage.SESSION_BEAN__AROUND_INVOKES:
-				return ((InternalEList)getAroundInvokes()).basicRemove(otherEnd, msgs);
-			case EjbPackage.SESSION_BEAN__ENV_ENTRIES:
-				return ((InternalEList)getEnvEntries()).basicRemove(otherEnd, msgs);
-			case EjbPackage.SESSION_BEAN__EJB_REFS:
-				return ((InternalEList)getEjbRefs()).basicRemove(otherEnd, msgs);
-			case EjbPackage.SESSION_BEAN__EJB_LOCAL_REFS:
-				return ((InternalEList)getEjbLocalRefs()).basicRemove(otherEnd, msgs);
-			case EjbPackage.SESSION_BEAN__SERVICE_REFS:
-				return ((InternalEList)getServiceRefs()).basicRemove(otherEnd, msgs);
-			case EjbPackage.SESSION_BEAN__RESOURCE_REFS:
-				return ((InternalEList)getResourceRefs()).basicRemove(otherEnd, msgs);
-			case EjbPackage.SESSION_BEAN__RESOURCE_ENV_REFS:
-				return ((InternalEList)getResourceEnvRefs()).basicRemove(otherEnd, msgs);
-			case EjbPackage.SESSION_BEAN__MESSAGE_DESTINATION_REFS:
-				return ((InternalEList)getMessageDestinationRefs()).basicRemove(otherEnd, msgs);
-			case EjbPackage.SESSION_BEAN__PERSISTENCE_CONTEXT_REFS:
-				return ((InternalEList)getPersistenceContextRefs()).basicRemove(otherEnd, msgs);
-			case EjbPackage.SESSION_BEAN__PERSISTENCE_UNIT_REFS:
-				return ((InternalEList)getPersistenceUnitRefs()).basicRemove(otherEnd, msgs);
-			case EjbPackage.SESSION_BEAN__POST_CONSTRUCTS:
-				return ((InternalEList)getPostConstructs()).basicRemove(otherEnd, msgs);
-			case EjbPackage.SESSION_BEAN__PRE_DESTROYS:
-				return ((InternalEList)getPreDestroys()).basicRemove(otherEnd, msgs);
-			case EjbPackage.SESSION_BEAN__POST_ACTIVATES:
-				return ((InternalEList)getPostActivates()).basicRemove(otherEnd, msgs);
-			case EjbPackage.SESSION_BEAN__PRE_PASSIVATES:
-				return ((InternalEList)getPrePassivates()).basicRemove(otherEnd, msgs);
-			case EjbPackage.SESSION_BEAN__SECURITY_ROLE_REFS:
-				return ((InternalEList)getSecurityRoleRefs()).basicRemove(otherEnd, msgs);
-			case EjbPackage.SESSION_BEAN__SECURITY_IDENTITIES:
-				return basicSetSecurityIdentities(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.SESSION_BEAN__DESCRIPTIONS:
-				return getDescriptions();
-			case EjbPackage.SESSION_BEAN__DISPLAY_NAMES:
-				return getDisplayNames();
-			case EjbPackage.SESSION_BEAN__ICONS:
-				return getIcons();
-			case EjbPackage.SESSION_BEAN__EJB_NAME:
-				return getEjbName();
-			case EjbPackage.SESSION_BEAN__MAPPED_NAME:
-				return getMappedName();
-			case EjbPackage.SESSION_BEAN__HOME:
-				return getHome();
-			case EjbPackage.SESSION_BEAN__REMOTE:
-				return getRemote();
-			case EjbPackage.SESSION_BEAN__LOCAL_HOME:
-				return getLocalHome();
-			case EjbPackage.SESSION_BEAN__LOCAL:
-				return getLocal();
-			case EjbPackage.SESSION_BEAN__BUSINESS_LOCALS:
-				return getBusinessLocals();
-			case EjbPackage.SESSION_BEAN__BUSINESS_REMOTES:
-				return getBusinessRemotes();
-			case EjbPackage.SESSION_BEAN__SERVICE_ENDPOINT:
-				return getServiceEndpoint();
-			case EjbPackage.SESSION_BEAN__EJB_CLASS:
-				return getEjbClass();
-			case EjbPackage.SESSION_BEAN__SESSION_TYPE:
-				return getSessionType();
-			case EjbPackage.SESSION_BEAN__TIMEOUT_METHOD:
-				return getTimeoutMethod();
-			case EjbPackage.SESSION_BEAN__INIT_METHODS:
-				return getInitMethods();
-			case EjbPackage.SESSION_BEAN__REMOVE_METHODS:
-				return getRemoveMethods();
-			case EjbPackage.SESSION_BEAN__TRANSACTION_TYPE:
-				return getTransactionType();
-			case EjbPackage.SESSION_BEAN__AROUND_INVOKES:
-				return getAroundInvokes();
-			case EjbPackage.SESSION_BEAN__ENV_ENTRIES:
-				return getEnvEntries();
-			case EjbPackage.SESSION_BEAN__EJB_REFS:
-				return getEjbRefs();
-			case EjbPackage.SESSION_BEAN__EJB_LOCAL_REFS:
-				return getEjbLocalRefs();
-			case EjbPackage.SESSION_BEAN__SERVICE_REFS:
-				return getServiceRefs();
-			case EjbPackage.SESSION_BEAN__RESOURCE_REFS:
-				return getResourceRefs();
-			case EjbPackage.SESSION_BEAN__RESOURCE_ENV_REFS:
-				return getResourceEnvRefs();
-			case EjbPackage.SESSION_BEAN__MESSAGE_DESTINATION_REFS:
-				return getMessageDestinationRefs();
-			case EjbPackage.SESSION_BEAN__PERSISTENCE_CONTEXT_REFS:
-				return getPersistenceContextRefs();
-			case EjbPackage.SESSION_BEAN__PERSISTENCE_UNIT_REFS:
-				return getPersistenceUnitRefs();
-			case EjbPackage.SESSION_BEAN__POST_CONSTRUCTS:
-				return getPostConstructs();
-			case EjbPackage.SESSION_BEAN__PRE_DESTROYS:
-				return getPreDestroys();
-			case EjbPackage.SESSION_BEAN__POST_ACTIVATES:
-				return getPostActivates();
-			case EjbPackage.SESSION_BEAN__PRE_PASSIVATES:
-				return getPrePassivates();
-			case EjbPackage.SESSION_BEAN__SECURITY_ROLE_REFS:
-				return getSecurityRoleRefs();
-			case EjbPackage.SESSION_BEAN__SECURITY_IDENTITIES:
-				return getSecurityIdentities();
-			case EjbPackage.SESSION_BEAN__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.SESSION_BEAN__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case EjbPackage.SESSION_BEAN__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				getDisplayNames().addAll((Collection)newValue);
-				return;
-			case EjbPackage.SESSION_BEAN__ICONS:
-				getIcons().clear();
-				getIcons().addAll((Collection)newValue);
-				return;
-			case EjbPackage.SESSION_BEAN__EJB_NAME:
-				setEjbName((String)newValue);
-				return;
-			case EjbPackage.SESSION_BEAN__MAPPED_NAME:
-				setMappedName((String)newValue);
-				return;
-			case EjbPackage.SESSION_BEAN__HOME:
-				setHome((String)newValue);
-				return;
-			case EjbPackage.SESSION_BEAN__REMOTE:
-				setRemote((String)newValue);
-				return;
-			case EjbPackage.SESSION_BEAN__LOCAL_HOME:
-				setLocalHome((String)newValue);
-				return;
-			case EjbPackage.SESSION_BEAN__LOCAL:
-				setLocal((String)newValue);
-				return;
-			case EjbPackage.SESSION_BEAN__BUSINESS_LOCALS:
-				getBusinessLocals().clear();
-				getBusinessLocals().addAll((Collection)newValue);
-				return;
-			case EjbPackage.SESSION_BEAN__BUSINESS_REMOTES:
-				getBusinessRemotes().clear();
-				getBusinessRemotes().addAll((Collection)newValue);
-				return;
-			case EjbPackage.SESSION_BEAN__SERVICE_ENDPOINT:
-				setServiceEndpoint((String)newValue);
-				return;
-			case EjbPackage.SESSION_BEAN__EJB_CLASS:
-				setEjbClass((String)newValue);
-				return;
-			case EjbPackage.SESSION_BEAN__SESSION_TYPE:
-				setSessionType((SessionType)newValue);
-				return;
-			case EjbPackage.SESSION_BEAN__TIMEOUT_METHOD:
-				setTimeoutMethod((NamedMethodType)newValue);
-				return;
-			case EjbPackage.SESSION_BEAN__INIT_METHODS:
-				getInitMethods().clear();
-				getInitMethods().addAll((Collection)newValue);
-				return;
-			case EjbPackage.SESSION_BEAN__REMOVE_METHODS:
-				getRemoveMethods().clear();
-				getRemoveMethods().addAll((Collection)newValue);
-				return;
-			case EjbPackage.SESSION_BEAN__TRANSACTION_TYPE:
-				setTransactionType((TransactionType)newValue);
-				return;
-			case EjbPackage.SESSION_BEAN__AROUND_INVOKES:
-				getAroundInvokes().clear();
-				getAroundInvokes().addAll((Collection)newValue);
-				return;
-			case EjbPackage.SESSION_BEAN__ENV_ENTRIES:
-				getEnvEntries().clear();
-				getEnvEntries().addAll((Collection)newValue);
-				return;
-			case EjbPackage.SESSION_BEAN__EJB_REFS:
-				getEjbRefs().clear();
-				getEjbRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.SESSION_BEAN__EJB_LOCAL_REFS:
-				getEjbLocalRefs().clear();
-				getEjbLocalRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.SESSION_BEAN__SERVICE_REFS:
-				getServiceRefs().clear();
-				getServiceRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.SESSION_BEAN__RESOURCE_REFS:
-				getResourceRefs().clear();
-				getResourceRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.SESSION_BEAN__RESOURCE_ENV_REFS:
-				getResourceEnvRefs().clear();
-				getResourceEnvRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.SESSION_BEAN__MESSAGE_DESTINATION_REFS:
-				getMessageDestinationRefs().clear();
-				getMessageDestinationRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.SESSION_BEAN__PERSISTENCE_CONTEXT_REFS:
-				getPersistenceContextRefs().clear();
-				getPersistenceContextRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.SESSION_BEAN__PERSISTENCE_UNIT_REFS:
-				getPersistenceUnitRefs().clear();
-				getPersistenceUnitRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.SESSION_BEAN__POST_CONSTRUCTS:
-				getPostConstructs().clear();
-				getPostConstructs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.SESSION_BEAN__PRE_DESTROYS:
-				getPreDestroys().clear();
-				getPreDestroys().addAll((Collection)newValue);
-				return;
-			case EjbPackage.SESSION_BEAN__POST_ACTIVATES:
-				getPostActivates().clear();
-				getPostActivates().addAll((Collection)newValue);
-				return;
-			case EjbPackage.SESSION_BEAN__PRE_PASSIVATES:
-				getPrePassivates().clear();
-				getPrePassivates().addAll((Collection)newValue);
-				return;
-			case EjbPackage.SESSION_BEAN__SECURITY_ROLE_REFS:
-				getSecurityRoleRefs().clear();
-				getSecurityRoleRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.SESSION_BEAN__SECURITY_IDENTITIES:
-				setSecurityIdentities((SecurityIdentityType)newValue);
-				return;
-			case EjbPackage.SESSION_BEAN__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.SESSION_BEAN__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case EjbPackage.SESSION_BEAN__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				return;
-			case EjbPackage.SESSION_BEAN__ICONS:
-				getIcons().clear();
-				return;
-			case EjbPackage.SESSION_BEAN__EJB_NAME:
-				setEjbName(EJB_NAME_EDEFAULT);
-				return;
-			case EjbPackage.SESSION_BEAN__MAPPED_NAME:
-				setMappedName(MAPPED_NAME_EDEFAULT);
-				return;
-			case EjbPackage.SESSION_BEAN__HOME:
-				setHome(HOME_EDEFAULT);
-				return;
-			case EjbPackage.SESSION_BEAN__REMOTE:
-				setRemote(REMOTE_EDEFAULT);
-				return;
-			case EjbPackage.SESSION_BEAN__LOCAL_HOME:
-				setLocalHome(LOCAL_HOME_EDEFAULT);
-				return;
-			case EjbPackage.SESSION_BEAN__LOCAL:
-				setLocal(LOCAL_EDEFAULT);
-				return;
-			case EjbPackage.SESSION_BEAN__BUSINESS_LOCALS:
-				getBusinessLocals().clear();
-				return;
-			case EjbPackage.SESSION_BEAN__BUSINESS_REMOTES:
-				getBusinessRemotes().clear();
-				return;
-			case EjbPackage.SESSION_BEAN__SERVICE_ENDPOINT:
-				setServiceEndpoint(SERVICE_ENDPOINT_EDEFAULT);
-				return;
-			case EjbPackage.SESSION_BEAN__EJB_CLASS:
-				setEjbClass(EJB_CLASS_EDEFAULT);
-				return;
-			case EjbPackage.SESSION_BEAN__SESSION_TYPE:
-				unsetSessionType();
-				return;
-			case EjbPackage.SESSION_BEAN__TIMEOUT_METHOD:
-				setTimeoutMethod((NamedMethodType)null);
-				return;
-			case EjbPackage.SESSION_BEAN__INIT_METHODS:
-				getInitMethods().clear();
-				return;
-			case EjbPackage.SESSION_BEAN__REMOVE_METHODS:
-				getRemoveMethods().clear();
-				return;
-			case EjbPackage.SESSION_BEAN__TRANSACTION_TYPE:
-				unsetTransactionType();
-				return;
-			case EjbPackage.SESSION_BEAN__AROUND_INVOKES:
-				getAroundInvokes().clear();
-				return;
-			case EjbPackage.SESSION_BEAN__ENV_ENTRIES:
-				getEnvEntries().clear();
-				return;
-			case EjbPackage.SESSION_BEAN__EJB_REFS:
-				getEjbRefs().clear();
-				return;
-			case EjbPackage.SESSION_BEAN__EJB_LOCAL_REFS:
-				getEjbLocalRefs().clear();
-				return;
-			case EjbPackage.SESSION_BEAN__SERVICE_REFS:
-				getServiceRefs().clear();
-				return;
-			case EjbPackage.SESSION_BEAN__RESOURCE_REFS:
-				getResourceRefs().clear();
-				return;
-			case EjbPackage.SESSION_BEAN__RESOURCE_ENV_REFS:
-				getResourceEnvRefs().clear();
-				return;
-			case EjbPackage.SESSION_BEAN__MESSAGE_DESTINATION_REFS:
-				getMessageDestinationRefs().clear();
-				return;
-			case EjbPackage.SESSION_BEAN__PERSISTENCE_CONTEXT_REFS:
-				getPersistenceContextRefs().clear();
-				return;
-			case EjbPackage.SESSION_BEAN__PERSISTENCE_UNIT_REFS:
-				getPersistenceUnitRefs().clear();
-				return;
-			case EjbPackage.SESSION_BEAN__POST_CONSTRUCTS:
-				getPostConstructs().clear();
-				return;
-			case EjbPackage.SESSION_BEAN__PRE_DESTROYS:
-				getPreDestroys().clear();
-				return;
-			case EjbPackage.SESSION_BEAN__POST_ACTIVATES:
-				getPostActivates().clear();
-				return;
-			case EjbPackage.SESSION_BEAN__PRE_PASSIVATES:
-				getPrePassivates().clear();
-				return;
-			case EjbPackage.SESSION_BEAN__SECURITY_ROLE_REFS:
-				getSecurityRoleRefs().clear();
-				return;
-			case EjbPackage.SESSION_BEAN__SECURITY_IDENTITIES:
-				setSecurityIdentities((SecurityIdentityType)null);
-				return;
-			case EjbPackage.SESSION_BEAN__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.SESSION_BEAN__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case EjbPackage.SESSION_BEAN__DISPLAY_NAMES:
-				return displayNames != null && !displayNames.isEmpty();
-			case EjbPackage.SESSION_BEAN__ICONS:
-				return icons != null && !icons.isEmpty();
-			case EjbPackage.SESSION_BEAN__EJB_NAME:
-				return EJB_NAME_EDEFAULT == null ? ejbName != null : !EJB_NAME_EDEFAULT.equals(ejbName);
-			case EjbPackage.SESSION_BEAN__MAPPED_NAME:
-				return MAPPED_NAME_EDEFAULT == null ? mappedName != null : !MAPPED_NAME_EDEFAULT.equals(mappedName);
-			case EjbPackage.SESSION_BEAN__HOME:
-				return HOME_EDEFAULT == null ? home != null : !HOME_EDEFAULT.equals(home);
-			case EjbPackage.SESSION_BEAN__REMOTE:
-				return REMOTE_EDEFAULT == null ? remote != null : !REMOTE_EDEFAULT.equals(remote);
-			case EjbPackage.SESSION_BEAN__LOCAL_HOME:
-				return LOCAL_HOME_EDEFAULT == null ? localHome != null : !LOCAL_HOME_EDEFAULT.equals(localHome);
-			case EjbPackage.SESSION_BEAN__LOCAL:
-				return LOCAL_EDEFAULT == null ? local != null : !LOCAL_EDEFAULT.equals(local);
-			case EjbPackage.SESSION_BEAN__BUSINESS_LOCALS:
-				return businessLocals != null && !businessLocals.isEmpty();
-			case EjbPackage.SESSION_BEAN__BUSINESS_REMOTES:
-				return businessRemotes != null && !businessRemotes.isEmpty();
-			case EjbPackage.SESSION_BEAN__SERVICE_ENDPOINT:
-				return SERVICE_ENDPOINT_EDEFAULT == null ? serviceEndpoint != null : !SERVICE_ENDPOINT_EDEFAULT.equals(serviceEndpoint);
-			case EjbPackage.SESSION_BEAN__EJB_CLASS:
-				return EJB_CLASS_EDEFAULT == null ? ejbClass != null : !EJB_CLASS_EDEFAULT.equals(ejbClass);
-			case EjbPackage.SESSION_BEAN__SESSION_TYPE:
-				return isSetSessionType();
-			case EjbPackage.SESSION_BEAN__TIMEOUT_METHOD:
-				return timeoutMethod != null;
-			case EjbPackage.SESSION_BEAN__INIT_METHODS:
-				return initMethods != null && !initMethods.isEmpty();
-			case EjbPackage.SESSION_BEAN__REMOVE_METHODS:
-				return removeMethods != null && !removeMethods.isEmpty();
-			case EjbPackage.SESSION_BEAN__TRANSACTION_TYPE:
-				return isSetTransactionType();
-			case EjbPackage.SESSION_BEAN__AROUND_INVOKES:
-				return aroundInvokes != null && !aroundInvokes.isEmpty();
-			case EjbPackage.SESSION_BEAN__ENV_ENTRIES:
-				return envEntries != null && !envEntries.isEmpty();
-			case EjbPackage.SESSION_BEAN__EJB_REFS:
-				return ejbRefs != null && !ejbRefs.isEmpty();
-			case EjbPackage.SESSION_BEAN__EJB_LOCAL_REFS:
-				return ejbLocalRefs != null && !ejbLocalRefs.isEmpty();
-			case EjbPackage.SESSION_BEAN__SERVICE_REFS:
-				return serviceRefs != null && !serviceRefs.isEmpty();
-			case EjbPackage.SESSION_BEAN__RESOURCE_REFS:
-				return resourceRefs != null && !resourceRefs.isEmpty();
-			case EjbPackage.SESSION_BEAN__RESOURCE_ENV_REFS:
-				return resourceEnvRefs != null && !resourceEnvRefs.isEmpty();
-			case EjbPackage.SESSION_BEAN__MESSAGE_DESTINATION_REFS:
-				return messageDestinationRefs != null && !messageDestinationRefs.isEmpty();
-			case EjbPackage.SESSION_BEAN__PERSISTENCE_CONTEXT_REFS:
-				return persistenceContextRefs != null && !persistenceContextRefs.isEmpty();
-			case EjbPackage.SESSION_BEAN__PERSISTENCE_UNIT_REFS:
-				return persistenceUnitRefs != null && !persistenceUnitRefs.isEmpty();
-			case EjbPackage.SESSION_BEAN__POST_CONSTRUCTS:
-				return postConstructs != null && !postConstructs.isEmpty();
-			case EjbPackage.SESSION_BEAN__PRE_DESTROYS:
-				return preDestroys != null && !preDestroys.isEmpty();
-			case EjbPackage.SESSION_BEAN__POST_ACTIVATES:
-				return postActivates != null && !postActivates.isEmpty();
-			case EjbPackage.SESSION_BEAN__PRE_PASSIVATES:
-				return prePassivates != null && !prePassivates.isEmpty();
-			case EjbPackage.SESSION_BEAN__SECURITY_ROLE_REFS:
-				return securityRoleRefs != null && !securityRoleRefs.isEmpty();
-			case EjbPackage.SESSION_BEAN__SECURITY_IDENTITIES:
-				return securityIdentities != null;
-			case EjbPackage.SESSION_BEAN__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (ejbName: "); //$NON-NLS-1$
-		result.append(ejbName);
-		result.append(", mappedName: "); //$NON-NLS-1$
-		result.append(mappedName);
-		result.append(", home: "); //$NON-NLS-1$
-		result.append(home);
-		result.append(", remote: "); //$NON-NLS-1$
-		result.append(remote);
-		result.append(", localHome: "); //$NON-NLS-1$
-		result.append(localHome);
-		result.append(", local: "); //$NON-NLS-1$
-		result.append(local);
-		result.append(", businessLocals: "); //$NON-NLS-1$
-		result.append(businessLocals);
-		result.append(", businessRemotes: "); //$NON-NLS-1$
-		result.append(businessRemotes);
-		result.append(", serviceEndpoint: "); //$NON-NLS-1$
-		result.append(serviceEndpoint);
-		result.append(", ejbClass: "); //$NON-NLS-1$
-		result.append(ejbClass);
-		result.append(", sessionType: "); //$NON-NLS-1$
-		if (sessionTypeESet) result.append(sessionType); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(", transactionType: "); //$NON-NLS-1$
-		if (transactionTypeESet) result.append(transactionType); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //SessionBeanImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/metadata/EjbPackage.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/metadata/EjbPackage.java
deleted file mode 100644
index 174753563..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/metadata/EjbPackage.java
+++ /dev/null
@@ -1,8589 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb.internal.metadata;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.jst.javaee.ejb.EjbFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> 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>
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * 
- *       @(#)ejb-jar_3_0.xsds	1.51 02/23/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, javaee,
- *       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 EJB 3.0 deployment descriptor.
- * 	The deployment descriptor must be named "META-INF/ejb-jar.xml" in
- * 	the EJB's jar file.  All EJB deployment descriptors must indicate
- * 	the ejb-jar 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;ejb-jar xmlns="http://java.sun.com/xml/ns/javaee"
- * 	      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- * 	      xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- * 		  http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"
- * 	      version="3.0"&gt;
- * 	      ...
- * 	    &lt;/ejb-jar&gt;
- * 
- * 	The instance documents may indicate the published version of
- * 	the schema using the xsi:schemaLocation attribute for the
- * 	Java EE namespace with the following location:
- * 
- * 	http://java.sun.com/xml/ns/javaee/ejb-jar_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
- *     
- * 
- * 
- *       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.
- * 
- *     
- * 
- * 
- * 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
- *     
- * 
- * 
- *       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.
- * 
- *     
- * 
- * 
- *       (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:
- * 
- *     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.
- *   
- *     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
- *   
- * 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.
- * 
- *         &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.
- *   
- * <!-- end-model-doc -->
- * @see org.eclipse.jst.javaee.ejb.EjbFactory
- * @generated
- */
-public interface EjbPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "ejb"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	String eNS_URI = "http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "ejb"; //$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	EjbPackage eINSTANCE = org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.ActivationConfigImpl <em>Activation Config</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.ActivationConfigImpl
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getActivationConfig()
-	 * @generated
-	 */
-	int ACTIVATION_CONFIG = 0;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVATION_CONFIG__DESCRIPTIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Activation Config Properties</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVATION_CONFIG__ACTIVATION_CONFIG_PROPERTIES = 1;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVATION_CONFIG__ID = 2;
-
-	/**
-	 * The number of structural features of the '<em>Activation Config</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVATION_CONFIG_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.ActivationConfigPropertyImpl <em>Activation Config Property</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.ActivationConfigPropertyImpl
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getActivationConfigProperty()
-	 * @generated
-	 */
-	int ACTIVATION_CONFIG_PROPERTY = 1;
-
-	/**
-	 * The feature id for the '<em><b>Activation Config Property Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVATION_CONFIG_PROPERTY__ACTIVATION_CONFIG_PROPERTY_NAME = 0;
-
-	/**
-	 * The feature id for the '<em><b>Activation Config Property Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVATION_CONFIG_PROPERTY__ACTIVATION_CONFIG_PROPERTY_VALUE = 1;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVATION_CONFIG_PROPERTY__ID = 2;
-
-	/**
-	 * The number of structural features of the '<em>Activation Config Property</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVATION_CONFIG_PROPERTY_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.ApplicationExceptionImpl <em>Application Exception</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.ApplicationExceptionImpl
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getApplicationException()
-	 * @generated
-	 */
-	int APPLICATION_EXCEPTION = 2;
-
-	/**
-	 * The feature id for the '<em><b>Exception Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_EXCEPTION__EXCEPTION_CLASS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Rollback</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_EXCEPTION__ROLLBACK = 1;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_EXCEPTION__ID = 2;
-
-	/**
-	 * The number of structural features of the '<em>Application Exception</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_EXCEPTION_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.AroundInvokeTypeImpl <em>Around Invoke Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.AroundInvokeTypeImpl
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getAroundInvokeType()
-	 * @generated
-	 */
-	int AROUND_INVOKE_TYPE = 3;
-
-	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AROUND_INVOKE_TYPE__CLASS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Method Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AROUND_INVOKE_TYPE__METHOD_NAME = 1;
-
-	/**
-	 * The number of structural features of the '<em>Around Invoke Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AROUND_INVOKE_TYPE_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.AssemblyDescriptorImpl <em>Assembly Descriptor</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.AssemblyDescriptorImpl
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getAssemblyDescriptor()
-	 * @generated
-	 */
-	int ASSEMBLY_DESCRIPTOR = 4;
-
-	/**
-	 * The feature id for the '<em><b>Security Roles</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSEMBLY_DESCRIPTOR__SECURITY_ROLES = 0;
-
-	/**
-	 * The feature id for the '<em><b>Method Permissions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSEMBLY_DESCRIPTOR__METHOD_PERMISSIONS = 1;
-
-	/**
-	 * The feature id for the '<em><b>Container Transactions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSEMBLY_DESCRIPTOR__CONTAINER_TRANSACTIONS = 2;
-
-	/**
-	 * The feature id for the '<em><b>Interceptor Bindings</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSEMBLY_DESCRIPTOR__INTERCEPTOR_BINDINGS = 3;
-
-	/**
-	 * The feature id for the '<em><b>Message Destinations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSEMBLY_DESCRIPTOR__MESSAGE_DESTINATIONS = 4;
-
-	/**
-	 * The feature id for the '<em><b>Exclude List</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSEMBLY_DESCRIPTOR__EXCLUDE_LIST = 5;
-
-	/**
-	 * The feature id for the '<em><b>Application Exceptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSEMBLY_DESCRIPTOR__APPLICATION_EXCEPTIONS = 6;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSEMBLY_DESCRIPTOR__ID = 7;
-
-	/**
-	 * The number of structural features of the '<em>Assembly Descriptor</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSEMBLY_DESCRIPTOR_FEATURE_COUNT = 8;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.CMPFieldImpl <em>CMP Field</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.CMPFieldImpl
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getCMPField()
-	 * @generated
-	 */
-	int CMP_FIELD = 5;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMP_FIELD__DESCRIPTIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Field Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMP_FIELD__FIELD_NAME = 1;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMP_FIELD__ID = 2;
-
-	/**
-	 * The number of structural features of the '<em>CMP Field</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMP_FIELD_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.CMRFieldImpl <em>CMR Field</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.CMRFieldImpl
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getCMRField()
-	 * @generated
-	 */
-	int CMR_FIELD = 6;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMR_FIELD__DESCRIPTIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Cmr Field Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMR_FIELD__CMR_FIELD_NAME = 1;
-
-	/**
-	 * The feature id for the '<em><b>Cmr Field Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMR_FIELD__CMR_FIELD_TYPE = 2;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMR_FIELD__ID = 3;
-
-	/**
-	 * The number of structural features of the '<em>CMR Field</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMR_FIELD_FEATURE_COUNT = 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.ContainerTransactionTypeImpl <em>Container Transaction Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.ContainerTransactionTypeImpl
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getContainerTransactionType()
-	 * @generated
-	 */
-	int CONTAINER_TRANSACTION_TYPE = 7;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTAINER_TRANSACTION_TYPE__DESCRIPTIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Methods</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTAINER_TRANSACTION_TYPE__METHODS = 1;
-
-	/**
-	 * The feature id for the '<em><b>Trans Attribute</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTAINER_TRANSACTION_TYPE__TRANS_ATTRIBUTE = 2;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTAINER_TRANSACTION_TYPE__ID = 3;
-
-	/**
-	 * The number of structural features of the '<em>Container Transaction Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTAINER_TRANSACTION_TYPE_FEATURE_COUNT = 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl <em>EJB Jar</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getEJBJar()
-	 * @generated
-	 */
-	int EJB_JAR = 8;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_JAR__DESCRIPTIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_JAR__DISPLAY_NAMES = 1;
-
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_JAR__ICONS = 2;
-
-	/**
-	 * The feature id for the '<em><b>Enterprise Beans</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_JAR__ENTERPRISE_BEANS = 3;
-
-	/**
-	 * The feature id for the '<em><b>Interceptors</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_JAR__INTERCEPTORS = 4;
-
-	/**
-	 * The feature id for the '<em><b>Relationships</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_JAR__RELATIONSHIPS = 5;
-
-	/**
-	 * The feature id for the '<em><b>Assembly Descriptor</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_JAR__ASSEMBLY_DESCRIPTOR = 6;
-
-	/**
-	 * The feature id for the '<em><b>Ejb Client Jar</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_JAR__EJB_CLIENT_JAR = 7;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_JAR__ID = 8;
-
-	/**
-	 * The feature id for the '<em><b>Metadata Complete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_JAR__METADATA_COMPLETE = 9;
-
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_JAR__VERSION = 10;
-
-	/**
-	 * The number of structural features of the '<em>EJB Jar</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_JAR_FEATURE_COUNT = 11;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarDeploymentDescriptorImpl <em>EJB Jar Deployment Descriptor</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EJBJarDeploymentDescriptorImpl
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getEJBJarDeploymentDescriptor()
-	 * @generated
-	 */
-	int EJB_JAR_DEPLOYMENT_DESCRIPTOR = 9;
-
-	/**
-	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_JAR_DEPLOYMENT_DESCRIPTOR__MIXED = 0;
-
-	/**
-	 * The feature id for the '<em><b>XMLNS Prefix Map</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_JAR_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP = 1;
-
-	/**
-	 * The feature id for the '<em><b>XSI Schema Location</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_JAR_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION = 2;
-
-	/**
-	 * The feature id for the '<em><b>Ejb Jar</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_JAR_DEPLOYMENT_DESCRIPTOR__EJB_JAR = 3;
-
-	/**
-	 * The number of structural features of the '<em>EJB Jar Deployment Descriptor</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_JAR_DEPLOYMENT_DESCRIPTOR_FEATURE_COUNT = 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBRelationImpl <em>EJB Relation</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EJBRelationImpl
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getEJBRelation()
-	 * @generated
-	 */
-	int EJB_RELATION = 10;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_RELATION__DESCRIPTIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Ejb Relation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_RELATION__EJB_RELATION_NAME = 1;
-
-	/**
-	 * The feature id for the '<em><b>Ejb Relationship Roles</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_RELATION__EJB_RELATIONSHIP_ROLES = 2;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_RELATION__ID = 3;
-
-	/**
-	 * The number of structural features of the '<em>EJB Relation</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_RELATION_FEATURE_COUNT = 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBRelationshipRoleImpl <em>EJB Relationship Role</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EJBRelationshipRoleImpl
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getEJBRelationshipRole()
-	 * @generated
-	 */
-	int EJB_RELATIONSHIP_ROLE = 11;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_RELATIONSHIP_ROLE__DESCRIPTIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Ejb Relationship Role Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_RELATIONSHIP_ROLE__EJB_RELATIONSHIP_ROLE_NAME = 1;
-
-	/**
-	 * The feature id for the '<em><b>Multiplicity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_RELATIONSHIP_ROLE__MULTIPLICITY = 2;
-
-	/**
-	 * The feature id for the '<em><b>Cascade Delete</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_RELATIONSHIP_ROLE__CASCADE_DELETE = 3;
-
-	/**
-	 * The feature id for the '<em><b>Relationship Role Source</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_RELATIONSHIP_ROLE__RELATIONSHIP_ROLE_SOURCE = 4;
-
-	/**
-	 * The feature id for the '<em><b>Cmr Field</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_RELATIONSHIP_ROLE__CMR_FIELD = 5;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_RELATIONSHIP_ROLE__ID = 6;
-
-	/**
-	 * The number of structural features of the '<em>EJB Relationship Role</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_RELATIONSHIP_ROLE_FEATURE_COUNT = 7;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.EnterpriseBeansImpl <em>Enterprise Beans</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EnterpriseBeansImpl
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getEnterpriseBeans()
-	 * @generated
-	 */
-	int ENTERPRISE_BEANS = 12;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTERPRISE_BEANS__GROUP = 0;
-
-	/**
-	 * The feature id for the '<em><b>Session Beans</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTERPRISE_BEANS__SESSION_BEANS = 1;
-
-	/**
-	 * The feature id for the '<em><b>Entity Beans</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTERPRISE_BEANS__ENTITY_BEANS = 2;
-
-	/**
-	 * The feature id for the '<em><b>Message Driven Beans</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTERPRISE_BEANS__MESSAGE_DRIVEN_BEANS = 3;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTERPRISE_BEANS__ID = 4;
-
-	/**
-	 * The number of structural features of the '<em>Enterprise Beans</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTERPRISE_BEANS_FEATURE_COUNT = 5;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.EntityBeanImpl <em>Entity Bean</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EntityBeanImpl
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getEntityBean()
-	 * @generated
-	 */
-	int ENTITY_BEAN = 13;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY_BEAN__DESCRIPTIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY_BEAN__DISPLAY_NAMES = 1;
-
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY_BEAN__ICONS = 2;
-
-	/**
-	 * The feature id for the '<em><b>Ejb Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY_BEAN__EJB_NAME = 3;
-
-	/**
-	 * The feature id for the '<em><b>Mapped Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY_BEAN__MAPPED_NAME = 4;
-
-	/**
-	 * The feature id for the '<em><b>Home</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY_BEAN__HOME = 5;
-
-	/**
-	 * The feature id for the '<em><b>Remote</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY_BEAN__REMOTE = 6;
-
-	/**
-	 * The feature id for the '<em><b>Local Home</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY_BEAN__LOCAL_HOME = 7;
-
-	/**
-	 * The feature id for the '<em><b>Local</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY_BEAN__LOCAL = 8;
-
-	/**
-	 * The feature id for the '<em><b>Ejb Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY_BEAN__EJB_CLASS = 9;
-
-	/**
-	 * The feature id for the '<em><b>Persistence Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY_BEAN__PERSISTENCE_TYPE = 10;
-
-	/**
-	 * The feature id for the '<em><b>Prim Key Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY_BEAN__PRIM_KEY_CLASS = 11;
-
-	/**
-	 * The feature id for the '<em><b>Reentrant</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY_BEAN__REENTRANT = 12;
-
-	/**
-	 * The feature id for the '<em><b>Cmp Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY_BEAN__CMP_VERSION = 13;
-
-	/**
-	 * The feature id for the '<em><b>Abstract Schema Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY_BEAN__ABSTRACT_SCHEMA_NAME = 14;
-
-	/**
-	 * The feature id for the '<em><b>Cmp Fields</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY_BEAN__CMP_FIELDS = 15;
-
-	/**
-	 * The feature id for the '<em><b>Primkey Field</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY_BEAN__PRIMKEY_FIELD = 16;
-
-	/**
-	 * The feature id for the '<em><b>Env Entries</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY_BEAN__ENV_ENTRIES = 17;
-
-	/**
-	 * The feature id for the '<em><b>Ejb Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY_BEAN__EJB_REFS = 18;
-
-	/**
-	 * The feature id for the '<em><b>Ejb Local Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY_BEAN__EJB_LOCAL_REFS = 19;
-
-	/**
-	 * The feature id for the '<em><b>Service Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY_BEAN__SERVICE_REFS = 20;
-
-	/**
-	 * The feature id for the '<em><b>Resource Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY_BEAN__RESOURCE_REFS = 21;
-
-	/**
-	 * The feature id for the '<em><b>Resource Env Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY_BEAN__RESOURCE_ENV_REFS = 22;
-
-	/**
-	 * The feature id for the '<em><b>Message Destination Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY_BEAN__MESSAGE_DESTINATION_REFS = 23;
-
-	/**
-	 * The feature id for the '<em><b>Persistence Context Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY_BEAN__PERSISTENCE_CONTEXT_REFS = 24;
-
-	/**
-	 * The feature id for the '<em><b>Persistence Unit Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY_BEAN__PERSISTENCE_UNIT_REFS = 25;
-
-	/**
-	 * The feature id for the '<em><b>Post Constructs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY_BEAN__POST_CONSTRUCTS = 26;
-
-	/**
-	 * The feature id for the '<em><b>Pre Destroys</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY_BEAN__PRE_DESTROYS = 27;
-
-	/**
-	 * The feature id for the '<em><b>Security Role Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY_BEAN__SECURITY_ROLE_REFS = 28;
-
-	/**
-	 * The feature id for the '<em><b>Security Identity</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY_BEAN__SECURITY_IDENTITY = 29;
-
-	/**
-	 * The feature id for the '<em><b>Queries</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY_BEAN__QUERIES = 30;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY_BEAN__ID = 31;
-
-	/**
-	 * The number of structural features of the '<em>Entity Bean</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY_BEAN_FEATURE_COUNT = 32;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.ExcludeListImpl <em>Exclude List</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.ExcludeListImpl
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getExcludeList()
-	 * @generated
-	 */
-	int EXCLUDE_LIST = 14;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXCLUDE_LIST__DESCRIPTIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Methods</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXCLUDE_LIST__METHODS = 1;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXCLUDE_LIST__ID = 2;
-
-	/**
-	 * The number of structural features of the '<em>Exclude List</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXCLUDE_LIST_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.InitMethodTypeImpl <em>Init Method Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.InitMethodTypeImpl
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getInitMethodType()
-	 * @generated
-	 */
-	int INIT_METHOD_TYPE = 15;
-
-	/**
-	 * The feature id for the '<em><b>Create Method</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INIT_METHOD_TYPE__CREATE_METHOD = 0;
-
-	/**
-	 * The feature id for the '<em><b>Bean Method</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INIT_METHOD_TYPE__BEAN_METHOD = 1;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INIT_METHOD_TYPE__ID = 2;
-
-	/**
-	 * The number of structural features of the '<em>Init Method Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INIT_METHOD_TYPE_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorBindingTypeImpl <em>Interceptor Binding Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.InterceptorBindingTypeImpl
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getInterceptorBindingType()
-	 * @generated
-	 */
-	int INTERCEPTOR_BINDING_TYPE = 16;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERCEPTOR_BINDING_TYPE__DESCRIPTIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Ejb Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERCEPTOR_BINDING_TYPE__EJB_NAME = 1;
-
-	/**
-	 * The feature id for the '<em><b>Interceptor Classes</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERCEPTOR_BINDING_TYPE__INTERCEPTOR_CLASSES = 2;
-
-	/**
-	 * The feature id for the '<em><b>Interceptor Order</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERCEPTOR_BINDING_TYPE__INTERCEPTOR_ORDER = 3;
-
-	/**
-	 * The feature id for the '<em><b>Exclude Default Interceptors</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERCEPTOR_BINDING_TYPE__EXCLUDE_DEFAULT_INTERCEPTORS = 4;
-
-	/**
-	 * The feature id for the '<em><b>Exclude Class Interceptors</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERCEPTOR_BINDING_TYPE__EXCLUDE_CLASS_INTERCEPTORS = 5;
-
-	/**
-	 * The feature id for the '<em><b>Method</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERCEPTOR_BINDING_TYPE__METHOD = 6;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERCEPTOR_BINDING_TYPE__ID = 7;
-
-	/**
-	 * The number of structural features of the '<em>Interceptor Binding Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERCEPTOR_BINDING_TYPE_FEATURE_COUNT = 8;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorOrderTypeImpl <em>Interceptor Order Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.InterceptorOrderTypeImpl
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getInterceptorOrderType()
-	 * @generated
-	 */
-	int INTERCEPTOR_ORDER_TYPE = 17;
-
-	/**
-	 * The feature id for the '<em><b>Interceptor Classes</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERCEPTOR_ORDER_TYPE__INTERCEPTOR_CLASSES = 0;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERCEPTOR_ORDER_TYPE__ID = 1;
-
-	/**
-	 * The number of structural features of the '<em>Interceptor Order Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERCEPTOR_ORDER_TYPE_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorsTypeImpl <em>Interceptors Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.InterceptorsTypeImpl
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getInterceptorsType()
-	 * @generated
-	 */
-	int INTERCEPTORS_TYPE = 18;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERCEPTORS_TYPE__DESCRIPTIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Interceptors</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERCEPTORS_TYPE__INTERCEPTORS = 1;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERCEPTORS_TYPE__ID = 2;
-
-	/**
-	 * The number of structural features of the '<em>Interceptors Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERCEPTORS_TYPE_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl <em>Interceptor Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getInterceptorType()
-	 * @generated
-	 */
-	int INTERCEPTOR_TYPE = 19;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERCEPTOR_TYPE__DESCRIPTIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Interceptor Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERCEPTOR_TYPE__INTERCEPTOR_CLASS = 1;
-
-	/**
-	 * The feature id for the '<em><b>Around Invokes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERCEPTOR_TYPE__AROUND_INVOKES = 2;
-
-	/**
-	 * The feature id for the '<em><b>Env Entries</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERCEPTOR_TYPE__ENV_ENTRIES = 3;
-
-	/**
-	 * The feature id for the '<em><b>Ejb Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERCEPTOR_TYPE__EJB_REFS = 4;
-
-	/**
-	 * The feature id for the '<em><b>Ejb Local Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERCEPTOR_TYPE__EJB_LOCAL_REFS = 5;
-
-	/**
-	 * The feature id for the '<em><b>Service Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERCEPTOR_TYPE__SERVICE_REFS = 6;
-
-	/**
-	 * The feature id for the '<em><b>Resource Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERCEPTOR_TYPE__RESOURCE_REFS = 7;
-
-	/**
-	 * The feature id for the '<em><b>Resource Env Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERCEPTOR_TYPE__RESOURCE_ENV_REFS = 8;
-
-	/**
-	 * The feature id for the '<em><b>Message Destination Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERCEPTOR_TYPE__MESSAGE_DESTINATION_REFS = 9;
-
-	/**
-	 * The feature id for the '<em><b>Persistence Context Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERCEPTOR_TYPE__PERSISTENCE_CONTEXT_REFS = 10;
-
-	/**
-	 * The feature id for the '<em><b>Persistence Unit Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERCEPTOR_TYPE__PERSISTENCE_UNIT_REFS = 11;
-
-	/**
-	 * The feature id for the '<em><b>Post Constructs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERCEPTOR_TYPE__POST_CONSTRUCTS = 12;
-
-	/**
-	 * The feature id for the '<em><b>Pre Destroys</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERCEPTOR_TYPE__PRE_DESTROYS = 13;
-
-	/**
-	 * The feature id for the '<em><b>Post Activates</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERCEPTOR_TYPE__POST_ACTIVATES = 14;
-
-	/**
-	 * The feature id for the '<em><b>Pre Passivates</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERCEPTOR_TYPE__PRE_PASSIVATES = 15;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERCEPTOR_TYPE__ID = 16;
-
-	/**
-	 * The number of structural features of the '<em>Interceptor Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERCEPTOR_TYPE_FEATURE_COUNT = 17;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl <em>Message Driven Bean</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getMessageDrivenBean()
-	 * @generated
-	 */
-	int MESSAGE_DRIVEN_BEAN = 20;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN_BEAN__DESCRIPTIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN_BEAN__DISPLAY_NAMES = 1;
-
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN_BEAN__ICONS = 2;
-
-	/**
-	 * The feature id for the '<em><b>Ejb Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN_BEAN__EJB_NAME = 3;
-
-	/**
-	 * The feature id for the '<em><b>Mapped Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN_BEAN__MAPPED_NAME = 4;
-
-	/**
-	 * The feature id for the '<em><b>Ejb Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN_BEAN__EJB_CLASS = 5;
-
-	/**
-	 * The feature id for the '<em><b>Messaging Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN_BEAN__MESSAGING_TYPE = 6;
-
-	/**
-	 * The feature id for the '<em><b>Timeout Method</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN_BEAN__TIMEOUT_METHOD = 7;
-
-	/**
-	 * The feature id for the '<em><b>Transaction Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN_BEAN__TRANSACTION_TYPE = 8;
-
-	/**
-	 * The feature id for the '<em><b>Message Destination Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN_BEAN__MESSAGE_DESTINATION_TYPE = 9;
-
-	/**
-	 * The feature id for the '<em><b>Message Destination Link</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN_BEAN__MESSAGE_DESTINATION_LINK = 10;
-
-	/**
-	 * The feature id for the '<em><b>Activation Config</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN_BEAN__ACTIVATION_CONFIG = 11;
-
-	/**
-	 * The feature id for the '<em><b>Around Invokes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN_BEAN__AROUND_INVOKES = 12;
-
-	/**
-	 * The feature id for the '<em><b>Env Entries</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN_BEAN__ENV_ENTRIES = 13;
-
-	/**
-	 * The feature id for the '<em><b>Ejb Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN_BEAN__EJB_REFS = 14;
-
-	/**
-	 * The feature id for the '<em><b>Ejb Local Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN_BEAN__EJB_LOCAL_REFS = 15;
-
-	/**
-	 * The feature id for the '<em><b>Service Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN_BEAN__SERVICE_REFS = 16;
-
-	/**
-	 * The feature id for the '<em><b>Resource Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN_BEAN__RESOURCE_REFS = 17;
-
-	/**
-	 * The feature id for the '<em><b>Resource Env Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN_BEAN__RESOURCE_ENV_REFS = 18;
-
-	/**
-	 * The feature id for the '<em><b>Message Destination Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN_BEAN__MESSAGE_DESTINATION_REFS = 19;
-
-	/**
-	 * The feature id for the '<em><b>Persistence Context Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN_BEAN__PERSISTENCE_CONTEXT_REFS = 20;
-
-	/**
-	 * The feature id for the '<em><b>Persistence Unit Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN_BEAN__PERSISTENCE_UNIT_REFS = 21;
-
-	/**
-	 * The feature id for the '<em><b>Post Constructs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN_BEAN__POST_CONSTRUCTS = 22;
-
-	/**
-	 * The feature id for the '<em><b>Pre Destroys</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN_BEAN__PRE_DESTROYS = 23;
-
-	/**
-	 * The feature id for the '<em><b>Security Identity</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN_BEAN__SECURITY_IDENTITY = 24;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN_BEAN__ID = 25;
-
-	/**
-	 * The number of structural features of the '<em>Message Driven Bean</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN_BEAN_FEATURE_COUNT = 26;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.MethodParamsImpl <em>Method Params</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.MethodParamsImpl
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getMethodParams()
-	 * @generated
-	 */
-	int METHOD_PARAMS = 21;
-
-	/**
-	 * The feature id for the '<em><b>Method Params</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PARAMS__METHOD_PARAMS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PARAMS__ID = 1;
-
-	/**
-	 * The number of structural features of the '<em>Method Params</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PARAMS_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.MethodPermissionImpl <em>Method Permission</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.MethodPermissionImpl
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getMethodPermission()
-	 * @generated
-	 */
-	int METHOD_PERMISSION = 22;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PERMISSION__DESCRIPTIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Role Names</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PERMISSION__ROLE_NAMES = 1;
-
-	/**
-	 * The feature id for the '<em><b>Unchecked</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PERMISSION__UNCHECKED = 2;
-
-	/**
-	 * The feature id for the '<em><b>Methods</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PERMISSION__METHODS = 3;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PERMISSION__ID = 4;
-
-	/**
-	 * The number of structural features of the '<em>Method Permission</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PERMISSION_FEATURE_COUNT = 5;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.MethodTypeImpl <em>Method Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.MethodTypeImpl
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getMethodType()
-	 * @generated
-	 */
-	int METHOD_TYPE = 23;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_TYPE__DESCRIPTIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Ejb Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_TYPE__EJB_NAME = 1;
-
-	/**
-	 * The feature id for the '<em><b>Method Intf</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_TYPE__METHOD_INTF = 2;
-
-	/**
-	 * The feature id for the '<em><b>Method Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_TYPE__METHOD_NAME = 3;
-
-	/**
-	 * The feature id for the '<em><b>Method Params</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_TYPE__METHOD_PARAMS = 4;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_TYPE__ID = 5;
-
-	/**
-	 * The number of structural features of the '<em>Method Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_TYPE_FEATURE_COUNT = 6;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.NamedMethodTypeImpl <em>Named Method Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.NamedMethodTypeImpl
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getNamedMethodType()
-	 * @generated
-	 */
-	int NAMED_METHOD_TYPE = 24;
-
-	/**
-	 * The feature id for the '<em><b>Method Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NAMED_METHOD_TYPE__METHOD_NAME = 0;
-
-	/**
-	 * The feature id for the '<em><b>Method Params</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NAMED_METHOD_TYPE__METHOD_PARAMS = 1;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NAMED_METHOD_TYPE__ID = 2;
-
-	/**
-	 * The number of structural features of the '<em>Named Method Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NAMED_METHOD_TYPE_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.QueryImpl <em>Query</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.QueryImpl
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getQuery()
-	 * @generated
-	 */
-	int QUERY = 25;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int QUERY__DESCRIPTION = 0;
-
-	/**
-	 * The feature id for the '<em><b>Query Method</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int QUERY__QUERY_METHOD = 1;
-
-	/**
-	 * The feature id for the '<em><b>Result Type Mapping</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int QUERY__RESULT_TYPE_MAPPING = 2;
-
-	/**
-	 * The feature id for the '<em><b>Ejb Ql</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int QUERY__EJB_QL = 3;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int QUERY__ID = 4;
-
-	/**
-	 * The number of structural features of the '<em>Query</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int QUERY_FEATURE_COUNT = 5;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.QueryMethodImpl <em>Query Method</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.QueryMethodImpl
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getQueryMethod()
-	 * @generated
-	 */
-	int QUERY_METHOD = 26;
-
-	/**
-	 * The feature id for the '<em><b>Method Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int QUERY_METHOD__METHOD_NAME = 0;
-
-	/**
-	 * The feature id for the '<em><b>Method Params</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int QUERY_METHOD__METHOD_PARAMS = 1;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int QUERY_METHOD__ID = 2;
-
-	/**
-	 * The number of structural features of the '<em>Query Method</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int QUERY_METHOD_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.RelationshipRoleSourceTypeImpl <em>Relationship Role Source Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.RelationshipRoleSourceTypeImpl
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getRelationshipRoleSourceType()
-	 * @generated
-	 */
-	int RELATIONSHIP_ROLE_SOURCE_TYPE = 27;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RELATIONSHIP_ROLE_SOURCE_TYPE__DESCRIPTIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Ejb Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RELATIONSHIP_ROLE_SOURCE_TYPE__EJB_NAME = 1;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RELATIONSHIP_ROLE_SOURCE_TYPE__ID = 2;
-
-	/**
-	 * The number of structural features of the '<em>Relationship Role Source Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RELATIONSHIP_ROLE_SOURCE_TYPE_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.RelationshipsImpl <em>Relationships</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.RelationshipsImpl
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getRelationships()
-	 * @generated
-	 */
-	int RELATIONSHIPS = 28;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RELATIONSHIPS__DESCRIPTIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Ejb Relations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RELATIONSHIPS__EJB_RELATIONS = 1;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RELATIONSHIPS__ID = 2;
-
-	/**
-	 * The number of structural features of the '<em>Relationships</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RELATIONSHIPS_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.RemoveMethodTypeImpl <em>Remove Method Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.RemoveMethodTypeImpl
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getRemoveMethodType()
-	 * @generated
-	 */
-	int REMOVE_METHOD_TYPE = 29;
-
-	/**
-	 * The feature id for the '<em><b>Bean Method</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REMOVE_METHOD_TYPE__BEAN_METHOD = 0;
-
-	/**
-	 * The feature id for the '<em><b>Retain If Exception</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REMOVE_METHOD_TYPE__RETAIN_IF_EXCEPTION = 1;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REMOVE_METHOD_TYPE__ID = 2;
-
-	/**
-	 * The number of structural features of the '<em>Remove Method Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REMOVE_METHOD_TYPE_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.SecurityIdentityTypeImpl <em>Security Identity Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.SecurityIdentityTypeImpl
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getSecurityIdentityType()
-	 * @generated
-	 */
-	int SECURITY_IDENTITY_TYPE = 30;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECURITY_IDENTITY_TYPE__DESCRIPTIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Use Caller Identity</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECURITY_IDENTITY_TYPE__USE_CALLER_IDENTITY = 1;
-
-	/**
-	 * The feature id for the '<em><b>Run As</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECURITY_IDENTITY_TYPE__RUN_AS = 2;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECURITY_IDENTITY_TYPE__ID = 3;
-
-	/**
-	 * The number of structural features of the '<em>Security Identity Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECURITY_IDENTITY_TYPE_FEATURE_COUNT = 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl <em>Session Bean</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getSessionBean()
-	 * @generated
-	 */
-	int SESSION_BEAN = 31;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION_BEAN__DESCRIPTIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION_BEAN__DISPLAY_NAMES = 1;
-
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION_BEAN__ICONS = 2;
-
-	/**
-	 * The feature id for the '<em><b>Ejb Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION_BEAN__EJB_NAME = 3;
-
-	/**
-	 * The feature id for the '<em><b>Mapped Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION_BEAN__MAPPED_NAME = 4;
-
-	/**
-	 * The feature id for the '<em><b>Home</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION_BEAN__HOME = 5;
-
-	/**
-	 * The feature id for the '<em><b>Remote</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION_BEAN__REMOTE = 6;
-
-	/**
-	 * The feature id for the '<em><b>Local Home</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION_BEAN__LOCAL_HOME = 7;
-
-	/**
-	 * The feature id for the '<em><b>Local</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION_BEAN__LOCAL = 8;
-
-	/**
-	 * The feature id for the '<em><b>Business Locals</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION_BEAN__BUSINESS_LOCALS = 9;
-
-	/**
-	 * The feature id for the '<em><b>Business Remotes</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION_BEAN__BUSINESS_REMOTES = 10;
-
-	/**
-	 * The feature id for the '<em><b>Service Endpoint</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION_BEAN__SERVICE_ENDPOINT = 11;
-
-	/**
-	 * The feature id for the '<em><b>Ejb Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION_BEAN__EJB_CLASS = 12;
-
-	/**
-	 * The feature id for the '<em><b>Session Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION_BEAN__SESSION_TYPE = 13;
-
-	/**
-	 * The feature id for the '<em><b>Timeout Method</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION_BEAN__TIMEOUT_METHOD = 14;
-
-	/**
-	 * The feature id for the '<em><b>Init Methods</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION_BEAN__INIT_METHODS = 15;
-
-	/**
-	 * The feature id for the '<em><b>Remove Methods</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION_BEAN__REMOVE_METHODS = 16;
-
-	/**
-	 * The feature id for the '<em><b>Transaction Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION_BEAN__TRANSACTION_TYPE = 17;
-
-	/**
-	 * The feature id for the '<em><b>Around Invokes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION_BEAN__AROUND_INVOKES = 18;
-
-	/**
-	 * The feature id for the '<em><b>Env Entries</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION_BEAN__ENV_ENTRIES = 19;
-
-	/**
-	 * The feature id for the '<em><b>Ejb Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION_BEAN__EJB_REFS = 20;
-
-	/**
-	 * The feature id for the '<em><b>Ejb Local Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION_BEAN__EJB_LOCAL_REFS = 21;
-
-	/**
-	 * The feature id for the '<em><b>Service Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION_BEAN__SERVICE_REFS = 22;
-
-	/**
-	 * The feature id for the '<em><b>Resource Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION_BEAN__RESOURCE_REFS = 23;
-
-	/**
-	 * The feature id for the '<em><b>Resource Env Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION_BEAN__RESOURCE_ENV_REFS = 24;
-
-	/**
-	 * The feature id for the '<em><b>Message Destination Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION_BEAN__MESSAGE_DESTINATION_REFS = 25;
-
-	/**
-	 * The feature id for the '<em><b>Persistence Context Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION_BEAN__PERSISTENCE_CONTEXT_REFS = 26;
-
-	/**
-	 * The feature id for the '<em><b>Persistence Unit Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION_BEAN__PERSISTENCE_UNIT_REFS = 27;
-
-	/**
-	 * The feature id for the '<em><b>Post Constructs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION_BEAN__POST_CONSTRUCTS = 28;
-
-	/**
-	 * The feature id for the '<em><b>Pre Destroys</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION_BEAN__PRE_DESTROYS = 29;
-
-	/**
-	 * The feature id for the '<em><b>Post Activates</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION_BEAN__POST_ACTIVATES = 30;
-
-	/**
-	 * The feature id for the '<em><b>Pre Passivates</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION_BEAN__PRE_PASSIVATES = 31;
-
-	/**
-	 * The feature id for the '<em><b>Security Role Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION_BEAN__SECURITY_ROLE_REFS = 32;
-
-	/**
-	 * The feature id for the '<em><b>Security Identities</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION_BEAN__SECURITY_IDENTITIES = 33;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION_BEAN__ID = 34;
-
-	/**
-	 * The number of structural features of the '<em>Session Bean</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION_BEAN_FEATURE_COUNT = 35;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.CmpVersionType <em>Cmp Version Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.CmpVersionType
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getCmpVersionType()
-	 * @generated
-	 */
-	int CMP_VERSION_TYPE = 32;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.CMRFieldType <em>CMR Field Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.CMRFieldType
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getCMRFieldType()
-	 * @generated
-	 */
-	int CMR_FIELD_TYPE = 33;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.MethodInterfaceType <em>Method Interface Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.MethodInterfaceType
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getMethodInterfaceType()
-	 * @generated
-	 */
-	int METHOD_INTERFACE_TYPE = 34;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.MultiplicityType <em>Multiplicity Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.MultiplicityType
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getMultiplicityType()
-	 * @generated
-	 */
-	int MULTIPLICITY_TYPE = 35;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.PersistenceType <em>Persistence Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.PersistenceType
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getPersistenceType()
-	 * @generated
-	 */
-	int PERSISTENCE_TYPE = 36;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.ResultTypeMappingType <em>Result Type Mapping Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.ResultTypeMappingType
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getResultTypeMappingType()
-	 * @generated
-	 */
-	int RESULT_TYPE_MAPPING_TYPE = 37;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.SessionType <em>Session Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.SessionType
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getSessionType()
-	 * @generated
-	 */
-	int SESSION_TYPE = 38;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.TransactionAttributeType <em>Transaction Attribute Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.TransactionAttributeType
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getTransactionAttributeType()
-	 * @generated
-	 */
-	int TRANSACTION_ATTRIBUTE_TYPE = 39;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.TransactionType <em>Transaction Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.TransactionType
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getTransactionType()
-	 * @generated
-	 */
-	int TRANSACTION_TYPE = 40;
-
-	/**
-	 * The meta object id for the '<em>Cmp Version Type Object</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.CmpVersionType
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getCmpVersionTypeObject()
-	 * @generated
-	 */
-	int CMP_VERSION_TYPE_OBJECT = 41;
-
-	/**
-	 * The meta object id for the '<em>CMR Field Type Object</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.CMRFieldType
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getCMRFieldTypeObject()
-	 * @generated
-	 */
-	int CMR_FIELD_TYPE_OBJECT = 42;
-
-	/**
-	 * The meta object id for the '<em>Class Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getEjbClassType()
-	 * @generated
-	 */
-	int EJB_CLASS_TYPE = 43;
-
-	/**
-	 * The meta object id for the '<em>Name Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getEjbNameType()
-	 * @generated
-	 */
-	int EJB_NAME_TYPE = 44;
-
-	/**
-	 * The meta object id for the '<em>Method Interface Type Object</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.MethodInterfaceType
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getMethodInterfaceTypeObject()
-	 * @generated
-	 */
-	int METHOD_INTERFACE_TYPE_OBJECT = 45;
-
-	/**
-	 * The meta object id for the '<em>Method Name Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getMethodNameType()
-	 * @generated
-	 */
-	int METHOD_NAME_TYPE = 46;
-
-	/**
-	 * The meta object id for the '<em>Multiplicity Type Object</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.MultiplicityType
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getMultiplicityTypeObject()
-	 * @generated
-	 */
-	int MULTIPLICITY_TYPE_OBJECT = 47;
-
-	/**
-	 * The meta object id for the '<em>Persistence Type Object</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.PersistenceType
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getPersistenceTypeObject()
-	 * @generated
-	 */
-	int PERSISTENCE_TYPE_OBJECT = 48;
-
-	/**
-	 * The meta object id for the '<em>Result Type Mapping Type Object</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.ResultTypeMappingType
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getResultTypeMappingTypeObject()
-	 * @generated
-	 */
-	int RESULT_TYPE_MAPPING_TYPE_OBJECT = 49;
-
-	/**
-	 * The meta object id for the '<em>Session Type Object</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.SessionType
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getSessionTypeObject()
-	 * @generated
-	 */
-	int SESSION_TYPE_OBJECT = 50;
-
-	/**
-	 * The meta object id for the '<em>Transaction Attribute Type Object</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.TransactionAttributeType
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getTransactionAttributeTypeObject()
-	 * @generated
-	 */
-	int TRANSACTION_ATTRIBUTE_TYPE_OBJECT = 51;
-
-	/**
-	 * The meta object id for the '<em>Transaction Type Object</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.ejb.TransactionType
-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getTransactionTypeObject()
-	 * @generated
-	 */
-	int TRANSACTION_TYPE_OBJECT = 52;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.ActivationConfig <em>Activation Config</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Activation Config</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.ActivationConfig
-	 * @generated
-	 */
-	EClass getActivationConfig();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.ActivationConfig#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.ActivationConfig#getDescriptions()
-	 * @see #getActivationConfig()
-	 * @generated
-	 */
-	EReference getActivationConfig_Descriptions();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.ActivationConfig#getActivationConfigProperties <em>Activation Config Properties</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Activation Config Properties</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.ActivationConfig#getActivationConfigProperties()
-	 * @see #getActivationConfig()
-	 * @generated
-	 */
-	EReference getActivationConfig_ActivationConfigProperties();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.ActivationConfig#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.ActivationConfig#getId()
-	 * @see #getActivationConfig()
-	 * @generated
-	 */
-	EAttribute getActivationConfig_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.ActivationConfigProperty <em>Activation Config Property</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Activation Config Property</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.ActivationConfigProperty
-	 * @generated
-	 */
-	EClass getActivationConfigProperty();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.ActivationConfigProperty#getActivationConfigPropertyName <em>Activation Config Property Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Activation Config Property Name</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.ActivationConfigProperty#getActivationConfigPropertyName()
-	 * @see #getActivationConfigProperty()
-	 * @generated
-	 */
-	EAttribute getActivationConfigProperty_ActivationConfigPropertyName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.ActivationConfigProperty#getActivationConfigPropertyValue <em>Activation Config Property Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Activation Config Property Value</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.ActivationConfigProperty#getActivationConfigPropertyValue()
-	 * @see #getActivationConfigProperty()
-	 * @generated
-	 */
-	EAttribute getActivationConfigProperty_ActivationConfigPropertyValue();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.ActivationConfigProperty#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.ActivationConfigProperty#getId()
-	 * @see #getActivationConfigProperty()
-	 * @generated
-	 */
-	EAttribute getActivationConfigProperty_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.ApplicationException <em>Application Exception</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Application Exception</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.ApplicationException
-	 * @generated
-	 */
-	EClass getApplicationException();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.ApplicationException#getExceptionClass <em>Exception Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Exception Class</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.ApplicationException#getExceptionClass()
-	 * @see #getApplicationException()
-	 * @generated
-	 */
-	EAttribute getApplicationException_ExceptionClass();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.ApplicationException#isRollback <em>Rollback</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Rollback</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.ApplicationException#isRollback()
-	 * @see #getApplicationException()
-	 * @generated
-	 */
-	EAttribute getApplicationException_Rollback();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.ApplicationException#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.ApplicationException#getId()
-	 * @see #getApplicationException()
-	 * @generated
-	 */
-	EAttribute getApplicationException_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.AroundInvokeType <em>Around Invoke Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Around Invoke Type</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.AroundInvokeType
-	 * @generated
-	 */
-	EClass getAroundInvokeType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.AroundInvokeType#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Class</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.AroundInvokeType#getClass_()
-	 * @see #getAroundInvokeType()
-	 * @generated
-	 */
-	EAttribute getAroundInvokeType_Class();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.AroundInvokeType#getMethodName <em>Method Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Method Name</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.AroundInvokeType#getMethodName()
-	 * @see #getAroundInvokeType()
-	 * @generated
-	 */
-	EAttribute getAroundInvokeType_MethodName();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.AssemblyDescriptor <em>Assembly Descriptor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Assembly Descriptor</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.AssemblyDescriptor
-	 * @generated
-	 */
-	EClass getAssemblyDescriptor();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getSecurityRoles <em>Security Roles</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Security Roles</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getSecurityRoles()
-	 * @see #getAssemblyDescriptor()
-	 * @generated
-	 */
-	EReference getAssemblyDescriptor_SecurityRoles();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getMethodPermissions <em>Method Permissions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Method Permissions</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getMethodPermissions()
-	 * @see #getAssemblyDescriptor()
-	 * @generated
-	 */
-	EReference getAssemblyDescriptor_MethodPermissions();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getContainerTransactions <em>Container Transactions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Container Transactions</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getContainerTransactions()
-	 * @see #getAssemblyDescriptor()
-	 * @generated
-	 */
-	EReference getAssemblyDescriptor_ContainerTransactions();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getInterceptorBindings <em>Interceptor Bindings</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Interceptor Bindings</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getInterceptorBindings()
-	 * @see #getAssemblyDescriptor()
-	 * @generated
-	 */
-	EReference getAssemblyDescriptor_InterceptorBindings();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getMessageDestinations <em>Message Destinations</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Message Destinations</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getMessageDestinations()
-	 * @see #getAssemblyDescriptor()
-	 * @generated
-	 */
-	EReference getAssemblyDescriptor_MessageDestinations();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getExcludeList <em>Exclude List</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Exclude List</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getExcludeList()
-	 * @see #getAssemblyDescriptor()
-	 * @generated
-	 */
-	EReference getAssemblyDescriptor_ExcludeList();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getApplicationExceptions <em>Application Exceptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Application Exceptions</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getApplicationExceptions()
-	 * @see #getAssemblyDescriptor()
-	 * @generated
-	 */
-	EReference getAssemblyDescriptor_ApplicationExceptions();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getId()
-	 * @see #getAssemblyDescriptor()
-	 * @generated
-	 */
-	EAttribute getAssemblyDescriptor_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.CMPField <em>CMP Field</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>CMP Field</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.CMPField
-	 * @generated
-	 */
-	EClass getCMPField();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.CMPField#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.CMPField#getDescriptions()
-	 * @see #getCMPField()
-	 * @generated
-	 */
-	EReference getCMPField_Descriptions();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.CMPField#getFieldName <em>Field Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Field Name</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.CMPField#getFieldName()
-	 * @see #getCMPField()
-	 * @generated
-	 */
-	EAttribute getCMPField_FieldName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.CMPField#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.CMPField#getId()
-	 * @see #getCMPField()
-	 * @generated
-	 */
-	EAttribute getCMPField_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.CMRField <em>CMR Field</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>CMR Field</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.CMRField
-	 * @generated
-	 */
-	EClass getCMRField();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.CMRField#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.CMRField#getDescriptions()
-	 * @see #getCMRField()
-	 * @generated
-	 */
-	EReference getCMRField_Descriptions();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.CMRField#getCmrFieldName <em>Cmr Field Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Cmr Field Name</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.CMRField#getCmrFieldName()
-	 * @see #getCMRField()
-	 * @generated
-	 */
-	EAttribute getCMRField_CmrFieldName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.CMRField#getCmrFieldType <em>Cmr Field Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Cmr Field Type</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.CMRField#getCmrFieldType()
-	 * @see #getCMRField()
-	 * @generated
-	 */
-	EAttribute getCMRField_CmrFieldType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.CMRField#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.CMRField#getId()
-	 * @see #getCMRField()
-	 * @generated
-	 */
-	EAttribute getCMRField_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.ContainerTransactionType <em>Container Transaction Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Container Transaction Type</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.ContainerTransactionType
-	 * @generated
-	 */
-	EClass getContainerTransactionType();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.ContainerTransactionType#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.ContainerTransactionType#getDescriptions()
-	 * @see #getContainerTransactionType()
-	 * @generated
-	 */
-	EReference getContainerTransactionType_Descriptions();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.ContainerTransactionType#getMethods <em>Methods</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Methods</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.ContainerTransactionType#getMethods()
-	 * @see #getContainerTransactionType()
-	 * @generated
-	 */
-	EReference getContainerTransactionType_Methods();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.ContainerTransactionType#getTransAttribute <em>Trans Attribute</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Trans Attribute</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.ContainerTransactionType#getTransAttribute()
-	 * @see #getContainerTransactionType()
-	 * @generated
-	 */
-	EAttribute getContainerTransactionType_TransAttribute();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.ContainerTransactionType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.ContainerTransactionType#getId()
-	 * @see #getContainerTransactionType()
-	 * @generated
-	 */
-	EAttribute getContainerTransactionType_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.EJBJar <em>EJB Jar</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>EJB Jar</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EJBJar
-	 * @generated
-	 */
-	EClass getEJBJar();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EJBJar#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EJBJar#getDescriptions()
-	 * @see #getEJBJar()
-	 * @generated
-	 */
-	EReference getEJBJar_Descriptions();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EJBJar#getDisplayNames <em>Display Names</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Display Names</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EJBJar#getDisplayNames()
-	 * @see #getEJBJar()
-	 * @generated
-	 */
-	EReference getEJBJar_DisplayNames();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EJBJar#getIcons <em>Icons</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Icons</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EJBJar#getIcons()
-	 * @see #getEJBJar()
-	 * @generated
-	 */
-	EReference getEJBJar_Icons();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.EJBJar#getEnterpriseBeans <em>Enterprise Beans</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Enterprise Beans</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EJBJar#getEnterpriseBeans()
-	 * @see #getEJBJar()
-	 * @generated
-	 */
-	EReference getEJBJar_EnterpriseBeans();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.EJBJar#getInterceptors <em>Interceptors</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Interceptors</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EJBJar#getInterceptors()
-	 * @see #getEJBJar()
-	 * @generated
-	 */
-	EReference getEJBJar_Interceptors();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.EJBJar#getRelationships <em>Relationships</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Relationships</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EJBJar#getRelationships()
-	 * @see #getEJBJar()
-	 * @generated
-	 */
-	EReference getEJBJar_Relationships();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.EJBJar#getAssemblyDescriptor <em>Assembly Descriptor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Assembly Descriptor</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EJBJar#getAssemblyDescriptor()
-	 * @see #getEJBJar()
-	 * @generated
-	 */
-	EReference getEJBJar_AssemblyDescriptor();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EJBJar#getEjbClientJar <em>Ejb Client Jar</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Ejb Client Jar</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EJBJar#getEjbClientJar()
-	 * @see #getEJBJar()
-	 * @generated
-	 */
-	EAttribute getEJBJar_EjbClientJar();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EJBJar#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EJBJar#getId()
-	 * @see #getEJBJar()
-	 * @generated
-	 */
-	EAttribute getEJBJar_Id();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EJBJar#isMetadataComplete <em>Metadata Complete</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Metadata Complete</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EJBJar#isMetadataComplete()
-	 * @see #getEJBJar()
-	 * @generated
-	 */
-	EAttribute getEJBJar_MetadataComplete();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EJBJar#getVersion <em>Version</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Version</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EJBJar#getVersion()
-	 * @see #getEJBJar()
-	 * @generated
-	 */
-	EAttribute getEJBJar_Version();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.EJBJarDeploymentDescriptor <em>EJB Jar Deployment Descriptor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>EJB Jar Deployment Descriptor</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EJBJarDeploymentDescriptor
-	 * @generated
-	 */
-	EClass getEJBJarDeploymentDescriptor();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.ejb.EJBJarDeploymentDescriptor#getMixed <em>Mixed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Mixed</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EJBJarDeploymentDescriptor#getMixed()
-	 * @see #getEJBJarDeploymentDescriptor()
-	 * @generated
-	 */
-	EAttribute getEJBJarDeploymentDescriptor_Mixed();
-
-	/**
-	 * Returns the meta object for the map '{@link org.eclipse.jst.javaee.ejb.EJBJarDeploymentDescriptor#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the map '<em>XMLNS Prefix Map</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EJBJarDeploymentDescriptor#getXMLNSPrefixMap()
-	 * @see #getEJBJarDeploymentDescriptor()
-	 * @generated
-	 */
-	EReference getEJBJarDeploymentDescriptor_XMLNSPrefixMap();
-
-	/**
-	 * Returns the meta object for the map '{@link org.eclipse.jst.javaee.ejb.EJBJarDeploymentDescriptor#getXSISchemaLocation <em>XSI Schema Location</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the map '<em>XSI Schema Location</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EJBJarDeploymentDescriptor#getXSISchemaLocation()
-	 * @see #getEJBJarDeploymentDescriptor()
-	 * @generated
-	 */
-	EReference getEJBJarDeploymentDescriptor_XSISchemaLocation();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.EJBJarDeploymentDescriptor#getEjbJar <em>Ejb Jar</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Ejb Jar</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EJBJarDeploymentDescriptor#getEjbJar()
-	 * @see #getEJBJarDeploymentDescriptor()
-	 * @generated
-	 */
-	EReference getEJBJarDeploymentDescriptor_EjbJar();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.EJBRelation <em>EJB Relation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>EJB Relation</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EJBRelation
-	 * @generated
-	 */
-	EClass getEJBRelation();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EJBRelation#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EJBRelation#getDescriptions()
-	 * @see #getEJBRelation()
-	 * @generated
-	 */
-	EReference getEJBRelation_Descriptions();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EJBRelation#getEjbRelationName <em>Ejb Relation Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Ejb Relation Name</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EJBRelation#getEjbRelationName()
-	 * @see #getEJBRelation()
-	 * @generated
-	 */
-	EAttribute getEJBRelation_EjbRelationName();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EJBRelation#getEjbRelationshipRoles <em>Ejb Relationship Roles</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Ejb Relationship Roles</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EJBRelation#getEjbRelationshipRoles()
-	 * @see #getEJBRelation()
-	 * @generated
-	 */
-	EReference getEJBRelation_EjbRelationshipRoles();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EJBRelation#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EJBRelation#getId()
-	 * @see #getEJBRelation()
-	 * @generated
-	 */
-	EAttribute getEJBRelation_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.EJBRelationshipRole <em>EJB Relationship Role</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>EJB Relationship Role</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EJBRelationshipRole
-	 * @generated
-	 */
-	EClass getEJBRelationshipRole();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getDescriptions()
-	 * @see #getEJBRelationshipRole()
-	 * @generated
-	 */
-	EReference getEJBRelationshipRole_Descriptions();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getEjbRelationshipRoleName <em>Ejb Relationship Role Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Ejb Relationship Role Name</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getEjbRelationshipRoleName()
-	 * @see #getEJBRelationshipRole()
-	 * @generated
-	 */
-	EAttribute getEJBRelationshipRole_EjbRelationshipRoleName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getMultiplicity <em>Multiplicity</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Multiplicity</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getMultiplicity()
-	 * @see #getEJBRelationshipRole()
-	 * @generated
-	 */
-	EAttribute getEJBRelationshipRole_Multiplicity();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getCascadeDelete <em>Cascade Delete</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Cascade Delete</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getCascadeDelete()
-	 * @see #getEJBRelationshipRole()
-	 * @generated
-	 */
-	EReference getEJBRelationshipRole_CascadeDelete();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getRelationshipRoleSource <em>Relationship Role Source</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Relationship Role Source</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getRelationshipRoleSource()
-	 * @see #getEJBRelationshipRole()
-	 * @generated
-	 */
-	EReference getEJBRelationshipRole_RelationshipRoleSource();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getCmrField <em>Cmr Field</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Cmr Field</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getCmrField()
-	 * @see #getEJBRelationshipRole()
-	 * @generated
-	 */
-	EReference getEJBRelationshipRole_CmrField();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getId()
-	 * @see #getEJBRelationshipRole()
-	 * @generated
-	 */
-	EAttribute getEJBRelationshipRole_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.EnterpriseBeans <em>Enterprise Beans</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Enterprise Beans</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EnterpriseBeans
-	 * @generated
-	 */
-	EClass getEnterpriseBeans();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.ejb.EnterpriseBeans#getGroup <em>Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Group</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EnterpriseBeans#getGroup()
-	 * @see #getEnterpriseBeans()
-	 * @generated
-	 */
-	EAttribute getEnterpriseBeans_Group();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EnterpriseBeans#getSessionBeans <em>Session Beans</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Session Beans</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EnterpriseBeans#getSessionBeans()
-	 * @see #getEnterpriseBeans()
-	 * @generated
-	 */
-	EReference getEnterpriseBeans_SessionBeans();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EnterpriseBeans#getEntityBeans <em>Entity Beans</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Entity Beans</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EnterpriseBeans#getEntityBeans()
-	 * @see #getEnterpriseBeans()
-	 * @generated
-	 */
-	EReference getEnterpriseBeans_EntityBeans();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EnterpriseBeans#getMessageDrivenBeans <em>Message Driven Beans</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Message Driven Beans</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EnterpriseBeans#getMessageDrivenBeans()
-	 * @see #getEnterpriseBeans()
-	 * @generated
-	 */
-	EReference getEnterpriseBeans_MessageDrivenBeans();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EnterpriseBeans#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EnterpriseBeans#getId()
-	 * @see #getEnterpriseBeans()
-	 * @generated
-	 */
-	EAttribute getEnterpriseBeans_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.EntityBean <em>Entity Bean</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Entity Bean</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EntityBean
-	 * @generated
-	 */
-	EClass getEntityBean();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getDescriptions()
-	 * @see #getEntityBean()
-	 * @generated
-	 */
-	EReference getEntityBean_Descriptions();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getDisplayNames <em>Display Names</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Display Names</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getDisplayNames()
-	 * @see #getEntityBean()
-	 * @generated
-	 */
-	EReference getEntityBean_DisplayNames();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getIcons <em>Icons</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Icons</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getIcons()
-	 * @see #getEntityBean()
-	 * @generated
-	 */
-	EReference getEntityBean_Icons();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EntityBean#getEjbName <em>Ejb Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Ejb Name</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getEjbName()
-	 * @see #getEntityBean()
-	 * @generated
-	 */
-	EAttribute getEntityBean_EjbName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EntityBean#getMappedName <em>Mapped Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Mapped Name</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getMappedName()
-	 * @see #getEntityBean()
-	 * @generated
-	 */
-	EAttribute getEntityBean_MappedName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EntityBean#getHome <em>Home</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Home</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getHome()
-	 * @see #getEntityBean()
-	 * @generated
-	 */
-	EAttribute getEntityBean_Home();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EntityBean#getRemote <em>Remote</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Remote</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getRemote()
-	 * @see #getEntityBean()
-	 * @generated
-	 */
-	EAttribute getEntityBean_Remote();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EntityBean#getLocalHome <em>Local Home</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Local Home</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getLocalHome()
-	 * @see #getEntityBean()
-	 * @generated
-	 */
-	EAttribute getEntityBean_LocalHome();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EntityBean#getLocal <em>Local</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Local</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getLocal()
-	 * @see #getEntityBean()
-	 * @generated
-	 */
-	EAttribute getEntityBean_Local();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EntityBean#getEjbClass <em>Ejb Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Ejb Class</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getEjbClass()
-	 * @see #getEntityBean()
-	 * @generated
-	 */
-	EAttribute getEntityBean_EjbClass();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EntityBean#getPersistenceType <em>Persistence Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Persistence Type</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getPersistenceType()
-	 * @see #getEntityBean()
-	 * @generated
-	 */
-	EAttribute getEntityBean_PersistenceType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EntityBean#getPrimKeyClass <em>Prim Key Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Prim Key Class</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getPrimKeyClass()
-	 * @see #getEntityBean()
-	 * @generated
-	 */
-	EAttribute getEntityBean_PrimKeyClass();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EntityBean#isReentrant <em>Reentrant</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Reentrant</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#isReentrant()
-	 * @see #getEntityBean()
-	 * @generated
-	 */
-	EAttribute getEntityBean_Reentrant();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EntityBean#getCmpVersion <em>Cmp Version</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Cmp Version</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getCmpVersion()
-	 * @see #getEntityBean()
-	 * @generated
-	 */
-	EAttribute getEntityBean_CmpVersion();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EntityBean#getAbstractSchemaName <em>Abstract Schema Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Abstract Schema Name</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getAbstractSchemaName()
-	 * @see #getEntityBean()
-	 * @generated
-	 */
-	EAttribute getEntityBean_AbstractSchemaName();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getCmpFields <em>Cmp Fields</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Cmp Fields</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getCmpFields()
-	 * @see #getEntityBean()
-	 * @generated
-	 */
-	EReference getEntityBean_CmpFields();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EntityBean#getPrimkeyField <em>Primkey Field</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Primkey Field</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getPrimkeyField()
-	 * @see #getEntityBean()
-	 * @generated
-	 */
-	EAttribute getEntityBean_PrimkeyField();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getEnvEntries <em>Env Entries</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Env Entries</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getEnvEntries()
-	 * @see #getEntityBean()
-	 * @generated
-	 */
-	EReference getEntityBean_EnvEntries();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getEjbRefs <em>Ejb Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Ejb Refs</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getEjbRefs()
-	 * @see #getEntityBean()
-	 * @generated
-	 */
-	EReference getEntityBean_EjbRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getEjbLocalRefs <em>Ejb Local Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Ejb Local Refs</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getEjbLocalRefs()
-	 * @see #getEntityBean()
-	 * @generated
-	 */
-	EReference getEntityBean_EjbLocalRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getServiceRefs <em>Service Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Service Refs</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getServiceRefs()
-	 * @see #getEntityBean()
-	 * @generated
-	 */
-	EReference getEntityBean_ServiceRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getResourceRefs <em>Resource Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Resource Refs</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getResourceRefs()
-	 * @see #getEntityBean()
-	 * @generated
-	 */
-	EReference getEntityBean_ResourceRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getResourceEnvRefs <em>Resource Env Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Resource Env Refs</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getResourceEnvRefs()
-	 * @see #getEntityBean()
-	 * @generated
-	 */
-	EReference getEntityBean_ResourceEnvRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getMessageDestinationRefs <em>Message Destination Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Message Destination Refs</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getMessageDestinationRefs()
-	 * @see #getEntityBean()
-	 * @generated
-	 */
-	EReference getEntityBean_MessageDestinationRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getPersistenceContextRefs <em>Persistence Context Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Persistence Context Refs</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getPersistenceContextRefs()
-	 * @see #getEntityBean()
-	 * @generated
-	 */
-	EReference getEntityBean_PersistenceContextRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getPersistenceUnitRefs <em>Persistence Unit Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Persistence Unit Refs</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getPersistenceUnitRefs()
-	 * @see #getEntityBean()
-	 * @generated
-	 */
-	EReference getEntityBean_PersistenceUnitRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getPostConstructs <em>Post Constructs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Post Constructs</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getPostConstructs()
-	 * @see #getEntityBean()
-	 * @generated
-	 */
-	EReference getEntityBean_PostConstructs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getPreDestroys <em>Pre Destroys</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Pre Destroys</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getPreDestroys()
-	 * @see #getEntityBean()
-	 * @generated
-	 */
-	EReference getEntityBean_PreDestroys();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getSecurityRoleRefs <em>Security Role Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Security Role Refs</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getSecurityRoleRefs()
-	 * @see #getEntityBean()
-	 * @generated
-	 */
-	EReference getEntityBean_SecurityRoleRefs();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.EntityBean#getSecurityIdentity <em>Security Identity</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Security Identity</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getSecurityIdentity()
-	 * @see #getEntityBean()
-	 * @generated
-	 */
-	EReference getEntityBean_SecurityIdentity();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getQueries <em>Queries</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Queries</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getQueries()
-	 * @see #getEntityBean()
-	 * @generated
-	 */
-	EReference getEntityBean_Queries();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EntityBean#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getId()
-	 * @see #getEntityBean()
-	 * @generated
-	 */
-	EAttribute getEntityBean_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.ExcludeList <em>Exclude List</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Exclude List</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.ExcludeList
-	 * @generated
-	 */
-	EClass getExcludeList();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.ExcludeList#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.ExcludeList#getDescriptions()
-	 * @see #getExcludeList()
-	 * @generated
-	 */
-	EReference getExcludeList_Descriptions();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.ExcludeList#getMethods <em>Methods</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Methods</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.ExcludeList#getMethods()
-	 * @see #getExcludeList()
-	 * @generated
-	 */
-	EReference getExcludeList_Methods();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.ExcludeList#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.ExcludeList#getId()
-	 * @see #getExcludeList()
-	 * @generated
-	 */
-	EAttribute getExcludeList_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.InitMethodType <em>Init Method Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Init Method Type</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.InitMethodType
-	 * @generated
-	 */
-	EClass getInitMethodType();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.InitMethodType#getCreateMethod <em>Create Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Create Method</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.InitMethodType#getCreateMethod()
-	 * @see #getInitMethodType()
-	 * @generated
-	 */
-	EReference getInitMethodType_CreateMethod();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.InitMethodType#getBeanMethod <em>Bean Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Bean Method</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.InitMethodType#getBeanMethod()
-	 * @see #getInitMethodType()
-	 * @generated
-	 */
-	EReference getInitMethodType_BeanMethod();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.InitMethodType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.InitMethodType#getId()
-	 * @see #getInitMethodType()
-	 * @generated
-	 */
-	EAttribute getInitMethodType_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType <em>Interceptor Binding Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Interceptor Binding Type</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.InterceptorBindingType
-	 * @generated
-	 */
-	EClass getInterceptorBindingType();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.InterceptorBindingType#getDescriptions()
-	 * @see #getInterceptorBindingType()
-	 * @generated
-	 */
-	EReference getInterceptorBindingType_Descriptions();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType#getEjbName <em>Ejb Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Ejb Name</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.InterceptorBindingType#getEjbName()
-	 * @see #getInterceptorBindingType()
-	 * @generated
-	 */
-	EAttribute getInterceptorBindingType_EjbName();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType#getInterceptorClasses <em>Interceptor Classes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Interceptor Classes</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.InterceptorBindingType#getInterceptorClasses()
-	 * @see #getInterceptorBindingType()
-	 * @generated
-	 */
-	EAttribute getInterceptorBindingType_InterceptorClasses();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType#getInterceptorOrder <em>Interceptor Order</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Interceptor Order</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.InterceptorBindingType#getInterceptorOrder()
-	 * @see #getInterceptorBindingType()
-	 * @generated
-	 */
-	EReference getInterceptorBindingType_InterceptorOrder();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType#isExcludeDefaultInterceptors <em>Exclude Default Interceptors</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Exclude Default Interceptors</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.InterceptorBindingType#isExcludeDefaultInterceptors()
-	 * @see #getInterceptorBindingType()
-	 * @generated
-	 */
-	EAttribute getInterceptorBindingType_ExcludeDefaultInterceptors();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType#isExcludeClassInterceptors <em>Exclude Class Interceptors</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Exclude Class Interceptors</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.InterceptorBindingType#isExcludeClassInterceptors()
-	 * @see #getInterceptorBindingType()
-	 * @generated
-	 */
-	EAttribute getInterceptorBindingType_ExcludeClassInterceptors();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType#getMethod <em>Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Method</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.InterceptorBindingType#getMethod()
-	 * @see #getInterceptorBindingType()
-	 * @generated
-	 */
-	EReference getInterceptorBindingType_Method();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.InterceptorBindingType#getId()
-	 * @see #getInterceptorBindingType()
-	 * @generated
-	 */
-	EAttribute getInterceptorBindingType_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.InterceptorOrderType <em>Interceptor Order Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Interceptor Order Type</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.InterceptorOrderType
-	 * @generated
-	 */
-	EClass getInterceptorOrderType();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.ejb.InterceptorOrderType#getInterceptorClasses <em>Interceptor Classes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Interceptor Classes</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.InterceptorOrderType#getInterceptorClasses()
-	 * @see #getInterceptorOrderType()
-	 * @generated
-	 */
-	EAttribute getInterceptorOrderType_InterceptorClasses();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.InterceptorOrderType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.InterceptorOrderType#getId()
-	 * @see #getInterceptorOrderType()
-	 * @generated
-	 */
-	EAttribute getInterceptorOrderType_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.InterceptorsType <em>Interceptors Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Interceptors Type</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.InterceptorsType
-	 * @generated
-	 */
-	EClass getInterceptorsType();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorsType#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.InterceptorsType#getDescriptions()
-	 * @see #getInterceptorsType()
-	 * @generated
-	 */
-	EReference getInterceptorsType_Descriptions();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorsType#getInterceptors <em>Interceptors</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Interceptors</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.InterceptorsType#getInterceptors()
-	 * @see #getInterceptorsType()
-	 * @generated
-	 */
-	EReference getInterceptorsType_Interceptors();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.InterceptorsType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.InterceptorsType#getId()
-	 * @see #getInterceptorsType()
-	 * @generated
-	 */
-	EAttribute getInterceptorsType_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.InterceptorType <em>Interceptor Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Interceptor Type</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.InterceptorType
-	 * @generated
-	 */
-	EClass getInterceptorType();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getDescriptions()
-	 * @see #getInterceptorType()
-	 * @generated
-	 */
-	EReference getInterceptorType_Descriptions();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getInterceptorClass <em>Interceptor Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Interceptor Class</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getInterceptorClass()
-	 * @see #getInterceptorType()
-	 * @generated
-	 */
-	EAttribute getInterceptorType_InterceptorClass();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getAroundInvokes <em>Around Invokes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Around Invokes</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getAroundInvokes()
-	 * @see #getInterceptorType()
-	 * @generated
-	 */
-	EReference getInterceptorType_AroundInvokes();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getEnvEntries <em>Env Entries</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Env Entries</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getEnvEntries()
-	 * @see #getInterceptorType()
-	 * @generated
-	 */
-	EReference getInterceptorType_EnvEntries();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getEjbRefs <em>Ejb Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Ejb Refs</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getEjbRefs()
-	 * @see #getInterceptorType()
-	 * @generated
-	 */
-	EReference getInterceptorType_EjbRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getEjbLocalRefs <em>Ejb Local Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Ejb Local Refs</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getEjbLocalRefs()
-	 * @see #getInterceptorType()
-	 * @generated
-	 */
-	EReference getInterceptorType_EjbLocalRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getServiceRefs <em>Service Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Service Refs</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getServiceRefs()
-	 * @see #getInterceptorType()
-	 * @generated
-	 */
-	EReference getInterceptorType_ServiceRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getResourceRefs <em>Resource Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Resource Refs</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getResourceRefs()
-	 * @see #getInterceptorType()
-	 * @generated
-	 */
-	EReference getInterceptorType_ResourceRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getResourceEnvRefs <em>Resource Env Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Resource Env Refs</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getResourceEnvRefs()
-	 * @see #getInterceptorType()
-	 * @generated
-	 */
-	EReference getInterceptorType_ResourceEnvRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getMessageDestinationRefs <em>Message Destination Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Message Destination Refs</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getMessageDestinationRefs()
-	 * @see #getInterceptorType()
-	 * @generated
-	 */
-	EReference getInterceptorType_MessageDestinationRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getPersistenceContextRefs <em>Persistence Context Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Persistence Context Refs</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getPersistenceContextRefs()
-	 * @see #getInterceptorType()
-	 * @generated
-	 */
-	EReference getInterceptorType_PersistenceContextRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getPersistenceUnitRefs <em>Persistence Unit Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Persistence Unit Refs</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getPersistenceUnitRefs()
-	 * @see #getInterceptorType()
-	 * @generated
-	 */
-	EReference getInterceptorType_PersistenceUnitRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getPostConstructs <em>Post Constructs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Post Constructs</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getPostConstructs()
-	 * @see #getInterceptorType()
-	 * @generated
-	 */
-	EReference getInterceptorType_PostConstructs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getPreDestroys <em>Pre Destroys</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Pre Destroys</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getPreDestroys()
-	 * @see #getInterceptorType()
-	 * @generated
-	 */
-	EReference getInterceptorType_PreDestroys();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getPostActivates <em>Post Activates</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Post Activates</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getPostActivates()
-	 * @see #getInterceptorType()
-	 * @generated
-	 */
-	EReference getInterceptorType_PostActivates();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getPrePassivates <em>Pre Passivates</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Pre Passivates</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getPrePassivates()
-	 * @see #getInterceptorType()
-	 * @generated
-	 */
-	EReference getInterceptorType_PrePassivates();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getId()
-	 * @see #getInterceptorType()
-	 * @generated
-	 */
-	EAttribute getInterceptorType_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean <em>Message Driven Bean</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Message Driven Bean</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean
-	 * @generated
-	 */
-	EClass getMessageDrivenBean();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getDescriptions()
-	 * @see #getMessageDrivenBean()
-	 * @generated
-	 */
-	EReference getMessageDrivenBean_Descriptions();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getDisplayNames <em>Display Names</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Display Names</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getDisplayNames()
-	 * @see #getMessageDrivenBean()
-	 * @generated
-	 */
-	EReference getMessageDrivenBean_DisplayNames();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getIcons <em>Icons</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Icons</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getIcons()
-	 * @see #getMessageDrivenBean()
-	 * @generated
-	 */
-	EReference getMessageDrivenBean_Icons();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getEjbName <em>Ejb Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Ejb Name</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getEjbName()
-	 * @see #getMessageDrivenBean()
-	 * @generated
-	 */
-	EAttribute getMessageDrivenBean_EjbName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getMappedName <em>Mapped Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Mapped Name</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getMappedName()
-	 * @see #getMessageDrivenBean()
-	 * @generated
-	 */
-	EAttribute getMessageDrivenBean_MappedName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getEjbClass <em>Ejb Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Ejb Class</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getEjbClass()
-	 * @see #getMessageDrivenBean()
-	 * @generated
-	 */
-	EAttribute getMessageDrivenBean_EjbClass();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getMessagingType <em>Messaging Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Messaging Type</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getMessagingType()
-	 * @see #getMessageDrivenBean()
-	 * @generated
-	 */
-	EAttribute getMessageDrivenBean_MessagingType();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getTimeoutMethod <em>Timeout Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Timeout Method</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getTimeoutMethod()
-	 * @see #getMessageDrivenBean()
-	 * @generated
-	 */
-	EReference getMessageDrivenBean_TimeoutMethod();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getTransactionType <em>Transaction Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Transaction Type</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getTransactionType()
-	 * @see #getMessageDrivenBean()
-	 * @generated
-	 */
-	EAttribute getMessageDrivenBean_TransactionType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getMessageDestinationType <em>Message Destination Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Message Destination Type</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getMessageDestinationType()
-	 * @see #getMessageDrivenBean()
-	 * @generated
-	 */
-	EAttribute getMessageDrivenBean_MessageDestinationType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getMessageDestinationLink <em>Message Destination Link</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Message Destination Link</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getMessageDestinationLink()
-	 * @see #getMessageDrivenBean()
-	 * @generated
-	 */
-	EAttribute getMessageDrivenBean_MessageDestinationLink();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getActivationConfig <em>Activation Config</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Activation Config</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getActivationConfig()
-	 * @see #getMessageDrivenBean()
-	 * @generated
-	 */
-	EReference getMessageDrivenBean_ActivationConfig();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getAroundInvokes <em>Around Invokes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Around Invokes</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getAroundInvokes()
-	 * @see #getMessageDrivenBean()
-	 * @generated
-	 */
-	EReference getMessageDrivenBean_AroundInvokes();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getEnvEntries <em>Env Entries</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Env Entries</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getEnvEntries()
-	 * @see #getMessageDrivenBean()
-	 * @generated
-	 */
-	EReference getMessageDrivenBean_EnvEntries();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getEjbRefs <em>Ejb Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Ejb Refs</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getEjbRefs()
-	 * @see #getMessageDrivenBean()
-	 * @generated
-	 */
-	EReference getMessageDrivenBean_EjbRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getEjbLocalRefs <em>Ejb Local Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Ejb Local Refs</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getEjbLocalRefs()
-	 * @see #getMessageDrivenBean()
-	 * @generated
-	 */
-	EReference getMessageDrivenBean_EjbLocalRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getServiceRefs <em>Service Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Service Refs</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getServiceRefs()
-	 * @see #getMessageDrivenBean()
-	 * @generated
-	 */
-	EReference getMessageDrivenBean_ServiceRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getResourceRefs <em>Resource Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Resource Refs</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getResourceRefs()
-	 * @see #getMessageDrivenBean()
-	 * @generated
-	 */
-	EReference getMessageDrivenBean_ResourceRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getResourceEnvRefs <em>Resource Env Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Resource Env Refs</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getResourceEnvRefs()
-	 * @see #getMessageDrivenBean()
-	 * @generated
-	 */
-	EReference getMessageDrivenBean_ResourceEnvRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getMessageDestinationRefs <em>Message Destination Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Message Destination Refs</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getMessageDestinationRefs()
-	 * @see #getMessageDrivenBean()
-	 * @generated
-	 */
-	EReference getMessageDrivenBean_MessageDestinationRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getPersistenceContextRefs <em>Persistence Context Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Persistence Context Refs</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getPersistenceContextRefs()
-	 * @see #getMessageDrivenBean()
-	 * @generated
-	 */
-	EReference getMessageDrivenBean_PersistenceContextRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getPersistenceUnitRefs <em>Persistence Unit Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Persistence Unit Refs</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getPersistenceUnitRefs()
-	 * @see #getMessageDrivenBean()
-	 * @generated
-	 */
-	EReference getMessageDrivenBean_PersistenceUnitRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getPostConstructs <em>Post Constructs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Post Constructs</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getPostConstructs()
-	 * @see #getMessageDrivenBean()
-	 * @generated
-	 */
-	EReference getMessageDrivenBean_PostConstructs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getPreDestroys <em>Pre Destroys</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Pre Destroys</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getPreDestroys()
-	 * @see #getMessageDrivenBean()
-	 * @generated
-	 */
-	EReference getMessageDrivenBean_PreDestroys();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getSecurityIdentity <em>Security Identity</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Security Identity</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getSecurityIdentity()
-	 * @see #getMessageDrivenBean()
-	 * @generated
-	 */
-	EReference getMessageDrivenBean_SecurityIdentity();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getId()
-	 * @see #getMessageDrivenBean()
-	 * @generated
-	 */
-	EAttribute getMessageDrivenBean_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.MethodParams <em>Method Params</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Method Params</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MethodParams
-	 * @generated
-	 */
-	EClass getMethodParams();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.ejb.MethodParams#getMethodParams <em>Method Params</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Method Params</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MethodParams#getMethodParams()
-	 * @see #getMethodParams()
-	 * @generated
-	 */
-	EAttribute getMethodParams_MethodParams();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.MethodParams#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MethodParams#getId()
-	 * @see #getMethodParams()
-	 * @generated
-	 */
-	EAttribute getMethodParams_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.MethodPermission <em>Method Permission</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Method Permission</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MethodPermission
-	 * @generated
-	 */
-	EClass getMethodPermission();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MethodPermission#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MethodPermission#getDescriptions()
-	 * @see #getMethodPermission()
-	 * @generated
-	 */
-	EReference getMethodPermission_Descriptions();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.ejb.MethodPermission#getRoleNames <em>Role Names</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Role Names</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MethodPermission#getRoleNames()
-	 * @see #getMethodPermission()
-	 * @generated
-	 */
-	EAttribute getMethodPermission_RoleNames();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.MethodPermission#getUnchecked <em>Unchecked</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Unchecked</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MethodPermission#getUnchecked()
-	 * @see #getMethodPermission()
-	 * @generated
-	 */
-	EReference getMethodPermission_Unchecked();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MethodPermission#getMethods <em>Methods</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Methods</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MethodPermission#getMethods()
-	 * @see #getMethodPermission()
-	 * @generated
-	 */
-	EReference getMethodPermission_Methods();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.MethodPermission#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MethodPermission#getId()
-	 * @see #getMethodPermission()
-	 * @generated
-	 */
-	EAttribute getMethodPermission_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.MethodType <em>Method Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Method Type</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MethodType
-	 * @generated
-	 */
-	EClass getMethodType();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MethodType#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MethodType#getDescriptions()
-	 * @see #getMethodType()
-	 * @generated
-	 */
-	EReference getMethodType_Descriptions();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.MethodType#getEjbName <em>Ejb Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Ejb Name</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MethodType#getEjbName()
-	 * @see #getMethodType()
-	 * @generated
-	 */
-	EAttribute getMethodType_EjbName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.MethodType#getMethodIntf <em>Method Intf</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Method Intf</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MethodType#getMethodIntf()
-	 * @see #getMethodType()
-	 * @generated
-	 */
-	EAttribute getMethodType_MethodIntf();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.MethodType#getMethodName <em>Method Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Method Name</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MethodType#getMethodName()
-	 * @see #getMethodType()
-	 * @generated
-	 */
-	EAttribute getMethodType_MethodName();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.MethodType#getMethodParams <em>Method Params</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Method Params</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MethodType#getMethodParams()
-	 * @see #getMethodType()
-	 * @generated
-	 */
-	EReference getMethodType_MethodParams();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.MethodType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MethodType#getId()
-	 * @see #getMethodType()
-	 * @generated
-	 */
-	EAttribute getMethodType_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.NamedMethodType <em>Named Method Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Named Method Type</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.NamedMethodType
-	 * @generated
-	 */
-	EClass getNamedMethodType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.NamedMethodType#getMethodName <em>Method Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Method Name</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.NamedMethodType#getMethodName()
-	 * @see #getNamedMethodType()
-	 * @generated
-	 */
-	EAttribute getNamedMethodType_MethodName();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.NamedMethodType#getMethodParams <em>Method Params</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Method Params</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.NamedMethodType#getMethodParams()
-	 * @see #getNamedMethodType()
-	 * @generated
-	 */
-	EReference getNamedMethodType_MethodParams();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.NamedMethodType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.NamedMethodType#getId()
-	 * @see #getNamedMethodType()
-	 * @generated
-	 */
-	EAttribute getNamedMethodType_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.Query <em>Query</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Query</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.Query
-	 * @generated
-	 */
-	EClass getQuery();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.Query#getDescription <em>Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Description</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.Query#getDescription()
-	 * @see #getQuery()
-	 * @generated
-	 */
-	EReference getQuery_Description();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.Query#getQueryMethod <em>Query Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Query Method</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.Query#getQueryMethod()
-	 * @see #getQuery()
-	 * @generated
-	 */
-	EReference getQuery_QueryMethod();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.Query#getResultTypeMapping <em>Result Type Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Result Type Mapping</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.Query#getResultTypeMapping()
-	 * @see #getQuery()
-	 * @generated
-	 */
-	EAttribute getQuery_ResultTypeMapping();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.Query#getEjbQl <em>Ejb Ql</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Ejb Ql</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.Query#getEjbQl()
-	 * @see #getQuery()
-	 * @generated
-	 */
-	EAttribute getQuery_EjbQl();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.Query#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.Query#getId()
-	 * @see #getQuery()
-	 * @generated
-	 */
-	EAttribute getQuery_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.QueryMethod <em>Query Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Query Method</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.QueryMethod
-	 * @generated
-	 */
-	EClass getQueryMethod();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.QueryMethod#getMethodName <em>Method Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Method Name</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.QueryMethod#getMethodName()
-	 * @see #getQueryMethod()
-	 * @generated
-	 */
-	EAttribute getQueryMethod_MethodName();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.QueryMethod#getMethodParams <em>Method Params</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Method Params</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.QueryMethod#getMethodParams()
-	 * @see #getQueryMethod()
-	 * @generated
-	 */
-	EReference getQueryMethod_MethodParams();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.QueryMethod#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.QueryMethod#getId()
-	 * @see #getQueryMethod()
-	 * @generated
-	 */
-	EAttribute getQueryMethod_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.RelationshipRoleSourceType <em>Relationship Role Source Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Relationship Role Source Type</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.RelationshipRoleSourceType
-	 * @generated
-	 */
-	EClass getRelationshipRoleSourceType();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.RelationshipRoleSourceType#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.RelationshipRoleSourceType#getDescriptions()
-	 * @see #getRelationshipRoleSourceType()
-	 * @generated
-	 */
-	EReference getRelationshipRoleSourceType_Descriptions();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.RelationshipRoleSourceType#getEjbName <em>Ejb Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Ejb Name</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.RelationshipRoleSourceType#getEjbName()
-	 * @see #getRelationshipRoleSourceType()
-	 * @generated
-	 */
-	EAttribute getRelationshipRoleSourceType_EjbName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.RelationshipRoleSourceType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.RelationshipRoleSourceType#getId()
-	 * @see #getRelationshipRoleSourceType()
-	 * @generated
-	 */
-	EAttribute getRelationshipRoleSourceType_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.Relationships <em>Relationships</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Relationships</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.Relationships
-	 * @generated
-	 */
-	EClass getRelationships();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.Relationships#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.Relationships#getDescriptions()
-	 * @see #getRelationships()
-	 * @generated
-	 */
-	EReference getRelationships_Descriptions();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.Relationships#getEjbRelations <em>Ejb Relations</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Ejb Relations</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.Relationships#getEjbRelations()
-	 * @see #getRelationships()
-	 * @generated
-	 */
-	EReference getRelationships_EjbRelations();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.Relationships#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.Relationships#getId()
-	 * @see #getRelationships()
-	 * @generated
-	 */
-	EAttribute getRelationships_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.RemoveMethodType <em>Remove Method Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Remove Method Type</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.RemoveMethodType
-	 * @generated
-	 */
-	EClass getRemoveMethodType();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.RemoveMethodType#getBeanMethod <em>Bean Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Bean Method</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.RemoveMethodType#getBeanMethod()
-	 * @see #getRemoveMethodType()
-	 * @generated
-	 */
-	EReference getRemoveMethodType_BeanMethod();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.RemoveMethodType#isRetainIfException <em>Retain If Exception</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Retain If Exception</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.RemoveMethodType#isRetainIfException()
-	 * @see #getRemoveMethodType()
-	 * @generated
-	 */
-	EAttribute getRemoveMethodType_RetainIfException();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.RemoveMethodType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.RemoveMethodType#getId()
-	 * @see #getRemoveMethodType()
-	 * @generated
-	 */
-	EAttribute getRemoveMethodType_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.SecurityIdentityType <em>Security Identity Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Security Identity Type</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.SecurityIdentityType
-	 * @generated
-	 */
-	EClass getSecurityIdentityType();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SecurityIdentityType#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.SecurityIdentityType#getDescriptions()
-	 * @see #getSecurityIdentityType()
-	 * @generated
-	 */
-	EReference getSecurityIdentityType_Descriptions();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.SecurityIdentityType#getUseCallerIdentity <em>Use Caller Identity</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Use Caller Identity</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.SecurityIdentityType#getUseCallerIdentity()
-	 * @see #getSecurityIdentityType()
-	 * @generated
-	 */
-	EReference getSecurityIdentityType_UseCallerIdentity();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.SecurityIdentityType#getRunAs <em>Run As</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Run As</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.SecurityIdentityType#getRunAs()
-	 * @see #getSecurityIdentityType()
-	 * @generated
-	 */
-	EReference getSecurityIdentityType_RunAs();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.SecurityIdentityType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.SecurityIdentityType#getId()
-	 * @see #getSecurityIdentityType()
-	 * @generated
-	 */
-	EAttribute getSecurityIdentityType_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.SessionBean <em>Session Bean</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Session Bean</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.SessionBean
-	 * @generated
-	 */
-	EClass getSessionBean();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getDescriptions()
-	 * @see #getSessionBean()
-	 * @generated
-	 */
-	EReference getSessionBean_Descriptions();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getDisplayNames <em>Display Names</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Display Names</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getDisplayNames()
-	 * @see #getSessionBean()
-	 * @generated
-	 */
-	EReference getSessionBean_DisplayNames();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getIcons <em>Icons</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Icons</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getIcons()
-	 * @see #getSessionBean()
-	 * @generated
-	 */
-	EReference getSessionBean_Icons();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.SessionBean#getEjbName <em>Ejb Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Ejb Name</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getEjbName()
-	 * @see #getSessionBean()
-	 * @generated
-	 */
-	EAttribute getSessionBean_EjbName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.SessionBean#getMappedName <em>Mapped Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Mapped Name</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getMappedName()
-	 * @see #getSessionBean()
-	 * @generated
-	 */
-	EAttribute getSessionBean_MappedName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.SessionBean#getHome <em>Home</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Home</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getHome()
-	 * @see #getSessionBean()
-	 * @generated
-	 */
-	EAttribute getSessionBean_Home();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.SessionBean#getRemote <em>Remote</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Remote</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getRemote()
-	 * @see #getSessionBean()
-	 * @generated
-	 */
-	EAttribute getSessionBean_Remote();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.SessionBean#getLocalHome <em>Local Home</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Local Home</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getLocalHome()
-	 * @see #getSessionBean()
-	 * @generated
-	 */
-	EAttribute getSessionBean_LocalHome();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.SessionBean#getLocal <em>Local</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Local</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getLocal()
-	 * @see #getSessionBean()
-	 * @generated
-	 */
-	EAttribute getSessionBean_Local();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getBusinessLocals <em>Business Locals</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Business Locals</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getBusinessLocals()
-	 * @see #getSessionBean()
-	 * @generated
-	 */
-	EAttribute getSessionBean_BusinessLocals();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getBusinessRemotes <em>Business Remotes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Business Remotes</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getBusinessRemotes()
-	 * @see #getSessionBean()
-	 * @generated
-	 */
-	EAttribute getSessionBean_BusinessRemotes();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.SessionBean#getServiceEndpoint <em>Service Endpoint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Service Endpoint</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getServiceEndpoint()
-	 * @see #getSessionBean()
-	 * @generated
-	 */
-	EAttribute getSessionBean_ServiceEndpoint();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.SessionBean#getEjbClass <em>Ejb Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Ejb Class</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getEjbClass()
-	 * @see #getSessionBean()
-	 * @generated
-	 */
-	EAttribute getSessionBean_EjbClass();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.SessionBean#getSessionType <em>Session Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Session Type</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getSessionType()
-	 * @see #getSessionBean()
-	 * @generated
-	 */
-	EAttribute getSessionBean_SessionType();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.SessionBean#getTimeoutMethod <em>Timeout Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Timeout Method</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getTimeoutMethod()
-	 * @see #getSessionBean()
-	 * @generated
-	 */
-	EReference getSessionBean_TimeoutMethod();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getInitMethods <em>Init Methods</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Init Methods</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getInitMethods()
-	 * @see #getSessionBean()
-	 * @generated
-	 */
-	EReference getSessionBean_InitMethods();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getRemoveMethods <em>Remove Methods</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Remove Methods</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getRemoveMethods()
-	 * @see #getSessionBean()
-	 * @generated
-	 */
-	EReference getSessionBean_RemoveMethods();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.SessionBean#getTransactionType <em>Transaction Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Transaction Type</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getTransactionType()
-	 * @see #getSessionBean()
-	 * @generated
-	 */
-	EAttribute getSessionBean_TransactionType();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getAroundInvokes <em>Around Invokes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Around Invokes</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getAroundInvokes()
-	 * @see #getSessionBean()
-	 * @generated
-	 */
-	EReference getSessionBean_AroundInvokes();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getEnvEntries <em>Env Entries</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Env Entries</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getEnvEntries()
-	 * @see #getSessionBean()
-	 * @generated
-	 */
-	EReference getSessionBean_EnvEntries();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getEjbRefs <em>Ejb Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Ejb Refs</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getEjbRefs()
-	 * @see #getSessionBean()
-	 * @generated
-	 */
-	EReference getSessionBean_EjbRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getEjbLocalRefs <em>Ejb Local Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Ejb Local Refs</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getEjbLocalRefs()
-	 * @see #getSessionBean()
-	 * @generated
-	 */
-	EReference getSessionBean_EjbLocalRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getServiceRefs <em>Service Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Service Refs</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getServiceRefs()
-	 * @see #getSessionBean()
-	 * @generated
-	 */
-	EReference getSessionBean_ServiceRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getResourceRefs <em>Resource Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Resource Refs</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getResourceRefs()
-	 * @see #getSessionBean()
-	 * @generated
-	 */
-	EReference getSessionBean_ResourceRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getResourceEnvRefs <em>Resource Env Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Resource Env Refs</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getResourceEnvRefs()
-	 * @see #getSessionBean()
-	 * @generated
-	 */
-	EReference getSessionBean_ResourceEnvRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getMessageDestinationRefs <em>Message Destination Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Message Destination Refs</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getMessageDestinationRefs()
-	 * @see #getSessionBean()
-	 * @generated
-	 */
-	EReference getSessionBean_MessageDestinationRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getPersistenceContextRefs <em>Persistence Context Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Persistence Context Refs</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getPersistenceContextRefs()
-	 * @see #getSessionBean()
-	 * @generated
-	 */
-	EReference getSessionBean_PersistenceContextRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getPersistenceUnitRefs <em>Persistence Unit Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Persistence Unit Refs</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getPersistenceUnitRefs()
-	 * @see #getSessionBean()
-	 * @generated
-	 */
-	EReference getSessionBean_PersistenceUnitRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getPostConstructs <em>Post Constructs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Post Constructs</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getPostConstructs()
-	 * @see #getSessionBean()
-	 * @generated
-	 */
-	EReference getSessionBean_PostConstructs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getPreDestroys <em>Pre Destroys</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Pre Destroys</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getPreDestroys()
-	 * @see #getSessionBean()
-	 * @generated
-	 */
-	EReference getSessionBean_PreDestroys();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getPostActivates <em>Post Activates</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Post Activates</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getPostActivates()
-	 * @see #getSessionBean()
-	 * @generated
-	 */
-	EReference getSessionBean_PostActivates();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getPrePassivates <em>Pre Passivates</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Pre Passivates</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getPrePassivates()
-	 * @see #getSessionBean()
-	 * @generated
-	 */
-	EReference getSessionBean_PrePassivates();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getSecurityRoleRefs <em>Security Role Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Security Role Refs</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getSecurityRoleRefs()
-	 * @see #getSessionBean()
-	 * @generated
-	 */
-	EReference getSessionBean_SecurityRoleRefs();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.SessionBean#getSecurityIdentities <em>Security Identities</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Security Identities</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getSecurityIdentities()
-	 * @see #getSessionBean()
-	 * @generated
-	 */
-	EReference getSessionBean_SecurityIdentities();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.SessionBean#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getId()
-	 * @see #getSessionBean()
-	 * @generated
-	 */
-	EAttribute getSessionBean_Id();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jst.javaee.ejb.CmpVersionType <em>Cmp Version Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Cmp Version Type</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.CmpVersionType
-	 * @generated
-	 */
-	EEnum getCmpVersionType();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jst.javaee.ejb.CMRFieldType <em>CMR Field Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>CMR Field Type</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.CMRFieldType
-	 * @generated
-	 */
-	EEnum getCMRFieldType();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jst.javaee.ejb.MethodInterfaceType <em>Method Interface Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Method Interface Type</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MethodInterfaceType
-	 * @generated
-	 */
-	EEnum getMethodInterfaceType();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jst.javaee.ejb.MultiplicityType <em>Multiplicity Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Multiplicity Type</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MultiplicityType
-	 * @generated
-	 */
-	EEnum getMultiplicityType();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jst.javaee.ejb.PersistenceType <em>Persistence Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Persistence Type</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.PersistenceType
-	 * @generated
-	 */
-	EEnum getPersistenceType();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jst.javaee.ejb.ResultTypeMappingType <em>Result Type Mapping Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Result Type Mapping Type</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.ResultTypeMappingType
-	 * @generated
-	 */
-	EEnum getResultTypeMappingType();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jst.javaee.ejb.SessionType <em>Session Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Session Type</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.SessionType
-	 * @generated
-	 */
-	EEnum getSessionType();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jst.javaee.ejb.TransactionAttributeType <em>Transaction Attribute Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Transaction Attribute Type</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.TransactionAttributeType
-	 * @generated
-	 */
-	EEnum getTransactionAttributeType();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jst.javaee.ejb.TransactionType <em>Transaction Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Transaction Type</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.TransactionType
-	 * @generated
-	 */
-	EEnum getTransactionType();
-
-	/**
-	 * Returns the meta object for data type '{@link org.eclipse.jst.javaee.ejb.CmpVersionType <em>Cmp Version Type Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Cmp Version Type Object</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.CmpVersionType
-	 * @generated
-	 */
-	EDataType getCmpVersionTypeObject();
-
-	/**
-	 * Returns the meta object for data type '{@link org.eclipse.jst.javaee.ejb.CMRFieldType <em>CMR Field Type Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>CMR Field Type Object</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.CMRFieldType
-	 * @generated
-	 */
-	EDataType getCMRFieldTypeObject();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Class Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Class Type</em>'.
-	 * @see java.lang.String
-	 * @generated
-	 */
-	EDataType getEjbClassType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Name Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Name Type</em>'.
-	 * @see java.lang.String
-	 * @generated
-	 */
-	EDataType getEjbNameType();
-
-	/**
-	 * Returns the meta object for data type '{@link org.eclipse.jst.javaee.ejb.MethodInterfaceType <em>Method Interface Type Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Method Interface Type Object</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MethodInterfaceType
-	 * @generated
-	 */
-	EDataType getMethodInterfaceTypeObject();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Method Name Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Method Name Type</em>'.
-	 * @see java.lang.String
-	 * @generated
-	 */
-	EDataType getMethodNameType();
-
-	/**
-	 * Returns the meta object for data type '{@link org.eclipse.jst.javaee.ejb.MultiplicityType <em>Multiplicity Type Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Multiplicity Type Object</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.MultiplicityType
-	 * @generated
-	 */
-	EDataType getMultiplicityTypeObject();
-
-	/**
-	 * Returns the meta object for data type '{@link org.eclipse.jst.javaee.ejb.PersistenceType <em>Persistence Type Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Persistence Type Object</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.PersistenceType
-	 * @generated
-	 */
-	EDataType getPersistenceTypeObject();
-
-	/**
-	 * Returns the meta object for data type '{@link org.eclipse.jst.javaee.ejb.ResultTypeMappingType <em>Result Type Mapping Type Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Result Type Mapping Type Object</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.ResultTypeMappingType
-	 * @generated
-	 */
-	EDataType getResultTypeMappingTypeObject();
-
-	/**
-	 * Returns the meta object for data type '{@link org.eclipse.jst.javaee.ejb.SessionType <em>Session Type Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Session Type Object</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.SessionType
-	 * @generated
-	 */
-	EDataType getSessionTypeObject();
-
-	/**
-	 * Returns the meta object for data type '{@link org.eclipse.jst.javaee.ejb.TransactionAttributeType <em>Transaction Attribute Type Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Transaction Attribute Type Object</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.TransactionAttributeType
-	 * @generated
-	 */
-	EDataType getTransactionAttributeTypeObject();
-
-	/**
-	 * Returns the meta object for data type '{@link org.eclipse.jst.javaee.ejb.TransactionType <em>Transaction Type Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Transaction Type Object</em>'.
-	 * @see org.eclipse.jst.javaee.ejb.TransactionType
-	 * @generated
-	 */
-	EDataType getTransactionTypeObject();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	EjbFactory getEjbFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * 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>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals  {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.ActivationConfigImpl <em>Activation Config</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.ActivationConfigImpl
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getActivationConfig()
-		 * @generated
-		 */
-		EClass ACTIVATION_CONFIG = eINSTANCE.getActivationConfig();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ACTIVATION_CONFIG__DESCRIPTIONS = eINSTANCE.getActivationConfig_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Activation Config Properties</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ACTIVATION_CONFIG__ACTIVATION_CONFIG_PROPERTIES = eINSTANCE.getActivationConfig_ActivationConfigProperties();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ACTIVATION_CONFIG__ID = eINSTANCE.getActivationConfig_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.ActivationConfigPropertyImpl <em>Activation Config Property</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.ActivationConfigPropertyImpl
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getActivationConfigProperty()
-		 * @generated
-		 */
-		EClass ACTIVATION_CONFIG_PROPERTY = eINSTANCE.getActivationConfigProperty();
-
-		/**
-		 * The meta object literal for the '<em><b>Activation Config Property Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ACTIVATION_CONFIG_PROPERTY__ACTIVATION_CONFIG_PROPERTY_NAME = eINSTANCE.getActivationConfigProperty_ActivationConfigPropertyName();
-
-		/**
-		 * The meta object literal for the '<em><b>Activation Config Property Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ACTIVATION_CONFIG_PROPERTY__ACTIVATION_CONFIG_PROPERTY_VALUE = eINSTANCE.getActivationConfigProperty_ActivationConfigPropertyValue();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ACTIVATION_CONFIG_PROPERTY__ID = eINSTANCE.getActivationConfigProperty_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.ApplicationExceptionImpl <em>Application Exception</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.ApplicationExceptionImpl
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getApplicationException()
-		 * @generated
-		 */
-		EClass APPLICATION_EXCEPTION = eINSTANCE.getApplicationException();
-
-		/**
-		 * The meta object literal for the '<em><b>Exception Class</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute APPLICATION_EXCEPTION__EXCEPTION_CLASS = eINSTANCE.getApplicationException_ExceptionClass();
-
-		/**
-		 * The meta object literal for the '<em><b>Rollback</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute APPLICATION_EXCEPTION__ROLLBACK = eINSTANCE.getApplicationException_Rollback();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute APPLICATION_EXCEPTION__ID = eINSTANCE.getApplicationException_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.AroundInvokeTypeImpl <em>Around Invoke Type</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.AroundInvokeTypeImpl
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getAroundInvokeType()
-		 * @generated
-		 */
-		EClass AROUND_INVOKE_TYPE = eINSTANCE.getAroundInvokeType();
-
-		/**
-		 * The meta object literal for the '<em><b>Class</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute AROUND_INVOKE_TYPE__CLASS = eINSTANCE.getAroundInvokeType_Class();
-
-		/**
-		 * The meta object literal for the '<em><b>Method Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute AROUND_INVOKE_TYPE__METHOD_NAME = eINSTANCE.getAroundInvokeType_MethodName();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.AssemblyDescriptorImpl <em>Assembly Descriptor</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.AssemblyDescriptorImpl
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getAssemblyDescriptor()
-		 * @generated
-		 */
-		EClass ASSEMBLY_DESCRIPTOR = eINSTANCE.getAssemblyDescriptor();
-
-		/**
-		 * The meta object literal for the '<em><b>Security Roles</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ASSEMBLY_DESCRIPTOR__SECURITY_ROLES = eINSTANCE.getAssemblyDescriptor_SecurityRoles();
-
-		/**
-		 * The meta object literal for the '<em><b>Method Permissions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ASSEMBLY_DESCRIPTOR__METHOD_PERMISSIONS = eINSTANCE.getAssemblyDescriptor_MethodPermissions();
-
-		/**
-		 * The meta object literal for the '<em><b>Container Transactions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ASSEMBLY_DESCRIPTOR__CONTAINER_TRANSACTIONS = eINSTANCE.getAssemblyDescriptor_ContainerTransactions();
-
-		/**
-		 * The meta object literal for the '<em><b>Interceptor Bindings</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ASSEMBLY_DESCRIPTOR__INTERCEPTOR_BINDINGS = eINSTANCE.getAssemblyDescriptor_InterceptorBindings();
-
-		/**
-		 * The meta object literal for the '<em><b>Message Destinations</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ASSEMBLY_DESCRIPTOR__MESSAGE_DESTINATIONS = eINSTANCE.getAssemblyDescriptor_MessageDestinations();
-
-		/**
-		 * The meta object literal for the '<em><b>Exclude List</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ASSEMBLY_DESCRIPTOR__EXCLUDE_LIST = eINSTANCE.getAssemblyDescriptor_ExcludeList();
-
-		/**
-		 * The meta object literal for the '<em><b>Application Exceptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ASSEMBLY_DESCRIPTOR__APPLICATION_EXCEPTIONS = eINSTANCE.getAssemblyDescriptor_ApplicationExceptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ASSEMBLY_DESCRIPTOR__ID = eINSTANCE.getAssemblyDescriptor_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.CMPFieldImpl <em>CMP Field</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.CMPFieldImpl
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getCMPField()
-		 * @generated
-		 */
-		EClass CMP_FIELD = eINSTANCE.getCMPField();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CMP_FIELD__DESCRIPTIONS = eINSTANCE.getCMPField_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Field Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CMP_FIELD__FIELD_NAME = eINSTANCE.getCMPField_FieldName();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CMP_FIELD__ID = eINSTANCE.getCMPField_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.CMRFieldImpl <em>CMR Field</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.CMRFieldImpl
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getCMRField()
-		 * @generated
-		 */
-		EClass CMR_FIELD = eINSTANCE.getCMRField();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CMR_FIELD__DESCRIPTIONS = eINSTANCE.getCMRField_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Cmr Field Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CMR_FIELD__CMR_FIELD_NAME = eINSTANCE.getCMRField_CmrFieldName();
-
-		/**
-		 * The meta object literal for the '<em><b>Cmr Field Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CMR_FIELD__CMR_FIELD_TYPE = eINSTANCE.getCMRField_CmrFieldType();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CMR_FIELD__ID = eINSTANCE.getCMRField_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.ContainerTransactionTypeImpl <em>Container Transaction Type</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.ContainerTransactionTypeImpl
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getContainerTransactionType()
-		 * @generated
-		 */
-		EClass CONTAINER_TRANSACTION_TYPE = eINSTANCE.getContainerTransactionType();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CONTAINER_TRANSACTION_TYPE__DESCRIPTIONS = eINSTANCE.getContainerTransactionType_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Methods</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CONTAINER_TRANSACTION_TYPE__METHODS = eINSTANCE.getContainerTransactionType_Methods();
-
-		/**
-		 * The meta object literal for the '<em><b>Trans Attribute</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CONTAINER_TRANSACTION_TYPE__TRANS_ATTRIBUTE = eINSTANCE.getContainerTransactionType_TransAttribute();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CONTAINER_TRANSACTION_TYPE__ID = eINSTANCE.getContainerTransactionType_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl <em>EJB Jar</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getEJBJar()
-		 * @generated
-		 */
-		EClass EJB_JAR = eINSTANCE.getEJBJar();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EJB_JAR__DESCRIPTIONS = eINSTANCE.getEJBJar_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Display Names</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EJB_JAR__DISPLAY_NAMES = eINSTANCE.getEJBJar_DisplayNames();
-
-		/**
-		 * The meta object literal for the '<em><b>Icons</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EJB_JAR__ICONS = eINSTANCE.getEJBJar_Icons();
-
-		/**
-		 * The meta object literal for the '<em><b>Enterprise Beans</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EJB_JAR__ENTERPRISE_BEANS = eINSTANCE.getEJBJar_EnterpriseBeans();
-
-		/**
-		 * The meta object literal for the '<em><b>Interceptors</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EJB_JAR__INTERCEPTORS = eINSTANCE.getEJBJar_Interceptors();
-
-		/**
-		 * The meta object literal for the '<em><b>Relationships</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EJB_JAR__RELATIONSHIPS = eINSTANCE.getEJBJar_Relationships();
-
-		/**
-		 * The meta object literal for the '<em><b>Assembly Descriptor</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EJB_JAR__ASSEMBLY_DESCRIPTOR = eINSTANCE.getEJBJar_AssemblyDescriptor();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb Client Jar</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EJB_JAR__EJB_CLIENT_JAR = eINSTANCE.getEJBJar_EjbClientJar();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EJB_JAR__ID = eINSTANCE.getEJBJar_Id();
-
-		/**
-		 * The meta object literal for the '<em><b>Metadata Complete</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EJB_JAR__METADATA_COMPLETE = eINSTANCE.getEJBJar_MetadataComplete();
-
-		/**
-		 * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EJB_JAR__VERSION = eINSTANCE.getEJBJar_Version();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarDeploymentDescriptorImpl <em>EJB Jar Deployment Descriptor</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EJBJarDeploymentDescriptorImpl
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getEJBJarDeploymentDescriptor()
-		 * @generated
-		 */
-		EClass EJB_JAR_DEPLOYMENT_DESCRIPTOR = eINSTANCE.getEJBJarDeploymentDescriptor();
-
-		/**
-		 * The meta object literal for the '<em><b>Mixed</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EJB_JAR_DEPLOYMENT_DESCRIPTOR__MIXED = eINSTANCE.getEJBJarDeploymentDescriptor_Mixed();
-
-		/**
-		 * The meta object literal for the '<em><b>XMLNS Prefix Map</b></em>' map feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EJB_JAR_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP = eINSTANCE.getEJBJarDeploymentDescriptor_XMLNSPrefixMap();
-
-		/**
-		 * The meta object literal for the '<em><b>XSI Schema Location</b></em>' map feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EJB_JAR_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION = eINSTANCE.getEJBJarDeploymentDescriptor_XSISchemaLocation();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb Jar</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EJB_JAR_DEPLOYMENT_DESCRIPTOR__EJB_JAR = eINSTANCE.getEJBJarDeploymentDescriptor_EjbJar();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBRelationImpl <em>EJB Relation</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EJBRelationImpl
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getEJBRelation()
-		 * @generated
-		 */
-		EClass EJB_RELATION = eINSTANCE.getEJBRelation();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EJB_RELATION__DESCRIPTIONS = eINSTANCE.getEJBRelation_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb Relation Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EJB_RELATION__EJB_RELATION_NAME = eINSTANCE.getEJBRelation_EjbRelationName();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb Relationship Roles</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EJB_RELATION__EJB_RELATIONSHIP_ROLES = eINSTANCE.getEJBRelation_EjbRelationshipRoles();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EJB_RELATION__ID = eINSTANCE.getEJBRelation_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBRelationshipRoleImpl <em>EJB Relationship Role</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EJBRelationshipRoleImpl
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getEJBRelationshipRole()
-		 * @generated
-		 */
-		EClass EJB_RELATIONSHIP_ROLE = eINSTANCE.getEJBRelationshipRole();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EJB_RELATIONSHIP_ROLE__DESCRIPTIONS = eINSTANCE.getEJBRelationshipRole_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb Relationship Role Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EJB_RELATIONSHIP_ROLE__EJB_RELATIONSHIP_ROLE_NAME = eINSTANCE.getEJBRelationshipRole_EjbRelationshipRoleName();
-
-		/**
-		 * The meta object literal for the '<em><b>Multiplicity</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EJB_RELATIONSHIP_ROLE__MULTIPLICITY = eINSTANCE.getEJBRelationshipRole_Multiplicity();
-
-		/**
-		 * The meta object literal for the '<em><b>Cascade Delete</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EJB_RELATIONSHIP_ROLE__CASCADE_DELETE = eINSTANCE.getEJBRelationshipRole_CascadeDelete();
-
-		/**
-		 * The meta object literal for the '<em><b>Relationship Role Source</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EJB_RELATIONSHIP_ROLE__RELATIONSHIP_ROLE_SOURCE = eINSTANCE.getEJBRelationshipRole_RelationshipRoleSource();
-
-		/**
-		 * The meta object literal for the '<em><b>Cmr Field</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EJB_RELATIONSHIP_ROLE__CMR_FIELD = eINSTANCE.getEJBRelationshipRole_CmrField();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EJB_RELATIONSHIP_ROLE__ID = eINSTANCE.getEJBRelationshipRole_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.EnterpriseBeansImpl <em>Enterprise Beans</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EnterpriseBeansImpl
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getEnterpriseBeans()
-		 * @generated
-		 */
-		EClass ENTERPRISE_BEANS = eINSTANCE.getEnterpriseBeans();
-
-		/**
-		 * The meta object literal for the '<em><b>Group</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ENTERPRISE_BEANS__GROUP = eINSTANCE.getEnterpriseBeans_Group();
-
-		/**
-		 * The meta object literal for the '<em><b>Session Beans</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ENTERPRISE_BEANS__SESSION_BEANS = eINSTANCE.getEnterpriseBeans_SessionBeans();
-
-		/**
-		 * The meta object literal for the '<em><b>Entity Beans</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ENTERPRISE_BEANS__ENTITY_BEANS = eINSTANCE.getEnterpriseBeans_EntityBeans();
-
-		/**
-		 * The meta object literal for the '<em><b>Message Driven Beans</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ENTERPRISE_BEANS__MESSAGE_DRIVEN_BEANS = eINSTANCE.getEnterpriseBeans_MessageDrivenBeans();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ENTERPRISE_BEANS__ID = eINSTANCE.getEnterpriseBeans_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.EntityBeanImpl <em>Entity Bean</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EntityBeanImpl
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getEntityBean()
-		 * @generated
-		 */
-		EClass ENTITY_BEAN = eINSTANCE.getEntityBean();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ENTITY_BEAN__DESCRIPTIONS = eINSTANCE.getEntityBean_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Display Names</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ENTITY_BEAN__DISPLAY_NAMES = eINSTANCE.getEntityBean_DisplayNames();
-
-		/**
-		 * The meta object literal for the '<em><b>Icons</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ENTITY_BEAN__ICONS = eINSTANCE.getEntityBean_Icons();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ENTITY_BEAN__EJB_NAME = eINSTANCE.getEntityBean_EjbName();
-
-		/**
-		 * The meta object literal for the '<em><b>Mapped Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ENTITY_BEAN__MAPPED_NAME = eINSTANCE.getEntityBean_MappedName();
-
-		/**
-		 * The meta object literal for the '<em><b>Home</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ENTITY_BEAN__HOME = eINSTANCE.getEntityBean_Home();
-
-		/**
-		 * The meta object literal for the '<em><b>Remote</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ENTITY_BEAN__REMOTE = eINSTANCE.getEntityBean_Remote();
-
-		/**
-		 * The meta object literal for the '<em><b>Local Home</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ENTITY_BEAN__LOCAL_HOME = eINSTANCE.getEntityBean_LocalHome();
-
-		/**
-		 * The meta object literal for the '<em><b>Local</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ENTITY_BEAN__LOCAL = eINSTANCE.getEntityBean_Local();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb Class</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ENTITY_BEAN__EJB_CLASS = eINSTANCE.getEntityBean_EjbClass();
-
-		/**
-		 * The meta object literal for the '<em><b>Persistence Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ENTITY_BEAN__PERSISTENCE_TYPE = eINSTANCE.getEntityBean_PersistenceType();
-
-		/**
-		 * The meta object literal for the '<em><b>Prim Key Class</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ENTITY_BEAN__PRIM_KEY_CLASS = eINSTANCE.getEntityBean_PrimKeyClass();
-
-		/**
-		 * The meta object literal for the '<em><b>Reentrant</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ENTITY_BEAN__REENTRANT = eINSTANCE.getEntityBean_Reentrant();
-
-		/**
-		 * The meta object literal for the '<em><b>Cmp Version</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ENTITY_BEAN__CMP_VERSION = eINSTANCE.getEntityBean_CmpVersion();
-
-		/**
-		 * The meta object literal for the '<em><b>Abstract Schema Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ENTITY_BEAN__ABSTRACT_SCHEMA_NAME = eINSTANCE.getEntityBean_AbstractSchemaName();
-
-		/**
-		 * The meta object literal for the '<em><b>Cmp Fields</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ENTITY_BEAN__CMP_FIELDS = eINSTANCE.getEntityBean_CmpFields();
-
-		/**
-		 * The meta object literal for the '<em><b>Primkey Field</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ENTITY_BEAN__PRIMKEY_FIELD = eINSTANCE.getEntityBean_PrimkeyField();
-
-		/**
-		 * The meta object literal for the '<em><b>Env Entries</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ENTITY_BEAN__ENV_ENTRIES = eINSTANCE.getEntityBean_EnvEntries();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ENTITY_BEAN__EJB_REFS = eINSTANCE.getEntityBean_EjbRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb Local Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ENTITY_BEAN__EJB_LOCAL_REFS = eINSTANCE.getEntityBean_EjbLocalRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Service Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ENTITY_BEAN__SERVICE_REFS = eINSTANCE.getEntityBean_ServiceRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Resource Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ENTITY_BEAN__RESOURCE_REFS = eINSTANCE.getEntityBean_ResourceRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Resource Env Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ENTITY_BEAN__RESOURCE_ENV_REFS = eINSTANCE.getEntityBean_ResourceEnvRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Message Destination Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ENTITY_BEAN__MESSAGE_DESTINATION_REFS = eINSTANCE.getEntityBean_MessageDestinationRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Persistence Context Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ENTITY_BEAN__PERSISTENCE_CONTEXT_REFS = eINSTANCE.getEntityBean_PersistenceContextRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Persistence Unit Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ENTITY_BEAN__PERSISTENCE_UNIT_REFS = eINSTANCE.getEntityBean_PersistenceUnitRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Post Constructs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ENTITY_BEAN__POST_CONSTRUCTS = eINSTANCE.getEntityBean_PostConstructs();
-
-		/**
-		 * The meta object literal for the '<em><b>Pre Destroys</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ENTITY_BEAN__PRE_DESTROYS = eINSTANCE.getEntityBean_PreDestroys();
-
-		/**
-		 * The meta object literal for the '<em><b>Security Role Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ENTITY_BEAN__SECURITY_ROLE_REFS = eINSTANCE.getEntityBean_SecurityRoleRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Security Identity</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ENTITY_BEAN__SECURITY_IDENTITY = eINSTANCE.getEntityBean_SecurityIdentity();
-
-		/**
-		 * The meta object literal for the '<em><b>Queries</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ENTITY_BEAN__QUERIES = eINSTANCE.getEntityBean_Queries();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ENTITY_BEAN__ID = eINSTANCE.getEntityBean_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.ExcludeListImpl <em>Exclude List</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.ExcludeListImpl
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getExcludeList()
-		 * @generated
-		 */
-		EClass EXCLUDE_LIST = eINSTANCE.getExcludeList();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EXCLUDE_LIST__DESCRIPTIONS = eINSTANCE.getExcludeList_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Methods</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EXCLUDE_LIST__METHODS = eINSTANCE.getExcludeList_Methods();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EXCLUDE_LIST__ID = eINSTANCE.getExcludeList_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.InitMethodTypeImpl <em>Init Method Type</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.InitMethodTypeImpl
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getInitMethodType()
-		 * @generated
-		 */
-		EClass INIT_METHOD_TYPE = eINSTANCE.getInitMethodType();
-
-		/**
-		 * The meta object literal for the '<em><b>Create Method</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference INIT_METHOD_TYPE__CREATE_METHOD = eINSTANCE.getInitMethodType_CreateMethod();
-
-		/**
-		 * The meta object literal for the '<em><b>Bean Method</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference INIT_METHOD_TYPE__BEAN_METHOD = eINSTANCE.getInitMethodType_BeanMethod();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute INIT_METHOD_TYPE__ID = eINSTANCE.getInitMethodType_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorBindingTypeImpl <em>Interceptor Binding Type</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.InterceptorBindingTypeImpl
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getInterceptorBindingType()
-		 * @generated
-		 */
-		EClass INTERCEPTOR_BINDING_TYPE = eINSTANCE.getInterceptorBindingType();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference INTERCEPTOR_BINDING_TYPE__DESCRIPTIONS = eINSTANCE.getInterceptorBindingType_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute INTERCEPTOR_BINDING_TYPE__EJB_NAME = eINSTANCE.getInterceptorBindingType_EjbName();
-
-		/**
-		 * The meta object literal for the '<em><b>Interceptor Classes</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute INTERCEPTOR_BINDING_TYPE__INTERCEPTOR_CLASSES = eINSTANCE.getInterceptorBindingType_InterceptorClasses();
-
-		/**
-		 * The meta object literal for the '<em><b>Interceptor Order</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference INTERCEPTOR_BINDING_TYPE__INTERCEPTOR_ORDER = eINSTANCE.getInterceptorBindingType_InterceptorOrder();
-
-		/**
-		 * The meta object literal for the '<em><b>Exclude Default Interceptors</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute INTERCEPTOR_BINDING_TYPE__EXCLUDE_DEFAULT_INTERCEPTORS = eINSTANCE.getInterceptorBindingType_ExcludeDefaultInterceptors();
-
-		/**
-		 * The meta object literal for the '<em><b>Exclude Class Interceptors</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute INTERCEPTOR_BINDING_TYPE__EXCLUDE_CLASS_INTERCEPTORS = eINSTANCE.getInterceptorBindingType_ExcludeClassInterceptors();
-
-		/**
-		 * The meta object literal for the '<em><b>Method</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference INTERCEPTOR_BINDING_TYPE__METHOD = eINSTANCE.getInterceptorBindingType_Method();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute INTERCEPTOR_BINDING_TYPE__ID = eINSTANCE.getInterceptorBindingType_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorOrderTypeImpl <em>Interceptor Order Type</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.InterceptorOrderTypeImpl
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getInterceptorOrderType()
-		 * @generated
-		 */
-		EClass INTERCEPTOR_ORDER_TYPE = eINSTANCE.getInterceptorOrderType();
-
-		/**
-		 * The meta object literal for the '<em><b>Interceptor Classes</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute INTERCEPTOR_ORDER_TYPE__INTERCEPTOR_CLASSES = eINSTANCE.getInterceptorOrderType_InterceptorClasses();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute INTERCEPTOR_ORDER_TYPE__ID = eINSTANCE.getInterceptorOrderType_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorsTypeImpl <em>Interceptors Type</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.InterceptorsTypeImpl
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getInterceptorsType()
-		 * @generated
-		 */
-		EClass INTERCEPTORS_TYPE = eINSTANCE.getInterceptorsType();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference INTERCEPTORS_TYPE__DESCRIPTIONS = eINSTANCE.getInterceptorsType_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Interceptors</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference INTERCEPTORS_TYPE__INTERCEPTORS = eINSTANCE.getInterceptorsType_Interceptors();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute INTERCEPTORS_TYPE__ID = eINSTANCE.getInterceptorsType_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl <em>Interceptor Type</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getInterceptorType()
-		 * @generated
-		 */
-		EClass INTERCEPTOR_TYPE = eINSTANCE.getInterceptorType();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference INTERCEPTOR_TYPE__DESCRIPTIONS = eINSTANCE.getInterceptorType_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Interceptor Class</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute INTERCEPTOR_TYPE__INTERCEPTOR_CLASS = eINSTANCE.getInterceptorType_InterceptorClass();
-
-		/**
-		 * The meta object literal for the '<em><b>Around Invokes</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference INTERCEPTOR_TYPE__AROUND_INVOKES = eINSTANCE.getInterceptorType_AroundInvokes();
-
-		/**
-		 * The meta object literal for the '<em><b>Env Entries</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference INTERCEPTOR_TYPE__ENV_ENTRIES = eINSTANCE.getInterceptorType_EnvEntries();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference INTERCEPTOR_TYPE__EJB_REFS = eINSTANCE.getInterceptorType_EjbRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb Local Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference INTERCEPTOR_TYPE__EJB_LOCAL_REFS = eINSTANCE.getInterceptorType_EjbLocalRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Service Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference INTERCEPTOR_TYPE__SERVICE_REFS = eINSTANCE.getInterceptorType_ServiceRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Resource Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference INTERCEPTOR_TYPE__RESOURCE_REFS = eINSTANCE.getInterceptorType_ResourceRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Resource Env Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference INTERCEPTOR_TYPE__RESOURCE_ENV_REFS = eINSTANCE.getInterceptorType_ResourceEnvRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Message Destination Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference INTERCEPTOR_TYPE__MESSAGE_DESTINATION_REFS = eINSTANCE.getInterceptorType_MessageDestinationRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Persistence Context Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference INTERCEPTOR_TYPE__PERSISTENCE_CONTEXT_REFS = eINSTANCE.getInterceptorType_PersistenceContextRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Persistence Unit Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference INTERCEPTOR_TYPE__PERSISTENCE_UNIT_REFS = eINSTANCE.getInterceptorType_PersistenceUnitRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Post Constructs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference INTERCEPTOR_TYPE__POST_CONSTRUCTS = eINSTANCE.getInterceptorType_PostConstructs();
-
-		/**
-		 * The meta object literal for the '<em><b>Pre Destroys</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference INTERCEPTOR_TYPE__PRE_DESTROYS = eINSTANCE.getInterceptorType_PreDestroys();
-
-		/**
-		 * The meta object literal for the '<em><b>Post Activates</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference INTERCEPTOR_TYPE__POST_ACTIVATES = eINSTANCE.getInterceptorType_PostActivates();
-
-		/**
-		 * The meta object literal for the '<em><b>Pre Passivates</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference INTERCEPTOR_TYPE__PRE_PASSIVATES = eINSTANCE.getInterceptorType_PrePassivates();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute INTERCEPTOR_TYPE__ID = eINSTANCE.getInterceptorType_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl <em>Message Driven Bean</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getMessageDrivenBean()
-		 * @generated
-		 */
-		EClass MESSAGE_DRIVEN_BEAN = eINSTANCE.getMessageDrivenBean();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MESSAGE_DRIVEN_BEAN__DESCRIPTIONS = eINSTANCE.getMessageDrivenBean_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Display Names</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MESSAGE_DRIVEN_BEAN__DISPLAY_NAMES = eINSTANCE.getMessageDrivenBean_DisplayNames();
-
-		/**
-		 * The meta object literal for the '<em><b>Icons</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MESSAGE_DRIVEN_BEAN__ICONS = eINSTANCE.getMessageDrivenBean_Icons();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MESSAGE_DRIVEN_BEAN__EJB_NAME = eINSTANCE.getMessageDrivenBean_EjbName();
-
-		/**
-		 * The meta object literal for the '<em><b>Mapped Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MESSAGE_DRIVEN_BEAN__MAPPED_NAME = eINSTANCE.getMessageDrivenBean_MappedName();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb Class</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MESSAGE_DRIVEN_BEAN__EJB_CLASS = eINSTANCE.getMessageDrivenBean_EjbClass();
-
-		/**
-		 * The meta object literal for the '<em><b>Messaging Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MESSAGE_DRIVEN_BEAN__MESSAGING_TYPE = eINSTANCE.getMessageDrivenBean_MessagingType();
-
-		/**
-		 * The meta object literal for the '<em><b>Timeout Method</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MESSAGE_DRIVEN_BEAN__TIMEOUT_METHOD = eINSTANCE.getMessageDrivenBean_TimeoutMethod();
-
-		/**
-		 * The meta object literal for the '<em><b>Transaction Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MESSAGE_DRIVEN_BEAN__TRANSACTION_TYPE = eINSTANCE.getMessageDrivenBean_TransactionType();
-
-		/**
-		 * The meta object literal for the '<em><b>Message Destination Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MESSAGE_DRIVEN_BEAN__MESSAGE_DESTINATION_TYPE = eINSTANCE.getMessageDrivenBean_MessageDestinationType();
-
-		/**
-		 * The meta object literal for the '<em><b>Message Destination Link</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MESSAGE_DRIVEN_BEAN__MESSAGE_DESTINATION_LINK = eINSTANCE.getMessageDrivenBean_MessageDestinationLink();
-
-		/**
-		 * The meta object literal for the '<em><b>Activation Config</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MESSAGE_DRIVEN_BEAN__ACTIVATION_CONFIG = eINSTANCE.getMessageDrivenBean_ActivationConfig();
-
-		/**
-		 * The meta object literal for the '<em><b>Around Invokes</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MESSAGE_DRIVEN_BEAN__AROUND_INVOKES = eINSTANCE.getMessageDrivenBean_AroundInvokes();
-
-		/**
-		 * The meta object literal for the '<em><b>Env Entries</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MESSAGE_DRIVEN_BEAN__ENV_ENTRIES = eINSTANCE.getMessageDrivenBean_EnvEntries();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MESSAGE_DRIVEN_BEAN__EJB_REFS = eINSTANCE.getMessageDrivenBean_EjbRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb Local Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MESSAGE_DRIVEN_BEAN__EJB_LOCAL_REFS = eINSTANCE.getMessageDrivenBean_EjbLocalRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Service Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MESSAGE_DRIVEN_BEAN__SERVICE_REFS = eINSTANCE.getMessageDrivenBean_ServiceRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Resource Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MESSAGE_DRIVEN_BEAN__RESOURCE_REFS = eINSTANCE.getMessageDrivenBean_ResourceRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Resource Env Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MESSAGE_DRIVEN_BEAN__RESOURCE_ENV_REFS = eINSTANCE.getMessageDrivenBean_ResourceEnvRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Message Destination Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MESSAGE_DRIVEN_BEAN__MESSAGE_DESTINATION_REFS = eINSTANCE.getMessageDrivenBean_MessageDestinationRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Persistence Context Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MESSAGE_DRIVEN_BEAN__PERSISTENCE_CONTEXT_REFS = eINSTANCE.getMessageDrivenBean_PersistenceContextRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Persistence Unit Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MESSAGE_DRIVEN_BEAN__PERSISTENCE_UNIT_REFS = eINSTANCE.getMessageDrivenBean_PersistenceUnitRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Post Constructs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MESSAGE_DRIVEN_BEAN__POST_CONSTRUCTS = eINSTANCE.getMessageDrivenBean_PostConstructs();
-
-		/**
-		 * The meta object literal for the '<em><b>Pre Destroys</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MESSAGE_DRIVEN_BEAN__PRE_DESTROYS = eINSTANCE.getMessageDrivenBean_PreDestroys();
-
-		/**
-		 * The meta object literal for the '<em><b>Security Identity</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MESSAGE_DRIVEN_BEAN__SECURITY_IDENTITY = eINSTANCE.getMessageDrivenBean_SecurityIdentity();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MESSAGE_DRIVEN_BEAN__ID = eINSTANCE.getMessageDrivenBean_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.MethodParamsImpl <em>Method Params</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.MethodParamsImpl
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getMethodParams()
-		 * @generated
-		 */
-		EClass METHOD_PARAMS = eINSTANCE.getMethodParams();
-
-		/**
-		 * The meta object literal for the '<em><b>Method Params</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_PARAMS__METHOD_PARAMS = eINSTANCE.getMethodParams_MethodParams();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_PARAMS__ID = eINSTANCE.getMethodParams_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.MethodPermissionImpl <em>Method Permission</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.MethodPermissionImpl
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getMethodPermission()
-		 * @generated
-		 */
-		EClass METHOD_PERMISSION = eINSTANCE.getMethodPermission();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference METHOD_PERMISSION__DESCRIPTIONS = eINSTANCE.getMethodPermission_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Role Names</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_PERMISSION__ROLE_NAMES = eINSTANCE.getMethodPermission_RoleNames();
-
-		/**
-		 * The meta object literal for the '<em><b>Unchecked</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference METHOD_PERMISSION__UNCHECKED = eINSTANCE.getMethodPermission_Unchecked();
-
-		/**
-		 * The meta object literal for the '<em><b>Methods</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference METHOD_PERMISSION__METHODS = eINSTANCE.getMethodPermission_Methods();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_PERMISSION__ID = eINSTANCE.getMethodPermission_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.MethodTypeImpl <em>Method Type</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.MethodTypeImpl
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getMethodType()
-		 * @generated
-		 */
-		EClass METHOD_TYPE = eINSTANCE.getMethodType();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference METHOD_TYPE__DESCRIPTIONS = eINSTANCE.getMethodType_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_TYPE__EJB_NAME = eINSTANCE.getMethodType_EjbName();
-
-		/**
-		 * The meta object literal for the '<em><b>Method Intf</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_TYPE__METHOD_INTF = eINSTANCE.getMethodType_MethodIntf();
-
-		/**
-		 * The meta object literal for the '<em><b>Method Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_TYPE__METHOD_NAME = eINSTANCE.getMethodType_MethodName();
-
-		/**
-		 * The meta object literal for the '<em><b>Method Params</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference METHOD_TYPE__METHOD_PARAMS = eINSTANCE.getMethodType_MethodParams();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_TYPE__ID = eINSTANCE.getMethodType_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.NamedMethodTypeImpl <em>Named Method Type</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.NamedMethodTypeImpl
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getNamedMethodType()
-		 * @generated
-		 */
-		EClass NAMED_METHOD_TYPE = eINSTANCE.getNamedMethodType();
-
-		/**
-		 * The meta object literal for the '<em><b>Method Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute NAMED_METHOD_TYPE__METHOD_NAME = eINSTANCE.getNamedMethodType_MethodName();
-
-		/**
-		 * The meta object literal for the '<em><b>Method Params</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference NAMED_METHOD_TYPE__METHOD_PARAMS = eINSTANCE.getNamedMethodType_MethodParams();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute NAMED_METHOD_TYPE__ID = eINSTANCE.getNamedMethodType_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.QueryImpl <em>Query</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.QueryImpl
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getQuery()
-		 * @generated
-		 */
-		EClass QUERY = eINSTANCE.getQuery();
-
-		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference QUERY__DESCRIPTION = eINSTANCE.getQuery_Description();
-
-		/**
-		 * The meta object literal for the '<em><b>Query Method</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference QUERY__QUERY_METHOD = eINSTANCE.getQuery_QueryMethod();
-
-		/**
-		 * The meta object literal for the '<em><b>Result Type Mapping</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute QUERY__RESULT_TYPE_MAPPING = eINSTANCE.getQuery_ResultTypeMapping();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb Ql</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute QUERY__EJB_QL = eINSTANCE.getQuery_EjbQl();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute QUERY__ID = eINSTANCE.getQuery_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.QueryMethodImpl <em>Query Method</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.QueryMethodImpl
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getQueryMethod()
-		 * @generated
-		 */
-		EClass QUERY_METHOD = eINSTANCE.getQueryMethod();
-
-		/**
-		 * The meta object literal for the '<em><b>Method Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute QUERY_METHOD__METHOD_NAME = eINSTANCE.getQueryMethod_MethodName();
-
-		/**
-		 * The meta object literal for the '<em><b>Method Params</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference QUERY_METHOD__METHOD_PARAMS = eINSTANCE.getQueryMethod_MethodParams();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute QUERY_METHOD__ID = eINSTANCE.getQueryMethod_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.RelationshipRoleSourceTypeImpl <em>Relationship Role Source Type</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.RelationshipRoleSourceTypeImpl
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getRelationshipRoleSourceType()
-		 * @generated
-		 */
-		EClass RELATIONSHIP_ROLE_SOURCE_TYPE = eINSTANCE.getRelationshipRoleSourceType();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference RELATIONSHIP_ROLE_SOURCE_TYPE__DESCRIPTIONS = eINSTANCE.getRelationshipRoleSourceType_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute RELATIONSHIP_ROLE_SOURCE_TYPE__EJB_NAME = eINSTANCE.getRelationshipRoleSourceType_EjbName();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute RELATIONSHIP_ROLE_SOURCE_TYPE__ID = eINSTANCE.getRelationshipRoleSourceType_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.RelationshipsImpl <em>Relationships</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.RelationshipsImpl
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getRelationships()
-		 * @generated
-		 */
-		EClass RELATIONSHIPS = eINSTANCE.getRelationships();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference RELATIONSHIPS__DESCRIPTIONS = eINSTANCE.getRelationships_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb Relations</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference RELATIONSHIPS__EJB_RELATIONS = eINSTANCE.getRelationships_EjbRelations();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute RELATIONSHIPS__ID = eINSTANCE.getRelationships_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.RemoveMethodTypeImpl <em>Remove Method Type</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.RemoveMethodTypeImpl
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getRemoveMethodType()
-		 * @generated
-		 */
-		EClass REMOVE_METHOD_TYPE = eINSTANCE.getRemoveMethodType();
-
-		/**
-		 * The meta object literal for the '<em><b>Bean Method</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference REMOVE_METHOD_TYPE__BEAN_METHOD = eINSTANCE.getRemoveMethodType_BeanMethod();
-
-		/**
-		 * The meta object literal for the '<em><b>Retain If Exception</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute REMOVE_METHOD_TYPE__RETAIN_IF_EXCEPTION = eINSTANCE.getRemoveMethodType_RetainIfException();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute REMOVE_METHOD_TYPE__ID = eINSTANCE.getRemoveMethodType_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.SecurityIdentityTypeImpl <em>Security Identity Type</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.SecurityIdentityTypeImpl
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getSecurityIdentityType()
-		 * @generated
-		 */
-		EClass SECURITY_IDENTITY_TYPE = eINSTANCE.getSecurityIdentityType();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SECURITY_IDENTITY_TYPE__DESCRIPTIONS = eINSTANCE.getSecurityIdentityType_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Use Caller Identity</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SECURITY_IDENTITY_TYPE__USE_CALLER_IDENTITY = eINSTANCE.getSecurityIdentityType_UseCallerIdentity();
-
-		/**
-		 * The meta object literal for the '<em><b>Run As</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SECURITY_IDENTITY_TYPE__RUN_AS = eINSTANCE.getSecurityIdentityType_RunAs();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SECURITY_IDENTITY_TYPE__ID = eINSTANCE.getSecurityIdentityType_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl <em>Session Bean</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getSessionBean()
-		 * @generated
-		 */
-		EClass SESSION_BEAN = eINSTANCE.getSessionBean();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SESSION_BEAN__DESCRIPTIONS = eINSTANCE.getSessionBean_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Display Names</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SESSION_BEAN__DISPLAY_NAMES = eINSTANCE.getSessionBean_DisplayNames();
-
-		/**
-		 * The meta object literal for the '<em><b>Icons</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SESSION_BEAN__ICONS = eINSTANCE.getSessionBean_Icons();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SESSION_BEAN__EJB_NAME = eINSTANCE.getSessionBean_EjbName();
-
-		/**
-		 * The meta object literal for the '<em><b>Mapped Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SESSION_BEAN__MAPPED_NAME = eINSTANCE.getSessionBean_MappedName();
-
-		/**
-		 * The meta object literal for the '<em><b>Home</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SESSION_BEAN__HOME = eINSTANCE.getSessionBean_Home();
-
-		/**
-		 * The meta object literal for the '<em><b>Remote</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SESSION_BEAN__REMOTE = eINSTANCE.getSessionBean_Remote();
-
-		/**
-		 * The meta object literal for the '<em><b>Local Home</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SESSION_BEAN__LOCAL_HOME = eINSTANCE.getSessionBean_LocalHome();
-
-		/**
-		 * The meta object literal for the '<em><b>Local</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SESSION_BEAN__LOCAL = eINSTANCE.getSessionBean_Local();
-
-		/**
-		 * The meta object literal for the '<em><b>Business Locals</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SESSION_BEAN__BUSINESS_LOCALS = eINSTANCE.getSessionBean_BusinessLocals();
-
-		/**
-		 * The meta object literal for the '<em><b>Business Remotes</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SESSION_BEAN__BUSINESS_REMOTES = eINSTANCE.getSessionBean_BusinessRemotes();
-
-		/**
-		 * The meta object literal for the '<em><b>Service Endpoint</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SESSION_BEAN__SERVICE_ENDPOINT = eINSTANCE.getSessionBean_ServiceEndpoint();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb Class</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SESSION_BEAN__EJB_CLASS = eINSTANCE.getSessionBean_EjbClass();
-
-		/**
-		 * The meta object literal for the '<em><b>Session Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SESSION_BEAN__SESSION_TYPE = eINSTANCE.getSessionBean_SessionType();
-
-		/**
-		 * The meta object literal for the '<em><b>Timeout Method</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SESSION_BEAN__TIMEOUT_METHOD = eINSTANCE.getSessionBean_TimeoutMethod();
-
-		/**
-		 * The meta object literal for the '<em><b>Init Methods</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SESSION_BEAN__INIT_METHODS = eINSTANCE.getSessionBean_InitMethods();
-
-		/**
-		 * The meta object literal for the '<em><b>Remove Methods</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SESSION_BEAN__REMOVE_METHODS = eINSTANCE.getSessionBean_RemoveMethods();
-
-		/**
-		 * The meta object literal for the '<em><b>Transaction Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SESSION_BEAN__TRANSACTION_TYPE = eINSTANCE.getSessionBean_TransactionType();
-
-		/**
-		 * The meta object literal for the '<em><b>Around Invokes</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SESSION_BEAN__AROUND_INVOKES = eINSTANCE.getSessionBean_AroundInvokes();
-
-		/**
-		 * The meta object literal for the '<em><b>Env Entries</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SESSION_BEAN__ENV_ENTRIES = eINSTANCE.getSessionBean_EnvEntries();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SESSION_BEAN__EJB_REFS = eINSTANCE.getSessionBean_EjbRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb Local Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SESSION_BEAN__EJB_LOCAL_REFS = eINSTANCE.getSessionBean_EjbLocalRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Service Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SESSION_BEAN__SERVICE_REFS = eINSTANCE.getSessionBean_ServiceRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Resource Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SESSION_BEAN__RESOURCE_REFS = eINSTANCE.getSessionBean_ResourceRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Resource Env Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SESSION_BEAN__RESOURCE_ENV_REFS = eINSTANCE.getSessionBean_ResourceEnvRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Message Destination Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SESSION_BEAN__MESSAGE_DESTINATION_REFS = eINSTANCE.getSessionBean_MessageDestinationRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Persistence Context Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SESSION_BEAN__PERSISTENCE_CONTEXT_REFS = eINSTANCE.getSessionBean_PersistenceContextRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Persistence Unit Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SESSION_BEAN__PERSISTENCE_UNIT_REFS = eINSTANCE.getSessionBean_PersistenceUnitRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Post Constructs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SESSION_BEAN__POST_CONSTRUCTS = eINSTANCE.getSessionBean_PostConstructs();
-
-		/**
-		 * The meta object literal for the '<em><b>Pre Destroys</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SESSION_BEAN__PRE_DESTROYS = eINSTANCE.getSessionBean_PreDestroys();
-
-		/**
-		 * The meta object literal for the '<em><b>Post Activates</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SESSION_BEAN__POST_ACTIVATES = eINSTANCE.getSessionBean_PostActivates();
-
-		/**
-		 * The meta object literal for the '<em><b>Pre Passivates</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SESSION_BEAN__PRE_PASSIVATES = eINSTANCE.getSessionBean_PrePassivates();
-
-		/**
-		 * The meta object literal for the '<em><b>Security Role Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SESSION_BEAN__SECURITY_ROLE_REFS = eINSTANCE.getSessionBean_SecurityRoleRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Security Identities</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SESSION_BEAN__SECURITY_IDENTITIES = eINSTANCE.getSessionBean_SecurityIdentities();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SESSION_BEAN__ID = eINSTANCE.getSessionBean_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.CmpVersionType <em>Cmp Version Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.CmpVersionType
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getCmpVersionType()
-		 * @generated
-		 */
-		EEnum CMP_VERSION_TYPE = eINSTANCE.getCmpVersionType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.CMRFieldType <em>CMR Field Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.CMRFieldType
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getCMRFieldType()
-		 * @generated
-		 */
-		EEnum CMR_FIELD_TYPE = eINSTANCE.getCMRFieldType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.MethodInterfaceType <em>Method Interface Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.MethodInterfaceType
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getMethodInterfaceType()
-		 * @generated
-		 */
-		EEnum METHOD_INTERFACE_TYPE = eINSTANCE.getMethodInterfaceType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.MultiplicityType <em>Multiplicity Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.MultiplicityType
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getMultiplicityType()
-		 * @generated
-		 */
-		EEnum MULTIPLICITY_TYPE = eINSTANCE.getMultiplicityType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.PersistenceType <em>Persistence Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.PersistenceType
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getPersistenceType()
-		 * @generated
-		 */
-		EEnum PERSISTENCE_TYPE = eINSTANCE.getPersistenceType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.ResultTypeMappingType <em>Result Type Mapping Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.ResultTypeMappingType
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getResultTypeMappingType()
-		 * @generated
-		 */
-		EEnum RESULT_TYPE_MAPPING_TYPE = eINSTANCE.getResultTypeMappingType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.SessionType <em>Session Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.SessionType
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getSessionType()
-		 * @generated
-		 */
-		EEnum SESSION_TYPE = eINSTANCE.getSessionType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.TransactionAttributeType <em>Transaction Attribute Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.TransactionAttributeType
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getTransactionAttributeType()
-		 * @generated
-		 */
-		EEnum TRANSACTION_ATTRIBUTE_TYPE = eINSTANCE.getTransactionAttributeType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.TransactionType <em>Transaction Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.TransactionType
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getTransactionType()
-		 * @generated
-		 */
-		EEnum TRANSACTION_TYPE = eINSTANCE.getTransactionType();
-
-		/**
-		 * The meta object literal for the '<em>Cmp Version Type Object</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.CmpVersionType
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getCmpVersionTypeObject()
-		 * @generated
-		 */
-		EDataType CMP_VERSION_TYPE_OBJECT = eINSTANCE.getCmpVersionTypeObject();
-
-		/**
-		 * The meta object literal for the '<em>CMR Field Type Object</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.CMRFieldType
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getCMRFieldTypeObject()
-		 * @generated
-		 */
-		EDataType CMR_FIELD_TYPE_OBJECT = eINSTANCE.getCMRFieldTypeObject();
-
-		/**
-		 * The meta object literal for the '<em>Class Type</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.lang.String
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getEjbClassType()
-		 * @generated
-		 */
-		EDataType EJB_CLASS_TYPE = eINSTANCE.getEjbClassType();
-
-		/**
-		 * The meta object literal for the '<em>Name Type</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.lang.String
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getEjbNameType()
-		 * @generated
-		 */
-		EDataType EJB_NAME_TYPE = eINSTANCE.getEjbNameType();
-
-		/**
-		 * The meta object literal for the '<em>Method Interface Type Object</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.MethodInterfaceType
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getMethodInterfaceTypeObject()
-		 * @generated
-		 */
-		EDataType METHOD_INTERFACE_TYPE_OBJECT = eINSTANCE.getMethodInterfaceTypeObject();
-
-		/**
-		 * The meta object literal for the '<em>Method Name Type</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.lang.String
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getMethodNameType()
-		 * @generated
-		 */
-		EDataType METHOD_NAME_TYPE = eINSTANCE.getMethodNameType();
-
-		/**
-		 * The meta object literal for the '<em>Multiplicity Type Object</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.MultiplicityType
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getMultiplicityTypeObject()
-		 * @generated
-		 */
-		EDataType MULTIPLICITY_TYPE_OBJECT = eINSTANCE.getMultiplicityTypeObject();
-
-		/**
-		 * The meta object literal for the '<em>Persistence Type Object</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.PersistenceType
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getPersistenceTypeObject()
-		 * @generated
-		 */
-		EDataType PERSISTENCE_TYPE_OBJECT = eINSTANCE.getPersistenceTypeObject();
-
-		/**
-		 * The meta object literal for the '<em>Result Type Mapping Type Object</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.ResultTypeMappingType
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getResultTypeMappingTypeObject()
-		 * @generated
-		 */
-		EDataType RESULT_TYPE_MAPPING_TYPE_OBJECT = eINSTANCE.getResultTypeMappingTypeObject();
-
-		/**
-		 * The meta object literal for the '<em>Session Type Object</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.SessionType
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getSessionTypeObject()
-		 * @generated
-		 */
-		EDataType SESSION_TYPE_OBJECT = eINSTANCE.getSessionTypeObject();
-
-		/**
-		 * The meta object literal for the '<em>Transaction Attribute Type Object</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.TransactionAttributeType
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getTransactionAttributeTypeObject()
-		 * @generated
-		 */
-		EDataType TRANSACTION_ATTRIBUTE_TYPE_OBJECT = eINSTANCE.getTransactionAttributeTypeObject();
-
-		/**
-		 * The meta object literal for the '<em>Transaction Type Object</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.ejb.TransactionType
-		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getTransactionTypeObject()
-		 * @generated
-		 */
-		EDataType TRANSACTION_TYPE_OBJECT = eINSTANCE.getTransactionTypeObject();
-
-	}
-
-} //EjbPackage
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/util/EjbAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/util/EjbAdapterFactory.java
deleted file mode 100644
index 4f0a00fae..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/util/EjbAdapterFactory.java
+++ /dev/null
@@ -1,653 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb.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.ejb.*;
-
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage
- * @generated
- */
-public class EjbAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static EjbPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EjbAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = EjbPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EjbSwitch modelSwitch =
-		new EjbSwitch() {
-			public Object caseActivationConfig(ActivationConfig object) {
-				return createActivationConfigAdapter();
-			}
-			public Object caseActivationConfigProperty(ActivationConfigProperty object) {
-				return createActivationConfigPropertyAdapter();
-			}
-			public Object caseApplicationException(ApplicationException object) {
-				return createApplicationExceptionAdapter();
-			}
-			public Object caseAroundInvokeType(AroundInvokeType object) {
-				return createAroundInvokeTypeAdapter();
-			}
-			public Object caseAssemblyDescriptor(AssemblyDescriptor object) {
-				return createAssemblyDescriptorAdapter();
-			}
-			public Object caseCMPField(CMPField object) {
-				return createCMPFieldAdapter();
-			}
-			public Object caseCMRField(CMRField object) {
-				return createCMRFieldAdapter();
-			}
-			public Object caseContainerTransactionType(ContainerTransactionType object) {
-				return createContainerTransactionTypeAdapter();
-			}
-			public Object caseEJBJar(EJBJar object) {
-				return createEJBJarAdapter();
-			}
-			public Object caseEJBJarDeploymentDescriptor(EJBJarDeploymentDescriptor object) {
-				return createEJBJarDeploymentDescriptorAdapter();
-			}
-			public Object caseEJBRelation(EJBRelation object) {
-				return createEJBRelationAdapter();
-			}
-			public Object caseEJBRelationshipRole(EJBRelationshipRole object) {
-				return createEJBRelationshipRoleAdapter();
-			}
-			public Object caseEnterpriseBeans(EnterpriseBeans object) {
-				return createEnterpriseBeansAdapter();
-			}
-			public Object caseEntityBean(EntityBean object) {
-				return createEntityBeanAdapter();
-			}
-			public Object caseExcludeList(ExcludeList object) {
-				return createExcludeListAdapter();
-			}
-			public Object caseInitMethodType(InitMethodType object) {
-				return createInitMethodTypeAdapter();
-			}
-			public Object caseInterceptorBindingType(InterceptorBindingType object) {
-				return createInterceptorBindingTypeAdapter();
-			}
-			public Object caseInterceptorOrderType(InterceptorOrderType object) {
-				return createInterceptorOrderTypeAdapter();
-			}
-			public Object caseInterceptorsType(InterceptorsType object) {
-				return createInterceptorsTypeAdapter();
-			}
-			public Object caseInterceptorType(InterceptorType object) {
-				return createInterceptorTypeAdapter();
-			}
-			public Object caseMessageDrivenBean(MessageDrivenBean object) {
-				return createMessageDrivenBeanAdapter();
-			}
-			public Object caseMethodParams(MethodParams object) {
-				return createMethodParamsAdapter();
-			}
-			public Object caseMethodPermission(MethodPermission object) {
-				return createMethodPermissionAdapter();
-			}
-			public Object caseMethodType(MethodType object) {
-				return createMethodTypeAdapter();
-			}
-			public Object caseNamedMethodType(NamedMethodType object) {
-				return createNamedMethodTypeAdapter();
-			}
-			public Object caseQuery(Query object) {
-				return createQueryAdapter();
-			}
-			public Object caseQueryMethod(QueryMethod object) {
-				return createQueryMethodAdapter();
-			}
-			public Object caseRelationshipRoleSourceType(RelationshipRoleSourceType object) {
-				return createRelationshipRoleSourceTypeAdapter();
-			}
-			public Object caseRelationships(Relationships object) {
-				return createRelationshipsAdapter();
-			}
-			public Object caseRemoveMethodType(RemoveMethodType object) {
-				return createRemoveMethodTypeAdapter();
-			}
-			public Object caseSecurityIdentityType(SecurityIdentityType object) {
-				return createSecurityIdentityTypeAdapter();
-			}
-			public Object caseSessionBean(SessionBean object) {
-				return createSessionBeanAdapter();
-			}
-			public Object defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	public Adapter createAdapter(Notifier target) {
-		return (Adapter)modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.ActivationConfig <em>Activation Config</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.ejb.ActivationConfig
-	 * @generated
-	 */
-	public Adapter createActivationConfigAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.ActivationConfigProperty <em>Activation Config Property</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.ejb.ActivationConfigProperty
-	 * @generated
-	 */
-	public Adapter createActivationConfigPropertyAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.ApplicationException <em>Application Exception</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.ejb.ApplicationException
-	 * @generated
-	 */
-	public Adapter createApplicationExceptionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.AroundInvokeType <em>Around Invoke Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.ejb.AroundInvokeType
-	 * @generated
-	 */
-	public Adapter createAroundInvokeTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.AssemblyDescriptor <em>Assembly Descriptor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.ejb.AssemblyDescriptor
-	 * @generated
-	 */
-	public Adapter createAssemblyDescriptorAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.CMPField <em>CMP Field</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.ejb.CMPField
-	 * @generated
-	 */
-	public Adapter createCMPFieldAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.CMRField <em>CMR Field</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.ejb.CMRField
-	 * @generated
-	 */
-	public Adapter createCMRFieldAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.ContainerTransactionType <em>Container Transaction Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.ejb.ContainerTransactionType
-	 * @generated
-	 */
-	public Adapter createContainerTransactionTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.EJBJar <em>EJB Jar</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.ejb.EJBJar
-	 * @generated
-	 */
-	public Adapter createEJBJarAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.EJBJarDeploymentDescriptor <em>EJB Jar Deployment Descriptor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.ejb.EJBJarDeploymentDescriptor
-	 * @generated
-	 */
-	public Adapter createEJBJarDeploymentDescriptorAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.EJBRelation <em>EJB Relation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.ejb.EJBRelation
-	 * @generated
-	 */
-	public Adapter createEJBRelationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.EJBRelationshipRole <em>EJB Relationship Role</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.ejb.EJBRelationshipRole
-	 * @generated
-	 */
-	public Adapter createEJBRelationshipRoleAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.EnterpriseBeans <em>Enterprise Beans</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.ejb.EnterpriseBeans
-	 * @generated
-	 */
-	public Adapter createEnterpriseBeansAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.EntityBean <em>Entity Bean</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.ejb.EntityBean
-	 * @generated
-	 */
-	public Adapter createEntityBeanAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.ExcludeList <em>Exclude List</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.ejb.ExcludeList
-	 * @generated
-	 */
-	public Adapter createExcludeListAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.InitMethodType <em>Init Method Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.ejb.InitMethodType
-	 * @generated
-	 */
-	public Adapter createInitMethodTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType <em>Interceptor Binding Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.ejb.InterceptorBindingType
-	 * @generated
-	 */
-	public Adapter createInterceptorBindingTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.InterceptorOrderType <em>Interceptor Order Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.ejb.InterceptorOrderType
-	 * @generated
-	 */
-	public Adapter createInterceptorOrderTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.InterceptorsType <em>Interceptors Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.ejb.InterceptorsType
-	 * @generated
-	 */
-	public Adapter createInterceptorsTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.InterceptorType <em>Interceptor Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.ejb.InterceptorType
-	 * @generated
-	 */
-	public Adapter createInterceptorTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean <em>Message Driven Bean</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean
-	 * @generated
-	 */
-	public Adapter createMessageDrivenBeanAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.MethodParams <em>Method Params</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.ejb.MethodParams
-	 * @generated
-	 */
-	public Adapter createMethodParamsAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.MethodPermission <em>Method Permission</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.ejb.MethodPermission
-	 * @generated
-	 */
-	public Adapter createMethodPermissionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.MethodType <em>Method Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.ejb.MethodType
-	 * @generated
-	 */
-	public Adapter createMethodTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.NamedMethodType <em>Named Method Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.ejb.NamedMethodType
-	 * @generated
-	 */
-	public Adapter createNamedMethodTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.Query <em>Query</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.ejb.Query
-	 * @generated
-	 */
-	public Adapter createQueryAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.QueryMethod <em>Query Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.ejb.QueryMethod
-	 * @generated
-	 */
-	public Adapter createQueryMethodAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.RelationshipRoleSourceType <em>Relationship Role Source Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.ejb.RelationshipRoleSourceType
-	 * @generated
-	 */
-	public Adapter createRelationshipRoleSourceTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.Relationships <em>Relationships</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.ejb.Relationships
-	 * @generated
-	 */
-	public Adapter createRelationshipsAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.RemoveMethodType <em>Remove Method Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.ejb.RemoveMethodType
-	 * @generated
-	 */
-	public Adapter createRemoveMethodTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.SecurityIdentityType <em>Security Identity Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.ejb.SecurityIdentityType
-	 * @generated
-	 */
-	public Adapter createSecurityIdentityTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.SessionBean <em>Session Bean</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.ejb.SessionBean
-	 * @generated
-	 */
-	public Adapter createSessionBeanAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //EjbAdapterFactory
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/util/EjbResourceFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/util/EjbResourceFactoryImpl.java
deleted file mode 100644
index 503d55c14..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/util/EjbResourceFactoryImpl.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb.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.XMLOptions;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.ecore.xmi.impl.XMLOptionsImpl;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource Factory</b> associated with the package.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.javaee.ejb.internal.util.EjbResourceImpl
- * @generated
- */
-public class EjbResourceFactoryImpl extends ResourceFactoryImpl {
-	/**
-	 * Creates an instance of the resource factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EjbResourceFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public Resource createResource(URI uri) {
-		XMLResource result = new EjbResourceImpl(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);
-		XMLOptions xmlOptions = new XMLOptionsImpl();
-
-		xmlOptions.setProcessSchemaLocations(true);
-		    
-		result.getDefaultLoadOptions().put(XMLResource.OPTION_XML_OPTIONS, xmlOptions);
-		
-		
-		return result;
-	}
-
-} //EjbResourceFactoryImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/util/EjbResourceImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/util/EjbResourceImpl.java
deleted file mode 100644
index d28ea5793..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/util/EjbResourceImpl.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb.internal.util;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.xmi.XMLHelper;
-import org.eclipse.emf.ecore.xmi.XMLLoad;
-import org.eclipse.jst.javaee.core.JEEXMLLoadImpl;
-import org.eclipse.jst.javaee.core.internal.util.JavaeeResourceImpl;
-import org.eclipse.jst.javaee.ejb.EJBJar;
-import org.eclipse.jst.javaee.ejb.EJBJarDeploymentDescriptor;
-import org.eclipse.jst.javaee.ejb.IEJBResource;
-import org.eclipse.wst.common.internal.emf.resource.IRootObjectResource;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource </b> associated with the package.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.javaee.ejb.internal.util.EjbResourceFactoryImpl
- * @generated
- */
-public class EjbResourceImpl extends JavaeeResourceImpl implements IRootObjectResource, IEJBResource {
-	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param uri the URI of the new resource.
-	 * @generated
-	 */
-	public EjbResourceImpl(URI uri) {
-		super(uri);
-	}
-	
-	protected XMLLoad createXMLLoad() {
-		 return new JEEXMLLoadImpl(createXMLHelper());
-	}
-
-	
-	protected XMLHelper createXMLHelper() {
-		
-		return new EjbXMLHelperImpl(this);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.javaee.ejb.internal.util.IEJBResource#getRootObject()
-	 */
-	public EObject getRootObject() {
-		if (contents == null || contents.isEmpty())
-			return null;
-		Object root = getContents().get(0);
-		if(root == null){
-			return null;
-		}
-		return (EObject)((EJBJarDeploymentDescriptor)root).getEjbJar();
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.javaee.ejb.internal.util.IEJBResource#getEjbJar()
-	 */
-	public EJBJar getEjbJar() {
-		return (EJBJar)getRootObject();
-	}
-
-} //EjbResourceImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/util/EjbSwitch.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/util/EjbSwitch.java
deleted file mode 100644
index b8e18ace0..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/util/EjbSwitch.java
+++ /dev/null
@@ -1,787 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb.internal.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.jst.javaee.ejb.*;
-
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> 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.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage
- * @generated
- */
-public class EjbSwitch {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static EjbPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EjbSwitch() {
-		if (modelPackage == null) {
-			modelPackage = EjbPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	public Object 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.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage) {
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
-			List eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch((EClass)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.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case EjbPackage.ACTIVATION_CONFIG: {
-				ActivationConfig activationConfig = (ActivationConfig)theEObject;
-				Object result = caseActivationConfig(activationConfig);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.ACTIVATION_CONFIG_PROPERTY: {
-				ActivationConfigProperty activationConfigProperty = (ActivationConfigProperty)theEObject;
-				Object result = caseActivationConfigProperty(activationConfigProperty);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.APPLICATION_EXCEPTION: {
-				ApplicationException applicationException = (ApplicationException)theEObject;
-				Object result = caseApplicationException(applicationException);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.AROUND_INVOKE_TYPE: {
-				AroundInvokeType aroundInvokeType = (AroundInvokeType)theEObject;
-				Object result = caseAroundInvokeType(aroundInvokeType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.ASSEMBLY_DESCRIPTOR: {
-				AssemblyDescriptor assemblyDescriptor = (AssemblyDescriptor)theEObject;
-				Object result = caseAssemblyDescriptor(assemblyDescriptor);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.CMP_FIELD: {
-				CMPField cmpField = (CMPField)theEObject;
-				Object result = caseCMPField(cmpField);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.CMR_FIELD: {
-				CMRField cmrField = (CMRField)theEObject;
-				Object result = caseCMRField(cmrField);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.CONTAINER_TRANSACTION_TYPE: {
-				ContainerTransactionType containerTransactionType = (ContainerTransactionType)theEObject;
-				Object result = caseContainerTransactionType(containerTransactionType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.EJB_JAR: {
-				EJBJar ejbJar = (EJBJar)theEObject;
-				Object result = caseEJBJar(ejbJar);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.EJB_JAR_DEPLOYMENT_DESCRIPTOR: {
-				EJBJarDeploymentDescriptor ejbJarDeploymentDescriptor = (EJBJarDeploymentDescriptor)theEObject;
-				Object result = caseEJBJarDeploymentDescriptor(ejbJarDeploymentDescriptor);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.EJB_RELATION: {
-				EJBRelation ejbRelation = (EJBRelation)theEObject;
-				Object result = caseEJBRelation(ejbRelation);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.EJB_RELATIONSHIP_ROLE: {
-				EJBRelationshipRole ejbRelationshipRole = (EJBRelationshipRole)theEObject;
-				Object result = caseEJBRelationshipRole(ejbRelationshipRole);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.ENTERPRISE_BEANS: {
-				EnterpriseBeans enterpriseBeans = (EnterpriseBeans)theEObject;
-				Object result = caseEnterpriseBeans(enterpriseBeans);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.ENTITY_BEAN: {
-				EntityBean entityBean = (EntityBean)theEObject;
-				Object result = caseEntityBean(entityBean);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.EXCLUDE_LIST: {
-				ExcludeList excludeList = (ExcludeList)theEObject;
-				Object result = caseExcludeList(excludeList);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.INIT_METHOD_TYPE: {
-				InitMethodType initMethodType = (InitMethodType)theEObject;
-				Object result = caseInitMethodType(initMethodType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.INTERCEPTOR_BINDING_TYPE: {
-				InterceptorBindingType interceptorBindingType = (InterceptorBindingType)theEObject;
-				Object result = caseInterceptorBindingType(interceptorBindingType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.INTERCEPTOR_ORDER_TYPE: {
-				InterceptorOrderType interceptorOrderType = (InterceptorOrderType)theEObject;
-				Object result = caseInterceptorOrderType(interceptorOrderType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.INTERCEPTORS_TYPE: {
-				InterceptorsType interceptorsType = (InterceptorsType)theEObject;
-				Object result = caseInterceptorsType(interceptorsType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.INTERCEPTOR_TYPE: {
-				InterceptorType interceptorType = (InterceptorType)theEObject;
-				Object result = caseInterceptorType(interceptorType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.MESSAGE_DRIVEN_BEAN: {
-				MessageDrivenBean messageDrivenBean = (MessageDrivenBean)theEObject;
-				Object result = caseMessageDrivenBean(messageDrivenBean);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.METHOD_PARAMS: {
-				MethodParams methodParams = (MethodParams)theEObject;
-				Object result = caseMethodParams(methodParams);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.METHOD_PERMISSION: {
-				MethodPermission methodPermission = (MethodPermission)theEObject;
-				Object result = caseMethodPermission(methodPermission);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.METHOD_TYPE: {
-				MethodType methodType = (MethodType)theEObject;
-				Object result = caseMethodType(methodType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.NAMED_METHOD_TYPE: {
-				NamedMethodType namedMethodType = (NamedMethodType)theEObject;
-				Object result = caseNamedMethodType(namedMethodType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.QUERY: {
-				Query query = (Query)theEObject;
-				Object result = caseQuery(query);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.QUERY_METHOD: {
-				QueryMethod queryMethod = (QueryMethod)theEObject;
-				Object result = caseQueryMethod(queryMethod);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.RELATIONSHIP_ROLE_SOURCE_TYPE: {
-				RelationshipRoleSourceType relationshipRoleSourceType = (RelationshipRoleSourceType)theEObject;
-				Object result = caseRelationshipRoleSourceType(relationshipRoleSourceType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.RELATIONSHIPS: {
-				Relationships relationships = (Relationships)theEObject;
-				Object result = caseRelationships(relationships);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.REMOVE_METHOD_TYPE: {
-				RemoveMethodType removeMethodType = (RemoveMethodType)theEObject;
-				Object result = caseRemoveMethodType(removeMethodType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.SECURITY_IDENTITY_TYPE: {
-				SecurityIdentityType securityIdentityType = (SecurityIdentityType)theEObject;
-				Object result = caseSecurityIdentityType(securityIdentityType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.SESSION_BEAN: {
-				SessionBean sessionBean = (SessionBean)theEObject;
-				Object result = caseSessionBean(sessionBean);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Activation Config</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Activation Config</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseActivationConfig(ActivationConfig object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Activation Config Property</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Activation Config Property</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseActivationConfigProperty(ActivationConfigProperty object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Application Exception</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Application Exception</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseApplicationException(ApplicationException object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Around Invoke Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Around Invoke Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseAroundInvokeType(AroundInvokeType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Assembly Descriptor</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Assembly Descriptor</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseAssemblyDescriptor(AssemblyDescriptor object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>CMP Field</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>CMP Field</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseCMPField(CMPField object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>CMR Field</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>CMR Field</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseCMRField(CMRField object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Container Transaction Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Container Transaction Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseContainerTransactionType(ContainerTransactionType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EJB Jar</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EJB Jar</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEJBJar(EJBJar object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EJB Jar Deployment Descriptor</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EJB Jar Deployment Descriptor</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEJBJarDeploymentDescriptor(EJBJarDeploymentDescriptor object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EJB Relation</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EJB Relation</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEJBRelation(EJBRelation object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EJB Relationship Role</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EJB Relationship Role</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEJBRelationshipRole(EJBRelationshipRole object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Enterprise Beans</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Enterprise Beans</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEnterpriseBeans(EnterpriseBeans object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Entity Bean</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Entity Bean</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEntityBean(EntityBean object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Exclude List</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Exclude List</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseExcludeList(ExcludeList object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Init Method Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Init Method Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseInitMethodType(InitMethodType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Interceptor Binding Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Interceptor Binding Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseInterceptorBindingType(InterceptorBindingType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Interceptor Order Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Interceptor Order Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseInterceptorOrderType(InterceptorOrderType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Interceptors Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Interceptors Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseInterceptorsType(InterceptorsType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Interceptor Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Interceptor Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseInterceptorType(InterceptorType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Message Driven Bean</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Message Driven Bean</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMessageDrivenBean(MessageDrivenBean object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Method Params</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Method Params</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMethodParams(MethodParams object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Method Permission</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Method Permission</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMethodPermission(MethodPermission object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Method Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Method Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMethodType(MethodType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Named Method Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Named Method Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseNamedMethodType(NamedMethodType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Query</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Query</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseQuery(Query object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Query Method</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Query Method</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseQueryMethod(QueryMethod object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Relationship Role Source Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Relationship Role Source Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseRelationshipRoleSourceType(RelationshipRoleSourceType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Relationships</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Relationships</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseRelationships(Relationships object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Remove Method Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Remove Method Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseRemoveMethodType(RemoveMethodType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Security Identity Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Security Identity Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseSecurityIdentityType(SecurityIdentityType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Session Bean</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Session Bean</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseSessionBean(SessionBean object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	public Object defaultCase(EObject object) {
-		return null;
-	}
-
-} //EjbSwitch
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/util/EjbXMLHelperImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/util/EjbXMLHelperImpl.java
deleted file mode 100644
index b72481c8f..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/util/EjbXMLHelperImpl.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb.internal.util;
-
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.jst.javaee.core.internal.util.JEEXMLHelperImpl;
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-public class EjbXMLHelperImpl extends JEEXMLHelperImpl {
-
-	public EjbXMLHelperImpl(XMLResource resource) {
-		super(resource);
-		// TODO Auto-generated constructor stub
-	}
-
-	
-	public String getURI(String prefix) {
-		if (prefix != null && prefix.equals(""))
-			return EjbPackage.eNS_URI;
-		else
-			return super.getURI(prefix);
-	}
-	protected String getQName(EPackage ePackage, String name, boolean mustHavePrefix)
-	  {
-	   String nsPrefix = getPrefix(ePackage, mustHavePrefix);
-	   // Not using EE5 package namespace - default jee5 namespace is used
-	   if (nsPrefix.equals(EjbPackage.eNS_PREFIX)) 
-	    {
-	    	return name;
-	    }
-	    else return super.getQName(ePackage, name, mustHavePrefix);
-	  }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/util/EjbXMLProcessor.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/util/EjbXMLProcessor.java
deleted file mode 100644
index 26a4b8e59..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/util/EjbXMLProcessor.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.ejb.internal.util;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-/**
- * This class contains helper methods to serialize and deserialize XML documents
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class EjbXMLProcessor extends XMLProcessor {
-	/**
-	 * Public constructor to instantiate the helper.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EjbXMLProcessor() {
-		super((EPackage.Registry.INSTANCE));
-		EjbPackage.eINSTANCE.eClass();
-	}
-	
-	/**
-	 * Register for "*" and "xml" file extensions the EjbResourceFactoryImpl factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Map getRegistrations() {
-		if (registrations == null) {
-			super.getRegistrations();
-			registrations.put(XML_EXTENSION, new EjbResourceFactoryImpl());
-			registrations.put(STAR_EXTENSION, new EjbResourceFactoryImpl());
-		}
-		return registrations;
-	}
-
-} //EjbXMLProcessor
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/internal/adapter/EjbArtifactAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/internal/adapter/EjbArtifactAdapterFactory.java
deleted file mode 100644
index a1c4b3cf5..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/internal/adapter/EjbArtifactAdapterFactory.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.jst.javaee.internal.adapter;
-
-public class EjbArtifactAdapterFactory extends JavaEEArtifactAdapterFactory {
-
-	protected String getFullyQualifiedClassName(Object adaptableObject) {
-		if (adaptableObject instanceof org.eclipse.jst.javaee.ejb.SessionBean) {
-			org.eclipse.jst.javaee.ejb.SessionBean bean = (org.eclipse.jst.javaee.ejb.SessionBean) adaptableObject;
-			return bean.getEjbClass();
-		} else if (adaptableObject instanceof org.eclipse.jst.javaee.ejb.MessageDrivenBean) {
-			org.eclipse.jst.javaee.ejb.MessageDrivenBean bean = (org.eclipse.jst.javaee.ejb.MessageDrivenBean) adaptableObject;
-			return bean.getEjbClass();
-		} else if (adaptableObject instanceof org.eclipse.jst.javaee.ejb.EntityBean) {
-			org.eclipse.jst.javaee.ejb.EntityBean bean = (org.eclipse.jst.javaee.ejb.EntityBean) adaptableObject;
-			return bean.getEjbClass();
-		} else if (adaptableObject instanceof org.eclipse.jst.j2ee.ejb.EnterpriseBean) {
-			org.eclipse.jst.j2ee.ejb.EnterpriseBean bean = (org.eclipse.jst.j2ee.ejb.EnterpriseBean) adaptableObject;
-			return bean.getEjbClassName();
-		}
-		return null;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/internal/adapter/JavaEEArtifactAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/internal/adapter/JavaEEArtifactAdapterFactory.java
deleted file mode 100644
index 07b5a5fc7..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/internal/adapter/JavaEEArtifactAdapterFactory.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.eclipse.jst.javaee.internal.adapter;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.j2ee.core.internal.plugin.J2EECorePlugin;
-
-public abstract class JavaEEArtifactAdapterFactory implements IAdapterFactory {
-
-	public Object getAdapter(Object adaptableObject, Class adapterType) {
-		if (adapterType == IJavaElement.class) {
-			IJavaProject javaProject = getJavaProject(adaptableObject);
-			String className = getFullyQualifiedClassName(adaptableObject);
-			return getJavaElement(javaProject, className);
-		}
-		return null;
-	}
-
-	public Class[] getAdapterList() {
-		return new Class[] { IJavaElement.class };
-	}
-
-	protected abstract String getFullyQualifiedClassName(Object adaptableObject);
-	
-	private IJavaProject getJavaProject(Object adaptableObject) {
-		IResource resource = getResource(adaptableObject);
-		if (resource != null) {
-			IProject project = resource.getProject();
-			return JavaCore.create(project);
-		}
-		return null;
-	}
-	
-	private IResource getResource(Object adaptableObject) {
-		if (adaptableObject instanceof IAdaptable) {
-			return (IResource) ((IAdaptable) adaptableObject).getAdapter(IResource.class);
-		} 
-		return (IResource) Platform.getAdapterManager().getAdapter(adaptableObject, IResource.class);
-	}
-	
-	private IJavaElement getJavaElement(IJavaProject javaProject, String className) {
-		if (className != null && javaProject != null && javaProject.exists()) {
-			try {
-				return javaProject.findType(className);
-			} catch (JavaModelException e) {
-				J2EECorePlugin.logError(e);
-			}
-		}
-		return null;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/internal/adapter/WebArtifactAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/internal/adapter/WebArtifactAdapterFactory.java
deleted file mode 100644
index 1bdca53d9..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/internal/adapter/WebArtifactAdapterFactory.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.eclipse.jst.javaee.internal.adapter;
-
-public class WebArtifactAdapterFactory extends JavaEEArtifactAdapterFactory {
-
-	protected String getFullyQualifiedClassName(Object adaptableObject) {
-		if (adaptableObject instanceof org.eclipse.jst.javaee.web.Servlet) {
-			org.eclipse.jst.javaee.web.Servlet servlet = (org.eclipse.jst.javaee.web.Servlet) adaptableObject;
-			return servlet.getServletClass();
-		} else if (adaptableObject instanceof org.eclipse.jst.javaee.web.Filter) {
-			org.eclipse.jst.javaee.web.Filter filter = (org.eclipse.jst.javaee.web.Filter) adaptableObject;
-			return filter.getFilterClass();
-		} else if (adaptableObject instanceof org.eclipse.jst.javaee.core.Listener) {
-			org.eclipse.jst.javaee.core.Listener listener = (org.eclipse.jst.javaee.core.Listener) adaptableObject;
-			return listener.getListenerClass();
-		} else if (adaptableObject instanceof org.eclipse.jst.j2ee.webapplication.Servlet) {
-			org.eclipse.jst.j2ee.webapplication.Servlet servlet = (org.eclipse.jst.j2ee.webapplication.Servlet) adaptableObject;
-			if (servlet.getWebType().isServletType()) {
-				return servlet.getServletClass().getQualifiedName();
-			}
-		} else if (adaptableObject instanceof org.eclipse.jst.j2ee.webapplication.Filter) {
-			org.eclipse.jst.j2ee.webapplication.Filter filter = (org.eclipse.jst.j2ee.webapplication.Filter) adaptableObject;
-			return filter.getFilterClass().getQualifiedName();
-		} else if (adaptableObject instanceof org.eclipse.jst.j2ee.common.Listener) {
-			org.eclipse.jst.j2ee.common.Listener listener = (org.eclipse.jst.j2ee.common.Listener) adaptableObject;
-			return listener.getListenerClass().getQualifiedName();
-		}
-		return null;
-	}
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/JspConfig.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/JspConfig.java
deleted file mode 100644
index bedf4dc8a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/JspConfig.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.jsp;
-
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Config</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The jsp-configType is used to provide global configuration
- * 	information for the JSP files in a web application. It has
- * 	two subelements, taglib and jsp-property-group.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.jsp.JspConfig#getTagLibs <em>Tag Libs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.jsp.JspConfig#getJspPropertyGroups <em>Jsp Property Groups</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.jsp.JspConfig#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage#getJspConfig()
- * @extends JavaEEObject
- * @generated
- */
-public interface JspConfig extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Tag Libs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.jsp.TagLib}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Tag Libs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Tag Libs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage#getJspConfig_TagLibs()
-	 * @generated
-	 */
-	List getTagLibs();
-
-	/**
-	 * Returns the value of the '<em><b>Jsp Property Groups</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.jsp.JspPropertyGroup}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Jsp Property Groups</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Jsp Property Groups</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage#getJspConfig_JspPropertyGroups()
-	 * @generated
-	 */
-	List getJspPropertyGroups();
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage#getJspConfig_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.jsp.JspConfig#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // JspConfig
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/JspFactory.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/JspFactory.java
deleted file mode 100644
index 2d33537bb..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/JspFactory.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.jsp;
-
-import org.eclipse.emf.ecore.EFactory;
-
-import org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage
- * @generated
- */
-public interface JspFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	JspFactory eINSTANCE = org.eclipse.jst.javaee.jsp.internal.impl.JspFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Config</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Config</em>'.
-	 * @generated
-	 */
-	JspConfig createJspConfig();
-
-	/**
-	 * Returns a new object of class '<em>Property Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Property Group</em>'.
-	 * @generated
-	 */
-	JspPropertyGroup createJspPropertyGroup();
-
-	/**
-	 * Returns a new object of class '<em>Tag Lib</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Tag Lib</em>'.
-	 * @generated
-	 */
-	TagLib createTagLib();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	JspPackage getJspPackage();
-
-} //JspFactory
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/JspPropertyGroup.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/JspPropertyGroup.java
deleted file mode 100644
index 266edf7cf..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/JspPropertyGroup.java
+++ /dev/null
@@ -1,529 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.jsp;
-
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Property Group</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The jsp-property-groupType is used to group a number of
- * 	files so they can be given global property information.
- * 	All files so described are deemed to be JSP files.  The
- * 	following additional properties can be described:
- * 
- * 	    - Control whether EL is ignored.
- * 	    - Control whether scripting elements are invalid.
- * 	    - Indicate pageEncoding information.
- * 	    - Indicate that a resource is a JSP document (XML).
- * 	    - Prelude and Coda automatic includes.
- *             - Control whether the character sequence #{ is allowed
- *               when used as a String literal.
- *             - Control whether template text containing only
- *               whitespaces must be removed from the response output.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#getDisplayNames <em>Display Names</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#getIcons <em>Icons</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#getUrlPatterns <em>Url Patterns</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#isElIgnored <em>El Ignored</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#getPageEncoding <em>Page Encoding</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#isScriptingInvalid <em>Scripting Invalid</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#isIsXml <em>Is Xml</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#getIncludePreludes <em>Include Preludes</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#getIncludeCodas <em>Include Codas</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#isDeferredSyntaxAllowedAsLiteral <em>Deferred Syntax Allowed As Literal</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#isTrimDirectiveWhitespaces <em>Trim Directive Whitespaces</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage#getJspPropertyGroup()
- * @extends JavaEEObject
- * @generated
- */
-public interface JspPropertyGroup extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage#getJspPropertyGroup_Descriptions()
-	 * @generated
-	 */
-	List getDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>Display Names</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.DisplayName}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Names</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Names</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage#getJspPropertyGroup_DisplayNames()
-	 * @generated
-	 */
-	List getDisplayNames();
-
-	/**
-	 * Returns the value of the '<em><b>Icons</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Icon}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Icons</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Icons</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage#getJspPropertyGroup_Icons()
-	 * @generated
-	 */
-	List getIcons();
-
-	/**
-	 * Returns the value of the '<em><b>Url Patterns</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.UrlPatternType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Url Patterns</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Url Patterns</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage#getJspPropertyGroup_UrlPatterns()
-	 * @generated
-	 */
-	List getUrlPatterns();
-
-	/**
-	 * Returns the value of the '<em><b>El Ignored</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    Can be used to easily set the isELIgnored
-	 * 	    property of a group of JSP pages.  By default, the
-	 * 	    EL evaluation is enabled for Web Applications using
-	 * 	    a Servlet 2.4 or greater web.xml, and disabled
-	 * 	    otherwise.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>El Ignored</em>' attribute.
-	 * @see #isSetElIgnored()
-	 * @see #unsetElIgnored()
-	 * @see #setElIgnored(boolean)
-	 * @see org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage#getJspPropertyGroup_ElIgnored()
-	 * @generated
-	 */
-	boolean isElIgnored();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#isElIgnored <em>El Ignored</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>El Ignored</em>' attribute.
-	 * @see #isSetElIgnored()
-	 * @see #unsetElIgnored()
-	 * @see #isElIgnored()
-	 * @generated
-	 */
-	void setElIgnored(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#isElIgnored <em>El Ignored</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetElIgnored()
-	 * @see #isElIgnored()
-	 * @see #setElIgnored(boolean)
-	 * @generated
-	 */
-	void unsetElIgnored();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#isElIgnored <em>El Ignored</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>El Ignored</em>' attribute is set.
-	 * @see #unsetElIgnored()
-	 * @see #isElIgnored()
-	 * @see #setElIgnored(boolean)
-	 * @generated
-	 */
-	boolean isSetElIgnored();
-
-	/**
-	 * Returns the value of the '<em><b>Page Encoding</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The valid values of page-encoding are those of the
-	 * 	    pageEncoding page directive.  It is a
-	 * 	    translation-time error to name different encodings
-	 * 	    in the pageEncoding attribute of the page directive
-	 * 	    of a JSP page and in a JSP configuration element
-	 * 	    matching the page.  It is also a translation-time
-	 * 	    error to name different encodings in the prolog
-	 * 	    or text declaration of a document in XML syntax and
-	 * 	    in a JSP configuration element matching the document.
-	 * 	    It is legal to name the same encoding through
-	 * 	    mulitple mechanisms.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Page Encoding</em>' attribute.
-	 * @see #setPageEncoding(String)
-	 * @see org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage#getJspPropertyGroup_PageEncoding()
-	 * @generated
-	 */
-	String getPageEncoding();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#getPageEncoding <em>Page Encoding</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Page Encoding</em>' attribute.
-	 * @see #getPageEncoding()
-	 * @generated
-	 */
-	void setPageEncoding(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Scripting Invalid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    Can be used to easily disable scripting in a
-	 * 	    group of JSP pages.  By default, scripting is
-	 * 	    enabled.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Scripting Invalid</em>' attribute.
-	 * @see #isSetScriptingInvalid()
-	 * @see #unsetScriptingInvalid()
-	 * @see #setScriptingInvalid(boolean)
-	 * @see org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage#getJspPropertyGroup_ScriptingInvalid()
-	 * @generated
-	 */
-	boolean isScriptingInvalid();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#isScriptingInvalid <em>Scripting Invalid</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Scripting Invalid</em>' attribute.
-	 * @see #isSetScriptingInvalid()
-	 * @see #unsetScriptingInvalid()
-	 * @see #isScriptingInvalid()
-	 * @generated
-	 */
-	void setScriptingInvalid(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#isScriptingInvalid <em>Scripting Invalid</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetScriptingInvalid()
-	 * @see #isScriptingInvalid()
-	 * @see #setScriptingInvalid(boolean)
-	 * @generated
-	 */
-	void unsetScriptingInvalid();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#isScriptingInvalid <em>Scripting Invalid</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Scripting Invalid</em>' attribute is set.
-	 * @see #unsetScriptingInvalid()
-	 * @see #isScriptingInvalid()
-	 * @see #setScriptingInvalid(boolean)
-	 * @generated
-	 */
-	boolean isSetScriptingInvalid();
-
-	/**
-	 * Returns the value of the '<em><b>Is Xml</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    If true, denotes that the group of resources
-	 * 	    that match the URL pattern are JSP documents,
-	 * 	    and thus must be interpreted as XML documents.
-	 * 	    If false, the resources are assumed to not
-	 * 	    be JSP documents, unless there is another
-	 * 	    property group that indicates otherwise.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Is Xml</em>' attribute.
-	 * @see #isSetIsXml()
-	 * @see #unsetIsXml()
-	 * @see #setIsXml(boolean)
-	 * @see org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage#getJspPropertyGroup_IsXml()
-	 * @generated
-	 */
-	boolean isIsXml();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#isIsXml <em>Is Xml</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Is Xml</em>' attribute.
-	 * @see #isSetIsXml()
-	 * @see #unsetIsXml()
-	 * @see #isIsXml()
-	 * @generated
-	 */
-	void setIsXml(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#isIsXml <em>Is Xml</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetIsXml()
-	 * @see #isIsXml()
-	 * @see #setIsXml(boolean)
-	 * @generated
-	 */
-	void unsetIsXml();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#isIsXml <em>Is Xml</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Is Xml</em>' attribute is set.
-	 * @see #unsetIsXml()
-	 * @see #isIsXml()
-	 * @see #setIsXml(boolean)
-	 * @generated
-	 */
-	boolean isSetIsXml();
-
-	/**
-	 * Returns the value of the '<em><b>Include Preludes</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The include-prelude element is a context-relative
-	 * 	    path that must correspond to an element in the
-	 * 	    Web Application.  When the element is present,
-	 * 	    the given path will be automatically included (as
-	 * 	    in an include directive) at the beginning of each
-	 * 	    JSP page in this jsp-property-group.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Include Preludes</em>' attribute list.
-	 * @see org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage#getJspPropertyGroup_IncludePreludes()
-	 * @generated
-	 */
-	List getIncludePreludes();
-
-	/**
-	 * Returns the value of the '<em><b>Include Codas</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The include-coda element is a context-relative
-	 * 	    path that must correspond to an element in the
-	 * 	    Web Application.  When the element is present,
-	 * 	    the given path will be automatically included (as
-	 * 	    in an include directive) at the end of each
-	 * 	    JSP page in this jsp-property-group.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Include Codas</em>' attribute list.
-	 * @see org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage#getJspPropertyGroup_IncludeCodas()
-	 * @generated
-	 */
-	List getIncludeCodas();
-
-	/**
-	 * Returns the value of the '<em><b>Deferred Syntax Allowed As Literal</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 *              The character sequence #{ is reserved for EL expressions.
-	 *              Consequently, a translation error occurs if the #{
-	 *              character sequence is used as a String literal, unless
-	 *              this element is enabled (true). Disabled (false) by
-	 *              default.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Deferred Syntax Allowed As Literal</em>' attribute.
-	 * @see #isSetDeferredSyntaxAllowedAsLiteral()
-	 * @see #unsetDeferredSyntaxAllowedAsLiteral()
-	 * @see #setDeferredSyntaxAllowedAsLiteral(boolean)
-	 * @see org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage#getJspPropertyGroup_DeferredSyntaxAllowedAsLiteral()
-	 * @generated
-	 */
-	boolean isDeferredSyntaxAllowedAsLiteral();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#isDeferredSyntaxAllowedAsLiteral <em>Deferred Syntax Allowed As Literal</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Deferred Syntax Allowed As Literal</em>' attribute.
-	 * @see #isSetDeferredSyntaxAllowedAsLiteral()
-	 * @see #unsetDeferredSyntaxAllowedAsLiteral()
-	 * @see #isDeferredSyntaxAllowedAsLiteral()
-	 * @generated
-	 */
-	void setDeferredSyntaxAllowedAsLiteral(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#isDeferredSyntaxAllowedAsLiteral <em>Deferred Syntax Allowed As Literal</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetDeferredSyntaxAllowedAsLiteral()
-	 * @see #isDeferredSyntaxAllowedAsLiteral()
-	 * @see #setDeferredSyntaxAllowedAsLiteral(boolean)
-	 * @generated
-	 */
-	void unsetDeferredSyntaxAllowedAsLiteral();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#isDeferredSyntaxAllowedAsLiteral <em>Deferred Syntax Allowed As Literal</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Deferred Syntax Allowed As Literal</em>' attribute is set.
-	 * @see #unsetDeferredSyntaxAllowedAsLiteral()
-	 * @see #isDeferredSyntaxAllowedAsLiteral()
-	 * @see #setDeferredSyntaxAllowedAsLiteral(boolean)
-	 * @generated
-	 */
-	boolean isSetDeferredSyntaxAllowedAsLiteral();
-
-	/**
-	 * Returns the value of the '<em><b>Trim Directive Whitespaces</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 *              Indicates that template text containing only whitespaces
-	 *              must be removed from the response output. It has no
-	 *              effect on JSP documents (XML syntax). Disabled (false)
-	 *              by default.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Trim Directive Whitespaces</em>' attribute.
-	 * @see #isSetTrimDirectiveWhitespaces()
-	 * @see #unsetTrimDirectiveWhitespaces()
-	 * @see #setTrimDirectiveWhitespaces(boolean)
-	 * @see org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage#getJspPropertyGroup_TrimDirectiveWhitespaces()
-	 * @generated
-	 */
-	boolean isTrimDirectiveWhitespaces();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#isTrimDirectiveWhitespaces <em>Trim Directive Whitespaces</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Trim Directive Whitespaces</em>' attribute.
-	 * @see #isSetTrimDirectiveWhitespaces()
-	 * @see #unsetTrimDirectiveWhitespaces()
-	 * @see #isTrimDirectiveWhitespaces()
-	 * @generated
-	 */
-	void setTrimDirectiveWhitespaces(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#isTrimDirectiveWhitespaces <em>Trim Directive Whitespaces</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetTrimDirectiveWhitespaces()
-	 * @see #isTrimDirectiveWhitespaces()
-	 * @see #setTrimDirectiveWhitespaces(boolean)
-	 * @generated
-	 */
-	void unsetTrimDirectiveWhitespaces();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#isTrimDirectiveWhitespaces <em>Trim Directive Whitespaces</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Trim Directive Whitespaces</em>' attribute is set.
-	 * @see #unsetTrimDirectiveWhitespaces()
-	 * @see #isTrimDirectiveWhitespaces()
-	 * @see #setTrimDirectiveWhitespaces(boolean)
-	 * @generated
-	 */
-	boolean isSetTrimDirectiveWhitespaces();
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage#getJspPropertyGroup_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // JspPropertyGroup
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/TagLib.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/TagLib.java
deleted file mode 100644
index 7194ffd52..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/TagLib.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.jsp;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Tag Lib</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The taglibType defines the syntax for declaring in
- * 	the deployment descriptor that a tag library is
- * 	available to the application.  This can be done
- * 	to override implicit map entries from TLD files and
- * 	from the container.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.jsp.TagLib#getTaglibUri <em>Taglib Uri</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.jsp.TagLib#getTaglibLocation <em>Taglib Location</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.jsp.TagLib#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage#getTagLib()
- * @extends JavaEEObject
- * @generated
- */
-public interface TagLib extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Taglib Uri</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    A taglib-uri element describes a URI identifying a
-	 * 	    tag library used in the web application.  The body
-	 * 	    of the taglib-uri element may be either an
-	 * 	    absolute URI specification, or a relative URI.
-	 * 	    There should be no entries in web.xml with the
-	 * 	    same taglib-uri value.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Taglib Uri</em>' attribute.
-	 * @see #setTaglibUri(String)
-	 * @see org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage#getTagLib_TaglibUri()
-	 * @generated
-	 */
-	String getTaglibUri();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.jsp.TagLib#getTaglibUri <em>Taglib Uri</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Taglib Uri</em>' attribute.
-	 * @see #getTaglibUri()
-	 * @generated
-	 */
-	void setTaglibUri(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Taglib Location</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    the taglib-location element contains the location
-	 * 	    (as a resource relative to the root of the web
-	 * 	    application) where to find the Tag Library
-	 * 	    Description file for the tag library.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Taglib Location</em>' attribute.
-	 * @see #setTaglibLocation(String)
-	 * @see org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage#getTagLib_TaglibLocation()
-	 * @generated
-	 */
-	String getTaglibLocation();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.jsp.TagLib#getTaglibLocation <em>Taglib Location</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Taglib Location</em>' attribute.
-	 * @see #getTaglibLocation()
-	 * @generated
-	 */
-	void setTaglibLocation(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage#getTagLib_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.jsp.TagLib#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // TagLib
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/impl/JspConfigImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/impl/JspConfigImpl.java
deleted file mode 100644
index d1f122d68..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/impl/JspConfigImpl.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.jsp.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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jst.javaee.jsp.JspConfig;
-import org.eclipse.jst.javaee.jsp.JspPropertyGroup;
-import org.eclipse.jst.javaee.jsp.TagLib;
-
-import org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Config</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.jsp.internal.impl.JspConfigImpl#getTagLibs <em>Tag Libs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.jsp.internal.impl.JspConfigImpl#getJspPropertyGroups <em>Jsp Property Groups</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.jsp.internal.impl.JspConfigImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class JspConfigImpl extends EObjectImpl implements JspConfig {
-	/**
-	 * The cached value of the '{@link #getTagLibs() <em>Tag Libs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTagLibs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList tagLibs = null;
-
-	/**
-	 * The cached value of the '{@link #getJspPropertyGroups() <em>Jsp Property Groups</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getJspPropertyGroups()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList jspPropertyGroups = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected JspConfigImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JspPackage.Literals.JSP_CONFIG;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getTagLibs() {
-		if (tagLibs == null) {
-			tagLibs = new EObjectContainmentEList(TagLib.class, this, JspPackage.JSP_CONFIG__TAG_LIBS);
-		}
-		return tagLibs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getJspPropertyGroups() {
-		if (jspPropertyGroups == null) {
-			jspPropertyGroups = new EObjectContainmentEList(JspPropertyGroup.class, this, JspPackage.JSP_CONFIG__JSP_PROPERTY_GROUPS);
-		}
-		return jspPropertyGroups;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JspPackage.JSP_CONFIG__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JspPackage.JSP_CONFIG__TAG_LIBS:
-				return ((InternalEList)getTagLibs()).basicRemove(otherEnd, msgs);
-			case JspPackage.JSP_CONFIG__JSP_PROPERTY_GROUPS:
-				return ((InternalEList)getJspPropertyGroups()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JspPackage.JSP_CONFIG__TAG_LIBS:
-				return getTagLibs();
-			case JspPackage.JSP_CONFIG__JSP_PROPERTY_GROUPS:
-				return getJspPropertyGroups();
-			case JspPackage.JSP_CONFIG__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JspPackage.JSP_CONFIG__TAG_LIBS:
-				getTagLibs().clear();
-				getTagLibs().addAll((Collection)newValue);
-				return;
-			case JspPackage.JSP_CONFIG__JSP_PROPERTY_GROUPS:
-				getJspPropertyGroups().clear();
-				getJspPropertyGroups().addAll((Collection)newValue);
-				return;
-			case JspPackage.JSP_CONFIG__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JspPackage.JSP_CONFIG__TAG_LIBS:
-				getTagLibs().clear();
-				return;
-			case JspPackage.JSP_CONFIG__JSP_PROPERTY_GROUPS:
-				getJspPropertyGroups().clear();
-				return;
-			case JspPackage.JSP_CONFIG__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JspPackage.JSP_CONFIG__TAG_LIBS:
-				return tagLibs != null && !tagLibs.isEmpty();
-			case JspPackage.JSP_CONFIG__JSP_PROPERTY_GROUPS:
-				return jspPropertyGroups != null && !jspPropertyGroups.isEmpty();
-			case JspPackage.JSP_CONFIG__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	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();
-	}
-
-} //JspConfigImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/impl/JspFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/impl/JspFactoryImpl.java
deleted file mode 100644
index 11f1b769a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/impl/JspFactoryImpl.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.jsp.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-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.core.JavaeeFactory;
-import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
-
-import org.eclipse.jst.javaee.jsp.*;
-
-import org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class JspFactoryImpl extends EFactoryImpl implements JspFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static JspFactory init() {
-		try {
-			JspFactory theJspFactory = (JspFactory)EPackage.Registry.INSTANCE.getEFactory("http://java.sun.com/xml/ns/javaee/jsp"); //$NON-NLS-1$ 
-			if (theJspFactory != null) {
-				return theJspFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new JspFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JspFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case JspPackage.JSP_CONFIG: return (EObject)createJspConfig();
-			case JspPackage.JSP_PROPERTY_GROUP: return (EObject)createJspPropertyGroup();
-			case JspPackage.TAG_LIB: return (EObject)createTagLib();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case JspPackage.JSP_FILE_TYPE:
-				return createJspFileTypeFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case JspPackage.JSP_FILE_TYPE:
-				return convertJspFileTypeToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JspConfig createJspConfig() {
-		JspConfigImpl jspConfig = new JspConfigImpl();
-		return jspConfig;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JspPropertyGroup createJspPropertyGroup() {
-		JspPropertyGroupImpl jspPropertyGroup = new JspPropertyGroupImpl();
-		return jspPropertyGroup;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TagLib createTagLib() {
-		TagLibImpl tagLib = new TagLibImpl();
-		return tagLib;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createJspFileTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)JavaeeFactory.eINSTANCE.createFromString(JavaeePackage.Literals.PATH_TYPE, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertJspFileTypeToString(EDataType eDataType, Object instanceValue) {
-		return JavaeeFactory.eINSTANCE.convertToString(JavaeePackage.Literals.PATH_TYPE, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JspPackage getJspPackage() {
-		return (JspPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	public static JspPackage getPackage() {
-		return JspPackage.eINSTANCE;
-	}
-
-} //JspFactoryImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/impl/JspPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/impl/JspPackageImpl.java
deleted file mode 100644
index e8a9b2edc..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/impl/JspPackageImpl.java
+++ /dev/null
@@ -1,693 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.jsp.internal.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-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.emf.ecore.xml.type.XMLTypePackage;
-
-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.jsp.JspConfig;
-import org.eclipse.jst.javaee.jsp.JspFactory;
-import org.eclipse.jst.javaee.jsp.JspPropertyGroup;
-import org.eclipse.jst.javaee.jsp.TagLib;
-
-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;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class JspPackageImpl extends EPackageImpl implements JspPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass jspConfigEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass jspPropertyGroupEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass tagLibEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType jspFileTypeEDataType = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>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.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private JspPackageImpl() {
-		super(eNS_URI, JspFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> 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.
-	 * <p>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.
-	 * <p>Invocation of this method will not affect any packages that have
-	 * already been initialized.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static JspPackage init() {
-		if (isInited) return (JspPackage)EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI);
-
-		// Obtain or create and register package
-		JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof JspPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new JspPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		XMLNamespacePackage.eINSTANCE.eClass();
-		XMLTypePackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		WebPackageImpl theWebPackage = (WebPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebPackage.eNS_URI) instanceof WebPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebPackage.eNS_URI) : WebPackage.eINSTANCE);
-		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);
-
-		// Create package meta-data objects
-		theJspPackage.createPackageContents();
-		theWebPackage.createPackageContents();
-		theApplicationPackage.createPackageContents();
-		theJavaeePackage.createPackageContents();
-		theEjbPackage.createPackageContents();
-		theApplicationclientPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theJspPackage.initializePackageContents();
-		theWebPackage.initializePackageContents();
-		theApplicationPackage.initializePackageContents();
-		theJavaeePackage.initializePackageContents();
-		theEjbPackage.initializePackageContents();
-		theApplicationclientPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theJspPackage.freeze();
-
-		return theJspPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getJspConfig() {
-		return jspConfigEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getJspConfig_TagLibs() {
-		return (EReference)jspConfigEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getJspConfig_JspPropertyGroups() {
-		return (EReference)jspConfigEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getJspConfig_Id() {
-		return (EAttribute)jspConfigEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getJspPropertyGroup() {
-		return jspPropertyGroupEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getJspPropertyGroup_Descriptions() {
-		return (EReference)jspPropertyGroupEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getJspPropertyGroup_DisplayNames() {
-		return (EReference)jspPropertyGroupEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getJspPropertyGroup_Icons() {
-		return (EReference)jspPropertyGroupEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getJspPropertyGroup_UrlPatterns() {
-		return (EReference)jspPropertyGroupEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getJspPropertyGroup_ElIgnored() {
-		return (EAttribute)jspPropertyGroupEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getJspPropertyGroup_PageEncoding() {
-		return (EAttribute)jspPropertyGroupEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getJspPropertyGroup_ScriptingInvalid() {
-		return (EAttribute)jspPropertyGroupEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getJspPropertyGroup_IsXml() {
-		return (EAttribute)jspPropertyGroupEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getJspPropertyGroup_IncludePreludes() {
-		return (EAttribute)jspPropertyGroupEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getJspPropertyGroup_IncludeCodas() {
-		return (EAttribute)jspPropertyGroupEClass.getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getJspPropertyGroup_DeferredSyntaxAllowedAsLiteral() {
-		return (EAttribute)jspPropertyGroupEClass.getEStructuralFeatures().get(10);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getJspPropertyGroup_TrimDirectiveWhitespaces() {
-		return (EAttribute)jspPropertyGroupEClass.getEStructuralFeatures().get(11);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getJspPropertyGroup_Id() {
-		return (EAttribute)jspPropertyGroupEClass.getEStructuralFeatures().get(12);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTagLib() {
-		return tagLibEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTagLib_TaglibUri() {
-		return (EAttribute)tagLibEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTagLib_TaglibLocation() {
-		return (EAttribute)tagLibEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTagLib_Id() {
-		return (EAttribute)tagLibEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getJspFileType() {
-		return jspFileTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JspFactory getJspFactory() {
-		return (JspFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @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.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		jspConfigEClass = createEClass(JSP_CONFIG);
-		createEReference(jspConfigEClass, JSP_CONFIG__TAG_LIBS);
-		createEReference(jspConfigEClass, JSP_CONFIG__JSP_PROPERTY_GROUPS);
-		createEAttribute(jspConfigEClass, JSP_CONFIG__ID);
-
-		jspPropertyGroupEClass = createEClass(JSP_PROPERTY_GROUP);
-		createEReference(jspPropertyGroupEClass, JSP_PROPERTY_GROUP__DESCRIPTIONS);
-		createEReference(jspPropertyGroupEClass, JSP_PROPERTY_GROUP__DISPLAY_NAMES);
-		createEReference(jspPropertyGroupEClass, JSP_PROPERTY_GROUP__ICONS);
-		createEReference(jspPropertyGroupEClass, JSP_PROPERTY_GROUP__URL_PATTERNS);
-		createEAttribute(jspPropertyGroupEClass, JSP_PROPERTY_GROUP__EL_IGNORED);
-		createEAttribute(jspPropertyGroupEClass, JSP_PROPERTY_GROUP__PAGE_ENCODING);
-		createEAttribute(jspPropertyGroupEClass, JSP_PROPERTY_GROUP__SCRIPTING_INVALID);
-		createEAttribute(jspPropertyGroupEClass, JSP_PROPERTY_GROUP__IS_XML);
-		createEAttribute(jspPropertyGroupEClass, JSP_PROPERTY_GROUP__INCLUDE_PRELUDES);
-		createEAttribute(jspPropertyGroupEClass, JSP_PROPERTY_GROUP__INCLUDE_CODAS);
-		createEAttribute(jspPropertyGroupEClass, JSP_PROPERTY_GROUP__DEFERRED_SYNTAX_ALLOWED_AS_LITERAL);
-		createEAttribute(jspPropertyGroupEClass, JSP_PROPERTY_GROUP__TRIM_DIRECTIVE_WHITESPACES);
-		createEAttribute(jspPropertyGroupEClass, JSP_PROPERTY_GROUP__ID);
-
-		tagLibEClass = createEClass(TAG_LIB);
-		createEAttribute(tagLibEClass, TAG_LIB__TAGLIB_URI);
-		createEAttribute(tagLibEClass, TAG_LIB__TAGLIB_LOCATION);
-		createEAttribute(tagLibEClass, TAG_LIB__ID);
-
-		// Create data types
-		jspFileTypeEDataType = createEDataType(JSP_FILE_TYPE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @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.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		XMLTypePackage theXMLTypePackage = (XMLTypePackage)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI);
-		JavaeePackage theJavaeePackage = (JavaeePackage)EPackage.Registry.INSTANCE.getEPackage(JavaeePackage.eNS_URI);
-
-		// Add supertypes to classes
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(jspConfigEClass, JspConfig.class, "JspConfig", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getJspConfig_TagLibs(), this.getTagLib(), null, "tagLibs", null, 0, -1, JspConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getJspConfig_JspPropertyGroups(), this.getJspPropertyGroup(), null, "jspPropertyGroups", null, 0, -1, JspConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getJspConfig_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, JspConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(jspPropertyGroupEClass, JspPropertyGroup.class, "JspPropertyGroup", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getJspPropertyGroup_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getJspPropertyGroup_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getJspPropertyGroup_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getJspPropertyGroup_UrlPatterns(), theJavaeePackage.getUrlPatternType(), null, "urlPatterns", null, 1, -1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getJspPropertyGroup_ElIgnored(), theJavaeePackage.getTrueFalseType(), "elIgnored", null, 0, 1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getJspPropertyGroup_PageEncoding(), theXMLTypePackage.getToken(), "pageEncoding", null, 0, 1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getJspPropertyGroup_ScriptingInvalid(), theJavaeePackage.getTrueFalseType(), "scriptingInvalid", null, 0, 1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getJspPropertyGroup_IsXml(), theJavaeePackage.getTrueFalseType(), "isXml", null, 0, 1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getJspPropertyGroup_IncludePreludes(), theJavaeePackage.getPathType(), "includePreludes", null, 0, -1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getJspPropertyGroup_IncludeCodas(), theJavaeePackage.getPathType(), "includeCodas", null, 0, -1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getJspPropertyGroup_DeferredSyntaxAllowedAsLiteral(), theJavaeePackage.getTrueFalseType(), "deferredSyntaxAllowedAsLiteral", null, 0, 1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getJspPropertyGroup_TrimDirectiveWhitespaces(), theJavaeePackage.getTrueFalseType(), "trimDirectiveWhitespaces", null, 0, 1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getJspPropertyGroup_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(tagLibEClass, TagLib.class, "TagLib", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getTagLib_TaglibUri(), theXMLTypePackage.getToken(), "taglibUri", null, 1, 1, TagLib.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getTagLib_TaglibLocation(), theJavaeePackage.getPathType(), "taglibLocation", null, 1, 1, TagLib.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getTagLib_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, TagLib.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		// Initialize data types
-		initEDataType(jspFileTypeEDataType, String.class, "JspFileType", 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 <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void createExtendedMetaDataAnnotations() {
-		String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$				
-		addAnnotation
-		  (jspConfigEClass, 
-		   source, 
-		   new String[] {
-			 "name", "jsp-configType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getJspConfig_TagLibs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "taglib", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getJspConfig_JspPropertyGroups(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "jsp-property-group", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getJspConfig_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (jspFileTypeEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "jsp-fileType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "baseType", "http://java.sun.com/xml/ns/javaee#pathType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (jspPropertyGroupEClass, 
-		   source, 
-		   new String[] {
-			 "name", "jsp-property-groupType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getJspPropertyGroup_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
-		  (getJspPropertyGroup_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
-		  (getJspPropertyGroup_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
-		  (getJspPropertyGroup_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$
-		   });			
-		addAnnotation
-		  (getJspPropertyGroup_ElIgnored(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "el-ignored", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getJspPropertyGroup_PageEncoding(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "page-encoding", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getJspPropertyGroup_ScriptingInvalid(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "scripting-invalid", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getJspPropertyGroup_IsXml(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "is-xml", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getJspPropertyGroup_IncludePreludes(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "include-prelude", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getJspPropertyGroup_IncludeCodas(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "include-coda", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getJspPropertyGroup_DeferredSyntaxAllowedAsLiteral(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "deferred-syntax-allowed-as-literal", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getJspPropertyGroup_TrimDirectiveWhitespaces(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "trim-directive-whitespaces", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getJspPropertyGroup_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (tagLibEClass, 
-		   source, 
-		   new String[] {
-			 "name", "taglibType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getTagLib_TaglibUri(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "taglib-uri", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getTagLib_TaglibLocation(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "taglib-location", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getTagLib_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });
-	}
-
-} //JspPackageImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/impl/JspPropertyGroupImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/impl/JspPropertyGroupImpl.java
deleted file mode 100644
index b22bdc515..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/impl/JspPropertyGroupImpl.java
+++ /dev/null
@@ -1,903 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.jsp.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.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-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.UrlPatternType;
-
-import org.eclipse.jst.javaee.jsp.JspPropertyGroup;
-
-import org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Property Group</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.jsp.internal.impl.JspPropertyGroupImpl#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.jsp.internal.impl.JspPropertyGroupImpl#getDisplayNames <em>Display Names</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.jsp.internal.impl.JspPropertyGroupImpl#getIcons <em>Icons</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.jsp.internal.impl.JspPropertyGroupImpl#getUrlPatterns <em>Url Patterns</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.jsp.internal.impl.JspPropertyGroupImpl#isElIgnored <em>El Ignored</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.jsp.internal.impl.JspPropertyGroupImpl#getPageEncoding <em>Page Encoding</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.jsp.internal.impl.JspPropertyGroupImpl#isScriptingInvalid <em>Scripting Invalid</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.jsp.internal.impl.JspPropertyGroupImpl#isIsXml <em>Is Xml</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.jsp.internal.impl.JspPropertyGroupImpl#getIncludePreludes <em>Include Preludes</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.jsp.internal.impl.JspPropertyGroupImpl#getIncludeCodas <em>Include Codas</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.jsp.internal.impl.JspPropertyGroupImpl#isDeferredSyntaxAllowedAsLiteral <em>Deferred Syntax Allowed As Literal</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.jsp.internal.impl.JspPropertyGroupImpl#isTrimDirectiveWhitespaces <em>Trim Directive Whitespaces</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.jsp.internal.impl.JspPropertyGroupImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class JspPropertyGroupImpl extends EObjectImpl implements JspPropertyGroup {
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayNames() <em>Display Names</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayNames()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList displayNames = null;
-
-	/**
-	 * The cached value of the '{@link #getIcons() <em>Icons</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIcons()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList icons = null;
-
-	/**
-	 * The cached value of the '{@link #getUrlPatterns() <em>Url Patterns</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUrlPatterns()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList urlPatterns = null;
-
-	/**
-	 * The default value of the '{@link #isElIgnored() <em>El Ignored</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isElIgnored()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean EL_IGNORED_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isElIgnored() <em>El Ignored</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isElIgnored()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean elIgnored = EL_IGNORED_EDEFAULT;
-
-	/**
-	 * This is true if the El Ignored attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean elIgnoredESet = false;
-
-	/**
-	 * The default value of the '{@link #getPageEncoding() <em>Page Encoding</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPageEncoding()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PAGE_ENCODING_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPageEncoding() <em>Page Encoding</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPageEncoding()
-	 * @generated
-	 * @ordered
-	 */
-	protected String pageEncoding = PAGE_ENCODING_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isScriptingInvalid() <em>Scripting Invalid</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isScriptingInvalid()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean SCRIPTING_INVALID_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isScriptingInvalid() <em>Scripting Invalid</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isScriptingInvalid()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean scriptingInvalid = SCRIPTING_INVALID_EDEFAULT;
-
-	/**
-	 * This is true if the Scripting Invalid attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean scriptingInvalidESet = false;
-
-	/**
-	 * The default value of the '{@link #isIsXml() <em>Is Xml</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsXml()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean IS_XML_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isIsXml() <em>Is Xml</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsXml()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isXml = IS_XML_EDEFAULT;
-
-	/**
-	 * This is true if the Is Xml attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isXmlESet = false;
-
-	/**
-	 * The cached value of the '{@link #getIncludePreludes() <em>Include Preludes</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIncludePreludes()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList includePreludes = null;
-
-	/**
-	 * The cached value of the '{@link #getIncludeCodas() <em>Include Codas</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIncludeCodas()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList includeCodas = null;
-
-	/**
-	 * The default value of the '{@link #isDeferredSyntaxAllowedAsLiteral() <em>Deferred Syntax Allowed As Literal</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDeferredSyntaxAllowedAsLiteral()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean DEFERRED_SYNTAX_ALLOWED_AS_LITERAL_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isDeferredSyntaxAllowedAsLiteral() <em>Deferred Syntax Allowed As Literal</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDeferredSyntaxAllowedAsLiteral()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean deferredSyntaxAllowedAsLiteral = DEFERRED_SYNTAX_ALLOWED_AS_LITERAL_EDEFAULT;
-
-	/**
-	 * This is true if the Deferred Syntax Allowed As Literal attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean deferredSyntaxAllowedAsLiteralESet = false;
-
-	/**
-	 * The default value of the '{@link #isTrimDirectiveWhitespaces() <em>Trim Directive Whitespaces</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isTrimDirectiveWhitespaces()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean TRIM_DIRECTIVE_WHITESPACES_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isTrimDirectiveWhitespaces() <em>Trim Directive Whitespaces</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isTrimDirectiveWhitespaces()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean trimDirectiveWhitespaces = TRIM_DIRECTIVE_WHITESPACES_EDEFAULT;
-
-	/**
-	 * This is true if the Trim Directive Whitespaces attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean trimDirectiveWhitespacesESet = false;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected JspPropertyGroupImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JspPackage.Literals.JSP_PROPERTY_GROUP;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, JspPackage.JSP_PROPERTY_GROUP__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDisplayNames() {
-		if (displayNames == null) {
-			displayNames = new EObjectContainmentEList(DisplayName.class, this, JspPackage.JSP_PROPERTY_GROUP__DISPLAY_NAMES);
-		}
-		return displayNames;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getIcons() {
-		if (icons == null) {
-			icons = new EObjectContainmentEList(Icon.class, this, JspPackage.JSP_PROPERTY_GROUP__ICONS);
-		}
-		return icons;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getUrlPatterns() {
-		if (urlPatterns == null) {
-			urlPatterns = new EObjectContainmentEList(UrlPatternType.class, this, JspPackage.JSP_PROPERTY_GROUP__URL_PATTERNS);
-		}
-		return urlPatterns;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isElIgnored() {
-		return elIgnored;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setElIgnored(boolean newElIgnored) {
-		boolean oldElIgnored = elIgnored;
-		elIgnored = newElIgnored;
-		boolean oldElIgnoredESet = elIgnoredESet;
-		elIgnoredESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JspPackage.JSP_PROPERTY_GROUP__EL_IGNORED, oldElIgnored, elIgnored, !oldElIgnoredESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetElIgnored() {
-		boolean oldElIgnored = elIgnored;
-		boolean oldElIgnoredESet = elIgnoredESet;
-		elIgnored = EL_IGNORED_EDEFAULT;
-		elIgnoredESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, JspPackage.JSP_PROPERTY_GROUP__EL_IGNORED, oldElIgnored, EL_IGNORED_EDEFAULT, oldElIgnoredESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetElIgnored() {
-		return elIgnoredESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPageEncoding() {
-		return pageEncoding;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPageEncoding(String newPageEncoding) {
-		String oldPageEncoding = pageEncoding;
-		pageEncoding = newPageEncoding;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JspPackage.JSP_PROPERTY_GROUP__PAGE_ENCODING, oldPageEncoding, pageEncoding));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isScriptingInvalid() {
-		return scriptingInvalid;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setScriptingInvalid(boolean newScriptingInvalid) {
-		boolean oldScriptingInvalid = scriptingInvalid;
-		scriptingInvalid = newScriptingInvalid;
-		boolean oldScriptingInvalidESet = scriptingInvalidESet;
-		scriptingInvalidESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JspPackage.JSP_PROPERTY_GROUP__SCRIPTING_INVALID, oldScriptingInvalid, scriptingInvalid, !oldScriptingInvalidESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetScriptingInvalid() {
-		boolean oldScriptingInvalid = scriptingInvalid;
-		boolean oldScriptingInvalidESet = scriptingInvalidESet;
-		scriptingInvalid = SCRIPTING_INVALID_EDEFAULT;
-		scriptingInvalidESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, JspPackage.JSP_PROPERTY_GROUP__SCRIPTING_INVALID, oldScriptingInvalid, SCRIPTING_INVALID_EDEFAULT, oldScriptingInvalidESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetScriptingInvalid() {
-		return scriptingInvalidESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isIsXml() {
-		return isXml;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIsXml(boolean newIsXml) {
-		boolean oldIsXml = isXml;
-		isXml = newIsXml;
-		boolean oldIsXmlESet = isXmlESet;
-		isXmlESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JspPackage.JSP_PROPERTY_GROUP__IS_XML, oldIsXml, isXml, !oldIsXmlESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetIsXml() {
-		boolean oldIsXml = isXml;
-		boolean oldIsXmlESet = isXmlESet;
-		isXml = IS_XML_EDEFAULT;
-		isXmlESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, JspPackage.JSP_PROPERTY_GROUP__IS_XML, oldIsXml, IS_XML_EDEFAULT, oldIsXmlESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetIsXml() {
-		return isXmlESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getIncludePreludes() {
-		if (includePreludes == null) {
-			includePreludes = new EDataTypeEList(String.class, this, JspPackage.JSP_PROPERTY_GROUP__INCLUDE_PRELUDES);
-		}
-		return includePreludes;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getIncludeCodas() {
-		if (includeCodas == null) {
-			includeCodas = new EDataTypeEList(String.class, this, JspPackage.JSP_PROPERTY_GROUP__INCLUDE_CODAS);
-		}
-		return includeCodas;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isDeferredSyntaxAllowedAsLiteral() {
-		return deferredSyntaxAllowedAsLiteral;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDeferredSyntaxAllowedAsLiteral(boolean newDeferredSyntaxAllowedAsLiteral) {
-		boolean oldDeferredSyntaxAllowedAsLiteral = deferredSyntaxAllowedAsLiteral;
-		deferredSyntaxAllowedAsLiteral = newDeferredSyntaxAllowedAsLiteral;
-		boolean oldDeferredSyntaxAllowedAsLiteralESet = deferredSyntaxAllowedAsLiteralESet;
-		deferredSyntaxAllowedAsLiteralESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JspPackage.JSP_PROPERTY_GROUP__DEFERRED_SYNTAX_ALLOWED_AS_LITERAL, oldDeferredSyntaxAllowedAsLiteral, deferredSyntaxAllowedAsLiteral, !oldDeferredSyntaxAllowedAsLiteralESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetDeferredSyntaxAllowedAsLiteral() {
-		boolean oldDeferredSyntaxAllowedAsLiteral = deferredSyntaxAllowedAsLiteral;
-		boolean oldDeferredSyntaxAllowedAsLiteralESet = deferredSyntaxAllowedAsLiteralESet;
-		deferredSyntaxAllowedAsLiteral = DEFERRED_SYNTAX_ALLOWED_AS_LITERAL_EDEFAULT;
-		deferredSyntaxAllowedAsLiteralESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, JspPackage.JSP_PROPERTY_GROUP__DEFERRED_SYNTAX_ALLOWED_AS_LITERAL, oldDeferredSyntaxAllowedAsLiteral, DEFERRED_SYNTAX_ALLOWED_AS_LITERAL_EDEFAULT, oldDeferredSyntaxAllowedAsLiteralESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetDeferredSyntaxAllowedAsLiteral() {
-		return deferredSyntaxAllowedAsLiteralESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isTrimDirectiveWhitespaces() {
-		return trimDirectiveWhitespaces;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTrimDirectiveWhitespaces(boolean newTrimDirectiveWhitespaces) {
-		boolean oldTrimDirectiveWhitespaces = trimDirectiveWhitespaces;
-		trimDirectiveWhitespaces = newTrimDirectiveWhitespaces;
-		boolean oldTrimDirectiveWhitespacesESet = trimDirectiveWhitespacesESet;
-		trimDirectiveWhitespacesESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JspPackage.JSP_PROPERTY_GROUP__TRIM_DIRECTIVE_WHITESPACES, oldTrimDirectiveWhitespaces, trimDirectiveWhitespaces, !oldTrimDirectiveWhitespacesESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetTrimDirectiveWhitespaces() {
-		boolean oldTrimDirectiveWhitespaces = trimDirectiveWhitespaces;
-		boolean oldTrimDirectiveWhitespacesESet = trimDirectiveWhitespacesESet;
-		trimDirectiveWhitespaces = TRIM_DIRECTIVE_WHITESPACES_EDEFAULT;
-		trimDirectiveWhitespacesESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, JspPackage.JSP_PROPERTY_GROUP__TRIM_DIRECTIVE_WHITESPACES, oldTrimDirectiveWhitespaces, TRIM_DIRECTIVE_WHITESPACES_EDEFAULT, oldTrimDirectiveWhitespacesESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetTrimDirectiveWhitespaces() {
-		return trimDirectiveWhitespacesESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JspPackage.JSP_PROPERTY_GROUP__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JspPackage.JSP_PROPERTY_GROUP__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-			case JspPackage.JSP_PROPERTY_GROUP__DISPLAY_NAMES:
-				return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
-			case JspPackage.JSP_PROPERTY_GROUP__ICONS:
-				return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
-			case JspPackage.JSP_PROPERTY_GROUP__URL_PATTERNS:
-				return ((InternalEList)getUrlPatterns()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JspPackage.JSP_PROPERTY_GROUP__DESCRIPTIONS:
-				return getDescriptions();
-			case JspPackage.JSP_PROPERTY_GROUP__DISPLAY_NAMES:
-				return getDisplayNames();
-			case JspPackage.JSP_PROPERTY_GROUP__ICONS:
-				return getIcons();
-			case JspPackage.JSP_PROPERTY_GROUP__URL_PATTERNS:
-				return getUrlPatterns();
-			case JspPackage.JSP_PROPERTY_GROUP__EL_IGNORED:
-				return isElIgnored() ? Boolean.TRUE : Boolean.FALSE;
-			case JspPackage.JSP_PROPERTY_GROUP__PAGE_ENCODING:
-				return getPageEncoding();
-			case JspPackage.JSP_PROPERTY_GROUP__SCRIPTING_INVALID:
-				return isScriptingInvalid() ? Boolean.TRUE : Boolean.FALSE;
-			case JspPackage.JSP_PROPERTY_GROUP__IS_XML:
-				return isIsXml() ? Boolean.TRUE : Boolean.FALSE;
-			case JspPackage.JSP_PROPERTY_GROUP__INCLUDE_PRELUDES:
-				return getIncludePreludes();
-			case JspPackage.JSP_PROPERTY_GROUP__INCLUDE_CODAS:
-				return getIncludeCodas();
-			case JspPackage.JSP_PROPERTY_GROUP__DEFERRED_SYNTAX_ALLOWED_AS_LITERAL:
-				return isDeferredSyntaxAllowedAsLiteral() ? Boolean.TRUE : Boolean.FALSE;
-			case JspPackage.JSP_PROPERTY_GROUP__TRIM_DIRECTIVE_WHITESPACES:
-				return isTrimDirectiveWhitespaces() ? Boolean.TRUE : Boolean.FALSE;
-			case JspPackage.JSP_PROPERTY_GROUP__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JspPackage.JSP_PROPERTY_GROUP__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				getDisplayNames().addAll((Collection)newValue);
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__ICONS:
-				getIcons().clear();
-				getIcons().addAll((Collection)newValue);
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__URL_PATTERNS:
-				getUrlPatterns().clear();
-				getUrlPatterns().addAll((Collection)newValue);
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__EL_IGNORED:
-				setElIgnored(((Boolean)newValue).booleanValue());
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__PAGE_ENCODING:
-				setPageEncoding((String)newValue);
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__SCRIPTING_INVALID:
-				setScriptingInvalid(((Boolean)newValue).booleanValue());
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__IS_XML:
-				setIsXml(((Boolean)newValue).booleanValue());
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__INCLUDE_PRELUDES:
-				getIncludePreludes().clear();
-				getIncludePreludes().addAll((Collection)newValue);
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__INCLUDE_CODAS:
-				getIncludeCodas().clear();
-				getIncludeCodas().addAll((Collection)newValue);
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__DEFERRED_SYNTAX_ALLOWED_AS_LITERAL:
-				setDeferredSyntaxAllowedAsLiteral(((Boolean)newValue).booleanValue());
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__TRIM_DIRECTIVE_WHITESPACES:
-				setTrimDirectiveWhitespaces(((Boolean)newValue).booleanValue());
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JspPackage.JSP_PROPERTY_GROUP__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__ICONS:
-				getIcons().clear();
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__URL_PATTERNS:
-				getUrlPatterns().clear();
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__EL_IGNORED:
-				unsetElIgnored();
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__PAGE_ENCODING:
-				setPageEncoding(PAGE_ENCODING_EDEFAULT);
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__SCRIPTING_INVALID:
-				unsetScriptingInvalid();
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__IS_XML:
-				unsetIsXml();
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__INCLUDE_PRELUDES:
-				getIncludePreludes().clear();
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__INCLUDE_CODAS:
-				getIncludeCodas().clear();
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__DEFERRED_SYNTAX_ALLOWED_AS_LITERAL:
-				unsetDeferredSyntaxAllowedAsLiteral();
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__TRIM_DIRECTIVE_WHITESPACES:
-				unsetTrimDirectiveWhitespaces();
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JspPackage.JSP_PROPERTY_GROUP__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case JspPackage.JSP_PROPERTY_GROUP__DISPLAY_NAMES:
-				return displayNames != null && !displayNames.isEmpty();
-			case JspPackage.JSP_PROPERTY_GROUP__ICONS:
-				return icons != null && !icons.isEmpty();
-			case JspPackage.JSP_PROPERTY_GROUP__URL_PATTERNS:
-				return urlPatterns != null && !urlPatterns.isEmpty();
-			case JspPackage.JSP_PROPERTY_GROUP__EL_IGNORED:
-				return isSetElIgnored();
-			case JspPackage.JSP_PROPERTY_GROUP__PAGE_ENCODING:
-				return PAGE_ENCODING_EDEFAULT == null ? pageEncoding != null : !PAGE_ENCODING_EDEFAULT.equals(pageEncoding);
-			case JspPackage.JSP_PROPERTY_GROUP__SCRIPTING_INVALID:
-				return isSetScriptingInvalid();
-			case JspPackage.JSP_PROPERTY_GROUP__IS_XML:
-				return isSetIsXml();
-			case JspPackage.JSP_PROPERTY_GROUP__INCLUDE_PRELUDES:
-				return includePreludes != null && !includePreludes.isEmpty();
-			case JspPackage.JSP_PROPERTY_GROUP__INCLUDE_CODAS:
-				return includeCodas != null && !includeCodas.isEmpty();
-			case JspPackage.JSP_PROPERTY_GROUP__DEFERRED_SYNTAX_ALLOWED_AS_LITERAL:
-				return isSetDeferredSyntaxAllowedAsLiteral();
-			case JspPackage.JSP_PROPERTY_GROUP__TRIM_DIRECTIVE_WHITESPACES:
-				return isSetTrimDirectiveWhitespaces();
-			case JspPackage.JSP_PROPERTY_GROUP__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (elIgnored: "); //$NON-NLS-1$
-		if (elIgnoredESet) result.append(elIgnored); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(", pageEncoding: "); //$NON-NLS-1$
-		result.append(pageEncoding);
-		result.append(", scriptingInvalid: "); //$NON-NLS-1$
-		if (scriptingInvalidESet) result.append(scriptingInvalid); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(", isXml: "); //$NON-NLS-1$
-		if (isXmlESet) result.append(isXml); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(", includePreludes: "); //$NON-NLS-1$
-		result.append(includePreludes);
-		result.append(", includeCodas: "); //$NON-NLS-1$
-		result.append(includeCodas);
-		result.append(", deferredSyntaxAllowedAsLiteral: "); //$NON-NLS-1$
-		if (deferredSyntaxAllowedAsLiteralESet) result.append(deferredSyntaxAllowedAsLiteral); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(", trimDirectiveWhitespaces: "); //$NON-NLS-1$
-		if (trimDirectiveWhitespacesESet) result.append(trimDirectiveWhitespaces); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //JspPropertyGroupImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/impl/TagLibImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/impl/TagLibImpl.java
deleted file mode 100644
index 8600a43db..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/impl/TagLibImpl.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.jsp.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.jsp.TagLib;
-
-import org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Tag Lib</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.jsp.internal.impl.TagLibImpl#getTaglibUri <em>Taglib Uri</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.jsp.internal.impl.TagLibImpl#getTaglibLocation <em>Taglib Location</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.jsp.internal.impl.TagLibImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TagLibImpl extends EObjectImpl implements TagLib {
-	/**
-	 * The default value of the '{@link #getTaglibUri() <em>Taglib Uri</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTaglibUri()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TAGLIB_URI_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getTaglibUri() <em>Taglib Uri</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTaglibUri()
-	 * @generated
-	 * @ordered
-	 */
-	protected String taglibUri = TAGLIB_URI_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getTaglibLocation() <em>Taglib Location</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTaglibLocation()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TAGLIB_LOCATION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getTaglibLocation() <em>Taglib Location</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTaglibLocation()
-	 * @generated
-	 * @ordered
-	 */
-	protected String taglibLocation = TAGLIB_LOCATION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TagLibImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JspPackage.Literals.TAG_LIB;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getTaglibUri() {
-		return taglibUri;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTaglibUri(String newTaglibUri) {
-		String oldTaglibUri = taglibUri;
-		taglibUri = newTaglibUri;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JspPackage.TAG_LIB__TAGLIB_URI, oldTaglibUri, taglibUri));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getTaglibLocation() {
-		return taglibLocation;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTaglibLocation(String newTaglibLocation) {
-		String oldTaglibLocation = taglibLocation;
-		taglibLocation = newTaglibLocation;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JspPackage.TAG_LIB__TAGLIB_LOCATION, oldTaglibLocation, taglibLocation));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JspPackage.TAG_LIB__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JspPackage.TAG_LIB__TAGLIB_URI:
-				return getTaglibUri();
-			case JspPackage.TAG_LIB__TAGLIB_LOCATION:
-				return getTaglibLocation();
-			case JspPackage.TAG_LIB__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JspPackage.TAG_LIB__TAGLIB_URI:
-				setTaglibUri((String)newValue);
-				return;
-			case JspPackage.TAG_LIB__TAGLIB_LOCATION:
-				setTaglibLocation((String)newValue);
-				return;
-			case JspPackage.TAG_LIB__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JspPackage.TAG_LIB__TAGLIB_URI:
-				setTaglibUri(TAGLIB_URI_EDEFAULT);
-				return;
-			case JspPackage.TAG_LIB__TAGLIB_LOCATION:
-				setTaglibLocation(TAGLIB_LOCATION_EDEFAULT);
-				return;
-			case JspPackage.TAG_LIB__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JspPackage.TAG_LIB__TAGLIB_URI:
-				return TAGLIB_URI_EDEFAULT == null ? taglibUri != null : !TAGLIB_URI_EDEFAULT.equals(taglibUri);
-			case JspPackage.TAG_LIB__TAGLIB_LOCATION:
-				return TAGLIB_LOCATION_EDEFAULT == null ? taglibLocation != null : !TAGLIB_LOCATION_EDEFAULT.equals(taglibLocation);
-			case JspPackage.TAG_LIB__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (taglibUri: "); //$NON-NLS-1$
-		result.append(taglibUri);
-		result.append(", taglibLocation: "); //$NON-NLS-1$
-		result.append(taglibLocation);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //TagLibImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/metadata/JspPackage.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/metadata/JspPackage.java
deleted file mode 100644
index a83f4883a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/metadata/JspPackage.java
+++ /dev/null
@@ -1,1016 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.jsp.internal.metadata;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.jst.javaee.jsp.JspFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> 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>
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * 
- *       @(#)jsp_2_1.xsds	1.5 08/11/05
- *     
- * 
- * 
- *       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.
- * 
- *     
- * 
- * 
- *       This is the XML Schema for the JSP 2.1 deployment descriptor
- *       types.  The JSP 2.1 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
- *       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.
- * 
- *     
- * 
- *       @(#)javaee_5.xsds	1.65 06/02/17
- *     
- * 
- * 
- *       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.
- * 
- *     
- * 
- * 
- * 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
- *     
- * 
- * 
- *       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.
- * 
- *     
- * 
- * 
- *       (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:
- * 
- *     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.
- *   
- *     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
- *   
- * 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.
- * 
- *         &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.
- *   
- * <!-- end-model-doc -->
- * @see org.eclipse.jst.javaee.jsp.JspFactory
- * @generated
- */
-public interface JspPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "jsp"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://java.sun.com/xml/ns/javaee/jsp"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "jsp"; //$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	JspPackage eINSTANCE = org.eclipse.jst.javaee.jsp.internal.impl.JspPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.jsp.internal.impl.JspConfigImpl <em>Config</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.jsp.internal.impl.JspConfigImpl
-	 * @see org.eclipse.jst.javaee.jsp.internal.impl.JspPackageImpl#getJspConfig()
-	 * @generated
-	 */
-	int JSP_CONFIG = 0;
-
-	/**
-	 * The feature id for the '<em><b>Tag Libs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_CONFIG__TAG_LIBS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Jsp Property Groups</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_CONFIG__JSP_PROPERTY_GROUPS = 1;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_CONFIG__ID = 2;
-
-	/**
-	 * The number of structural features of the '<em>Config</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_CONFIG_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.jsp.internal.impl.JspPropertyGroupImpl <em>Property Group</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.jsp.internal.impl.JspPropertyGroupImpl
-	 * @see org.eclipse.jst.javaee.jsp.internal.impl.JspPackageImpl#getJspPropertyGroup()
-	 * @generated
-	 */
-	int JSP_PROPERTY_GROUP = 1;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_PROPERTY_GROUP__DESCRIPTIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_PROPERTY_GROUP__DISPLAY_NAMES = 1;
-
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_PROPERTY_GROUP__ICONS = 2;
-
-	/**
-	 * The feature id for the '<em><b>Url Patterns</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_PROPERTY_GROUP__URL_PATTERNS = 3;
-
-	/**
-	 * The feature id for the '<em><b>El Ignored</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_PROPERTY_GROUP__EL_IGNORED = 4;
-
-	/**
-	 * The feature id for the '<em><b>Page Encoding</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_PROPERTY_GROUP__PAGE_ENCODING = 5;
-
-	/**
-	 * The feature id for the '<em><b>Scripting Invalid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_PROPERTY_GROUP__SCRIPTING_INVALID = 6;
-
-	/**
-	 * The feature id for the '<em><b>Is Xml</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_PROPERTY_GROUP__IS_XML = 7;
-
-	/**
-	 * The feature id for the '<em><b>Include Preludes</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_PROPERTY_GROUP__INCLUDE_PRELUDES = 8;
-
-	/**
-	 * The feature id for the '<em><b>Include Codas</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_PROPERTY_GROUP__INCLUDE_CODAS = 9;
-
-	/**
-	 * The feature id for the '<em><b>Deferred Syntax Allowed As Literal</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_PROPERTY_GROUP__DEFERRED_SYNTAX_ALLOWED_AS_LITERAL = 10;
-
-	/**
-	 * The feature id for the '<em><b>Trim Directive Whitespaces</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_PROPERTY_GROUP__TRIM_DIRECTIVE_WHITESPACES = 11;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_PROPERTY_GROUP__ID = 12;
-
-	/**
-	 * The number of structural features of the '<em>Property Group</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_PROPERTY_GROUP_FEATURE_COUNT = 13;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.jsp.internal.impl.TagLibImpl <em>Tag Lib</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.jsp.internal.impl.TagLibImpl
-	 * @see org.eclipse.jst.javaee.jsp.internal.impl.JspPackageImpl#getTagLib()
-	 * @generated
-	 */
-	int TAG_LIB = 2;
-
-	/**
-	 * The feature id for the '<em><b>Taglib Uri</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_LIB__TAGLIB_URI = 0;
-
-	/**
-	 * The feature id for the '<em><b>Taglib Location</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_LIB__TAGLIB_LOCATION = 1;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_LIB__ID = 2;
-
-	/**
-	 * The number of structural features of the '<em>Tag Lib</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_LIB_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '<em>File Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.jst.javaee.jsp.internal.impl.JspPackageImpl#getJspFileType()
-	 * @generated
-	 */
-	int JSP_FILE_TYPE = 3;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.jsp.JspConfig <em>Config</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Config</em>'.
-	 * @see org.eclipse.jst.javaee.jsp.JspConfig
-	 * @generated
-	 */
-	EClass getJspConfig();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.jsp.JspConfig#getTagLibs <em>Tag Libs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Tag Libs</em>'.
-	 * @see org.eclipse.jst.javaee.jsp.JspConfig#getTagLibs()
-	 * @see #getJspConfig()
-	 * @generated
-	 */
-	EReference getJspConfig_TagLibs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.jsp.JspConfig#getJspPropertyGroups <em>Jsp Property Groups</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Jsp Property Groups</em>'.
-	 * @see org.eclipse.jst.javaee.jsp.JspConfig#getJspPropertyGroups()
-	 * @see #getJspConfig()
-	 * @generated
-	 */
-	EReference getJspConfig_JspPropertyGroups();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.jsp.JspConfig#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.jsp.JspConfig#getId()
-	 * @see #getJspConfig()
-	 * @generated
-	 */
-	EAttribute getJspConfig_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup <em>Property Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Property Group</em>'.
-	 * @see org.eclipse.jst.javaee.jsp.JspPropertyGroup
-	 * @generated
-	 */
-	EClass getJspPropertyGroup();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.javaee.jsp.JspPropertyGroup#getDescriptions()
-	 * @see #getJspPropertyGroup()
-	 * @generated
-	 */
-	EReference getJspPropertyGroup_Descriptions();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#getDisplayNames <em>Display Names</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Display Names</em>'.
-	 * @see org.eclipse.jst.javaee.jsp.JspPropertyGroup#getDisplayNames()
-	 * @see #getJspPropertyGroup()
-	 * @generated
-	 */
-	EReference getJspPropertyGroup_DisplayNames();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#getIcons <em>Icons</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Icons</em>'.
-	 * @see org.eclipse.jst.javaee.jsp.JspPropertyGroup#getIcons()
-	 * @see #getJspPropertyGroup()
-	 * @generated
-	 */
-	EReference getJspPropertyGroup_Icons();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#getUrlPatterns <em>Url Patterns</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Url Patterns</em>'.
-	 * @see org.eclipse.jst.javaee.jsp.JspPropertyGroup#getUrlPatterns()
-	 * @see #getJspPropertyGroup()
-	 * @generated
-	 */
-	EReference getJspPropertyGroup_UrlPatterns();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#isElIgnored <em>El Ignored</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>El Ignored</em>'.
-	 * @see org.eclipse.jst.javaee.jsp.JspPropertyGroup#isElIgnored()
-	 * @see #getJspPropertyGroup()
-	 * @generated
-	 */
-	EAttribute getJspPropertyGroup_ElIgnored();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#getPageEncoding <em>Page Encoding</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Page Encoding</em>'.
-	 * @see org.eclipse.jst.javaee.jsp.JspPropertyGroup#getPageEncoding()
-	 * @see #getJspPropertyGroup()
-	 * @generated
-	 */
-	EAttribute getJspPropertyGroup_PageEncoding();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#isScriptingInvalid <em>Scripting Invalid</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Scripting Invalid</em>'.
-	 * @see org.eclipse.jst.javaee.jsp.JspPropertyGroup#isScriptingInvalid()
-	 * @see #getJspPropertyGroup()
-	 * @generated
-	 */
-	EAttribute getJspPropertyGroup_ScriptingInvalid();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#isIsXml <em>Is Xml</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Is Xml</em>'.
-	 * @see org.eclipse.jst.javaee.jsp.JspPropertyGroup#isIsXml()
-	 * @see #getJspPropertyGroup()
-	 * @generated
-	 */
-	EAttribute getJspPropertyGroup_IsXml();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#getIncludePreludes <em>Include Preludes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Include Preludes</em>'.
-	 * @see org.eclipse.jst.javaee.jsp.JspPropertyGroup#getIncludePreludes()
-	 * @see #getJspPropertyGroup()
-	 * @generated
-	 */
-	EAttribute getJspPropertyGroup_IncludePreludes();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#getIncludeCodas <em>Include Codas</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Include Codas</em>'.
-	 * @see org.eclipse.jst.javaee.jsp.JspPropertyGroup#getIncludeCodas()
-	 * @see #getJspPropertyGroup()
-	 * @generated
-	 */
-	EAttribute getJspPropertyGroup_IncludeCodas();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#isDeferredSyntaxAllowedAsLiteral <em>Deferred Syntax Allowed As Literal</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Deferred Syntax Allowed As Literal</em>'.
-	 * @see org.eclipse.jst.javaee.jsp.JspPropertyGroup#isDeferredSyntaxAllowedAsLiteral()
-	 * @see #getJspPropertyGroup()
-	 * @generated
-	 */
-	EAttribute getJspPropertyGroup_DeferredSyntaxAllowedAsLiteral();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#isTrimDirectiveWhitespaces <em>Trim Directive Whitespaces</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Trim Directive Whitespaces</em>'.
-	 * @see org.eclipse.jst.javaee.jsp.JspPropertyGroup#isTrimDirectiveWhitespaces()
-	 * @see #getJspPropertyGroup()
-	 * @generated
-	 */
-	EAttribute getJspPropertyGroup_TrimDirectiveWhitespaces();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.jsp.JspPropertyGroup#getId()
-	 * @see #getJspPropertyGroup()
-	 * @generated
-	 */
-	EAttribute getJspPropertyGroup_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.jsp.TagLib <em>Tag Lib</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Tag Lib</em>'.
-	 * @see org.eclipse.jst.javaee.jsp.TagLib
-	 * @generated
-	 */
-	EClass getTagLib();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.jsp.TagLib#getTaglibUri <em>Taglib Uri</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Taglib Uri</em>'.
-	 * @see org.eclipse.jst.javaee.jsp.TagLib#getTaglibUri()
-	 * @see #getTagLib()
-	 * @generated
-	 */
-	EAttribute getTagLib_TaglibUri();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.jsp.TagLib#getTaglibLocation <em>Taglib Location</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Taglib Location</em>'.
-	 * @see org.eclipse.jst.javaee.jsp.TagLib#getTaglibLocation()
-	 * @see #getTagLib()
-	 * @generated
-	 */
-	EAttribute getTagLib_TaglibLocation();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.jsp.TagLib#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.jsp.TagLib#getId()
-	 * @see #getTagLib()
-	 * @generated
-	 */
-	EAttribute getTagLib_Id();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>File Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>File Type</em>'.
-	 * @see java.lang.String
-	 * @generated
-	 */
-	EDataType getJspFileType();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	JspFactory getJspFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * 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>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.jsp.internal.impl.JspConfigImpl <em>Config</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.jsp.internal.impl.JspConfigImpl
-		 * @see org.eclipse.jst.javaee.jsp.internal.impl.JspPackageImpl#getJspConfig()
-		 * @generated
-		 */
-		EClass JSP_CONFIG = eINSTANCE.getJspConfig();
-
-		/**
-		 * The meta object literal for the '<em><b>Tag Libs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference JSP_CONFIG__TAG_LIBS = eINSTANCE.getJspConfig_TagLibs();
-
-		/**
-		 * The meta object literal for the '<em><b>Jsp Property Groups</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference JSP_CONFIG__JSP_PROPERTY_GROUPS = eINSTANCE.getJspConfig_JspPropertyGroups();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JSP_CONFIG__ID = eINSTANCE.getJspConfig_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.jsp.internal.impl.JspPropertyGroupImpl <em>Property Group</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.jsp.internal.impl.JspPropertyGroupImpl
-		 * @see org.eclipse.jst.javaee.jsp.internal.impl.JspPackageImpl#getJspPropertyGroup()
-		 * @generated
-		 */
-		EClass JSP_PROPERTY_GROUP = eINSTANCE.getJspPropertyGroup();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference JSP_PROPERTY_GROUP__DESCRIPTIONS = eINSTANCE.getJspPropertyGroup_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Display Names</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference JSP_PROPERTY_GROUP__DISPLAY_NAMES = eINSTANCE.getJspPropertyGroup_DisplayNames();
-
-		/**
-		 * The meta object literal for the '<em><b>Icons</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference JSP_PROPERTY_GROUP__ICONS = eINSTANCE.getJspPropertyGroup_Icons();
-
-		/**
-		 * The meta object literal for the '<em><b>Url Patterns</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference JSP_PROPERTY_GROUP__URL_PATTERNS = eINSTANCE.getJspPropertyGroup_UrlPatterns();
-
-		/**
-		 * The meta object literal for the '<em><b>El Ignored</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JSP_PROPERTY_GROUP__EL_IGNORED = eINSTANCE.getJspPropertyGroup_ElIgnored();
-
-		/**
-		 * The meta object literal for the '<em><b>Page Encoding</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JSP_PROPERTY_GROUP__PAGE_ENCODING = eINSTANCE.getJspPropertyGroup_PageEncoding();
-
-		/**
-		 * The meta object literal for the '<em><b>Scripting Invalid</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JSP_PROPERTY_GROUP__SCRIPTING_INVALID = eINSTANCE.getJspPropertyGroup_ScriptingInvalid();
-
-		/**
-		 * The meta object literal for the '<em><b>Is Xml</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JSP_PROPERTY_GROUP__IS_XML = eINSTANCE.getJspPropertyGroup_IsXml();
-
-		/**
-		 * The meta object literal for the '<em><b>Include Preludes</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JSP_PROPERTY_GROUP__INCLUDE_PRELUDES = eINSTANCE.getJspPropertyGroup_IncludePreludes();
-
-		/**
-		 * The meta object literal for the '<em><b>Include Codas</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JSP_PROPERTY_GROUP__INCLUDE_CODAS = eINSTANCE.getJspPropertyGroup_IncludeCodas();
-
-		/**
-		 * The meta object literal for the '<em><b>Deferred Syntax Allowed As Literal</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JSP_PROPERTY_GROUP__DEFERRED_SYNTAX_ALLOWED_AS_LITERAL = eINSTANCE.getJspPropertyGroup_DeferredSyntaxAllowedAsLiteral();
-
-		/**
-		 * The meta object literal for the '<em><b>Trim Directive Whitespaces</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JSP_PROPERTY_GROUP__TRIM_DIRECTIVE_WHITESPACES = eINSTANCE.getJspPropertyGroup_TrimDirectiveWhitespaces();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JSP_PROPERTY_GROUP__ID = eINSTANCE.getJspPropertyGroup_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.jsp.internal.impl.TagLibImpl <em>Tag Lib</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.jsp.internal.impl.TagLibImpl
-		 * @see org.eclipse.jst.javaee.jsp.internal.impl.JspPackageImpl#getTagLib()
-		 * @generated
-		 */
-		EClass TAG_LIB = eINSTANCE.getTagLib();
-
-		/**
-		 * The meta object literal for the '<em><b>Taglib Uri</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TAG_LIB__TAGLIB_URI = eINSTANCE.getTagLib_TaglibUri();
-
-		/**
-		 * The meta object literal for the '<em><b>Taglib Location</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TAG_LIB__TAGLIB_LOCATION = eINSTANCE.getTagLib_TaglibLocation();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TAG_LIB__ID = eINSTANCE.getTagLib_Id();
-
-		/**
-		 * The meta object literal for the '<em>File Type</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.lang.String
-		 * @see org.eclipse.jst.javaee.jsp.internal.impl.JspPackageImpl#getJspFileType()
-		 * @generated
-		 */
-		EDataType JSP_FILE_TYPE = eINSTANCE.getJspFileType();
-
-	}
-
-} //JspPackage
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/util/JspAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/util/JspAdapterFactory.java
deleted file mode 100644
index 13011a1b2..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/util/JspAdapterFactory.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.jsp.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.jsp.*;
-
-import org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage
- * @generated
- */
-public class JspAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static JspPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JspAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = JspPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected JspSwitch modelSwitch =
-		new JspSwitch() {
-			public Object caseJspConfig(JspConfig object) {
-				return createJspConfigAdapter();
-			}
-			public Object caseJspPropertyGroup(JspPropertyGroup object) {
-				return createJspPropertyGroupAdapter();
-			}
-			public Object caseTagLib(TagLib object) {
-				return createTagLibAdapter();
-			}
-			public Object defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	public Adapter createAdapter(Notifier target) {
-		return (Adapter)modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.jsp.JspConfig <em>Config</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.jsp.JspConfig
-	 * @generated
-	 */
-	public Adapter createJspConfigAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup <em>Property Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.jsp.JspPropertyGroup
-	 * @generated
-	 */
-	public Adapter createJspPropertyGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.jsp.TagLib <em>Tag Lib</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.jsp.TagLib
-	 * @generated
-	 */
-	public Adapter createTagLibAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //JspAdapterFactory
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/util/JspResourceFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/util/JspResourceFactoryImpl.java
deleted file mode 100644
index a61ae0a0e..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/util/JspResourceFactoryImpl.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.jsp.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;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource Factory</b> associated with the package.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.javaee.jsp.internal.util.JspResourceImpl
- * @generated
- */
-public class JspResourceFactoryImpl extends ResourceFactoryImpl {
-	/**
-	 * Creates an instance of the resource factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JspResourceFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Resource createResource(URI uri) {
-		XMLResource result = new JspResourceImpl(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;
-	}
-
-} //JspResourceFactoryImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/util/JspResourceImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/util/JspResourceImpl.java
deleted file mode 100644
index 454c2bb7f..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/util/JspResourceImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.jsp.internal.util;
-
-import org.eclipse.emf.common.util.URI;
-
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource </b> associated with the package.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.javaee.jsp.internal.util.JspResourceFactoryImpl
- * @generated
- */
-public class JspResourceImpl extends XMLResourceImpl {
-	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param uri the URI of the new resource.
-	 * @generated
-	 */
-	public JspResourceImpl(URI uri) {
-		super(uri);
-	}
-
-} //JspResourceImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/util/JspSwitch.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/util/JspSwitch.java
deleted file mode 100644
index 01dafb0df..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/util/JspSwitch.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.jsp.internal.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.jst.javaee.jsp.*;
-
-import org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> 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.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage
- * @generated
- */
-public class JspSwitch {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static JspPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JspSwitch() {
-		if (modelPackage == null) {
-			modelPackage = JspPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	public Object 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.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage) {
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
-			List eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch((EClass)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.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case JspPackage.JSP_CONFIG: {
-				JspConfig jspConfig = (JspConfig)theEObject;
-				Object result = caseJspConfig(jspConfig);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JspPackage.JSP_PROPERTY_GROUP: {
-				JspPropertyGroup jspPropertyGroup = (JspPropertyGroup)theEObject;
-				Object result = caseJspPropertyGroup(jspPropertyGroup);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JspPackage.TAG_LIB: {
-				TagLib tagLib = (TagLib)theEObject;
-				Object result = caseTagLib(tagLib);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Config</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Config</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseJspConfig(JspConfig object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Property Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Property Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseJspPropertyGroup(JspPropertyGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Tag Lib</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Tag Lib</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseTagLib(TagLib object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	public Object defaultCase(EObject object) {
-		return null;
-	}
-
-} //JspSwitch
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/util/JspXMLProcessor.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/util/JspXMLProcessor.java
deleted file mode 100644
index 2751f960b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/util/JspXMLProcessor.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.jsp.internal.util;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
-import org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage;
-
-/**
- * This class contains helper methods to serialize and deserialize XML documents
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class JspXMLProcessor extends XMLProcessor {
-	/**
-	 * Public constructor to instantiate the helper.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JspXMLProcessor() {
-		super((EPackage.Registry.INSTANCE));
-		JspPackage.eINSTANCE.eClass();
-	}
-	
-	/**
-	 * Register for "*" and "xml" file extensions the JspResourceFactoryImpl factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Map getRegistrations() {
-		if (registrations == null) {
-			super.getRegistrations();
-			registrations.put(XML_EXTENSION, new JspResourceFactoryImpl());
-			registrations.put(STAR_EXTENSION, new JspResourceFactoryImpl());
-		}
-		return registrations;
-	}
-
-} //JspXMLProcessor
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/AuthConstraint.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/AuthConstraint.java
deleted file mode 100644
index 600510b60..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/AuthConstraint.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.web;
-
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Auth Constraint</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	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.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.web.AuthConstraint#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.AuthConstraint#getRoleNames <em>Role Names</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.AuthConstraint#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getAuthConstraint()
- * @extends JavaEEObject
- * @generated
- */
-public interface AuthConstraint extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getAuthConstraint_Descriptions()
-	 * @generated
-	 */
-	List getDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>Role Names</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Role Names</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Role Names</em>' attribute list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getAuthConstraint_RoleNames()
-	 * @generated
-	 */
-	List getRoleNames();
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getAuthConstraint_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.AuthConstraint#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // AuthConstraint
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/DispatcherType.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/DispatcherType.java
deleted file mode 100644
index c13935603..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/DispatcherType.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.web;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Dispatcher Type</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * 
- * 
- * 	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.
- * 
- *       
- * <!-- end-model-doc -->
- * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getDispatcherType()
- * @generated
- */
-public final class DispatcherType extends AbstractEnumerator {
-	/**
-	 * The '<em><b>FORWARD</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>FORWARD</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #FORWARD_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int FORWARD = 0;
-
-	/**
-	 * The '<em><b>INCLUDE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>INCLUDE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #INCLUDE_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int INCLUDE = 1;
-
-	/**
-	 * The '<em><b>REQUEST</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>REQUEST</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #REQUEST_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int REQUEST = 2;
-
-	/**
-	 * The '<em><b>ERROR</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>ERROR</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #ERROR_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ERROR = 3;
-
-	/**
-	 * The '<em><b>FORWARD</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #FORWARD
-	 * @generated
-	 * @ordered
-	 */
-	public static final DispatcherType FORWARD_LITERAL = new DispatcherType(FORWARD, "FORWARD", "FORWARD"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>INCLUDE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #INCLUDE
-	 * @generated
-	 * @ordered
-	 */
-	public static final DispatcherType INCLUDE_LITERAL = new DispatcherType(INCLUDE, "INCLUDE", "INCLUDE"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>REQUEST</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #REQUEST
-	 * @generated
-	 * @ordered
-	 */
-	public static final DispatcherType REQUEST_LITERAL = new DispatcherType(REQUEST, "REQUEST", "REQUEST"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>ERROR</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #ERROR
-	 * @generated
-	 * @ordered
-	 */
-	public static final DispatcherType ERROR_LITERAL = new DispatcherType(ERROR, "ERROR", "ERROR"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * An array of all the '<em><b>Dispatcher Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final DispatcherType[] VALUES_ARRAY =
-		new DispatcherType[] {
-			FORWARD_LITERAL,
-			INCLUDE_LITERAL,
-			REQUEST_LITERAL,
-			ERROR_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Dispatcher Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Dispatcher Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static DispatcherType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			DispatcherType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Dispatcher Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static DispatcherType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			DispatcherType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Dispatcher Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static DispatcherType get(int value) {
-		switch (value) {
-			case FORWARD: return FORWARD_LITERAL;
-			case INCLUDE: return INCLUDE_LITERAL;
-			case REQUEST: return REQUEST_LITERAL;
-			case ERROR: return ERROR_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private DispatcherType(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //DispatcherType
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/ErrorPage.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/ErrorPage.java
deleted file mode 100644
index 10a4dc557..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/ErrorPage.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.web;
-
-import java.math.BigInteger;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Error Page</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	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
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.web.ErrorPage#getErrorCode <em>Error Code</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.ErrorPage#getExceptionType <em>Exception Type</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.ErrorPage#getLocation <em>Location</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.ErrorPage#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getErrorPage()
- * @extends JavaEEObject
- * @generated
- */
-public interface ErrorPage extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Error Code</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Error Code</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Error Code</em>' attribute.
-	 * @see #setErrorCode(BigInteger)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getErrorPage_ErrorCode()
-	 * @generated
-	 */
-	BigInteger getErrorCode();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.ErrorPage#getErrorCode <em>Error Code</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Error Code</em>' attribute.
-	 * @see #getErrorCode()
-	 * @generated
-	 */
-	void setErrorCode(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Exception Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	      The exception-type contains a fully qualified class
-	 * 	      name of a Java exception type.
-	 * 
-	 * 	    
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Exception Type</em>' attribute.
-	 * @see #setExceptionType(String)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getErrorPage_ExceptionType()
-	 * @generated
-	 */
-	String getExceptionType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.ErrorPage#getExceptionType <em>Exception Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Exception Type</em>' attribute.
-	 * @see #getExceptionType()
-	 * @generated
-	 */
-	void setExceptionType(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Location</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    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 `/'.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Location</em>' attribute.
-	 * @see #setLocation(String)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getErrorPage_Location()
-	 * @generated
-	 */
-	String getLocation();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.ErrorPage#getLocation <em>Location</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Location</em>' attribute.
-	 * @see #getLocation()
-	 * @generated
-	 */
-	void setLocation(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getErrorPage_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.ErrorPage#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // ErrorPage
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/Filter.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/Filter.java
deleted file mode 100644
index c4103f388..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/Filter.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.web;
-
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Filter</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	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
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.web.Filter#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.Filter#getDisplayNames <em>Display Names</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.Filter#getIcons <em>Icons</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.Filter#getFilterName <em>Filter Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.Filter#getFilterClass <em>Filter Class</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.Filter#getInitParams <em>Init Params</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.Filter#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getFilter()
- * @extends JavaEEObject
- * @generated
- */
-public interface Filter extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getFilter_Descriptions()
-	 * @generated
-	 */
-	List getDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>Display Names</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.DisplayName}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Names</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Names</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getFilter_DisplayNames()
-	 * @generated
-	 */
-	List getDisplayNames();
-
-	/**
-	 * Returns the value of the '<em><b>Icons</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Icon}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Icons</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Icons</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getFilter_Icons()
-	 * @generated
-	 */
-	List getIcons();
-
-	/**
-	 * Returns the value of the '<em><b>Filter Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Filter Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Filter Name</em>' attribute.
-	 * @see #setFilterName(String)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getFilter_FilterName()
-	 * @generated
-	 */
-	String getFilterName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.Filter#getFilterName <em>Filter Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Filter Name</em>' attribute.
-	 * @see #getFilterName()
-	 * @generated
-	 */
-	void setFilterName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Filter Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The fully qualified classname of the filter.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Filter Class</em>' attribute.
-	 * @see #setFilterClass(String)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getFilter_FilterClass()
-	 * @generated
-	 */
-	String getFilterClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.Filter#getFilterClass <em>Filter Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Filter Class</em>' attribute.
-	 * @see #getFilterClass()
-	 * @generated
-	 */
-	void setFilterClass(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Init Params</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.ParamValue}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The init-param element contains a name/value pair as
-	 * 	    an initialization param of a servlet filter
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Init Params</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getFilter_InitParams()
-	 * @generated
-	 */
-	List getInitParams();
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getFilter_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.Filter#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // Filter
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/FilterMapping.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/FilterMapping.java
deleted file mode 100644
index 21ef4bf2a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/FilterMapping.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.web;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Filter Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	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.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.web.FilterMapping#getFilterName <em>Filter Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.FilterMapping#getGroup <em>Group</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.FilterMapping#getUrlPatterns <em>Url Patterns</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.FilterMapping#getServletNames <em>Servlet Names</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.FilterMapping#getDispatchers <em>Dispatchers</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.FilterMapping#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getFilterMapping()
- * @extends JavaEEObject
- * @generated
- */
-public interface FilterMapping extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Filter Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Filter Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Filter Name</em>' attribute.
-	 * @see #setFilterName(String)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getFilterMapping_FilterName()
-	 * @generated
-	 */
-	String getFilterName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.FilterMapping#getFilterName <em>Filter Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Filter Name</em>' attribute.
-	 * @see #getFilterName()
-	 * @generated
-	 */
-	void setFilterName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Group</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Group</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Group</em>' attribute list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getFilterMapping_Group()
-	 * @generated
-	 */
-	FeatureMap getGroup();
-
-	/**
-	 * Returns the value of the '<em><b>Url Patterns</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.UrlPatternType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Url Patterns</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Url Patterns</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getFilterMapping_UrlPatterns()
-	 * @generated
-	 */
-	List getUrlPatterns();
-
-	/**
-	 * Returns the value of the '<em><b>Servlet Names</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Servlet Names</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Servlet Names</em>' attribute list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getFilterMapping_ServletNames()
-	 * @generated
-	 */
-	List getServletNames();
-
-	/**
-	 * Returns the value of the '<em><b>Dispatchers</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.web.DispatcherType}.
-	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.web.DispatcherType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Dispatchers</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Dispatchers</em>' attribute list.
-	 * @see org.eclipse.jst.javaee.web.DispatcherType
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getFilterMapping_Dispatchers()
-	 * @generated
-	 */
-	List getDispatchers();
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getFilterMapping_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.FilterMapping#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // FilterMapping
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/FormLoginConfig.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/FormLoginConfig.java
deleted file mode 100644
index 1356fc6a3..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/FormLoginConfig.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.web;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Form Login Config</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	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
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.web.FormLoginConfig#getFormLoginPage <em>Form Login Page</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.FormLoginConfig#getFormErrorPage <em>Form Error Page</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.FormLoginConfig#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getFormLoginConfig()
- * @extends JavaEEObject
- * @generated
- */
-public interface FormLoginConfig extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Form Login Page</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    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.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Form Login Page</em>' attribute.
-	 * @see #setFormLoginPage(String)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getFormLoginConfig_FormLoginPage()
-	 * @generated
-	 */
-	String getFormLoginPage();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.FormLoginConfig#getFormLoginPage <em>Form Login Page</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Form Login Page</em>' attribute.
-	 * @see #getFormLoginPage()
-	 * @generated
-	 */
-	void setFormLoginPage(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Form Error Page</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    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.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Form Error Page</em>' attribute.
-	 * @see #setFormErrorPage(String)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getFormLoginConfig_FormErrorPage()
-	 * @generated
-	 */
-	String getFormErrorPage();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.FormLoginConfig#getFormErrorPage <em>Form Error Page</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Form Error Page</em>' attribute.
-	 * @see #getFormErrorPage()
-	 * @generated
-	 */
-	void setFormErrorPage(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getFormLoginConfig_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.FormLoginConfig#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // FormLoginConfig
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/IWebResource.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/IWebResource.java
deleted file mode 100644
index 6013d440e..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/IWebResource.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.eclipse.jst.javaee.web;
-
-import org.eclipse.emf.ecore.EObject;
-
-public interface IWebResource {
-
-	/**
-	 * Return the first element in the EList.
-	 */
-	public abstract EObject getRootObject();
-
-	/**
-	 * Return the war
-	 */
-	public abstract WebApp getWebApp();
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/LocaleEncodingMapping.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/LocaleEncodingMapping.java
deleted file mode 100644
index 224b32fda..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/LocaleEncodingMapping.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.web;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Locale Encoding Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	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.
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.web.LocaleEncodingMapping#getLocale <em>Locale</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.LocaleEncodingMapping#getEncoding <em>Encoding</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.LocaleEncodingMapping#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getLocaleEncodingMapping()
- * @extends JavaEEObject
- * @generated
- */
-public interface LocaleEncodingMapping extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Locale</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Locale</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Locale</em>' attribute.
-	 * @see #setLocale(String)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getLocaleEncodingMapping_Locale()
-	 * @generated
-	 */
-	String getLocale();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.LocaleEncodingMapping#getLocale <em>Locale</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Locale</em>' attribute.
-	 * @see #getLocale()
-	 * @generated
-	 */
-	void setLocale(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Encoding</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Encoding</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Encoding</em>' attribute.
-	 * @see #setEncoding(String)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getLocaleEncodingMapping_Encoding()
-	 * @generated
-	 */
-	String getEncoding();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.LocaleEncodingMapping#getEncoding <em>Encoding</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Encoding</em>' attribute.
-	 * @see #getEncoding()
-	 * @generated
-	 */
-	void setEncoding(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getLocaleEncodingMapping_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.LocaleEncodingMapping#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // LocaleEncodingMapping
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/LocaleEncodingMappingList.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/LocaleEncodingMappingList.java
deleted file mode 100644
index f5724ee87..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/LocaleEncodingMappingList.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.web;
-
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Locale Encoding Mapping List</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The locale-encoding-mapping-list contains one or more
- * 	locale-encoding-mapping(s).
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.web.LocaleEncodingMappingList#getLocalEncodingMappings <em>Local Encoding Mappings</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.LocaleEncodingMappingList#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getLocaleEncodingMappingList()
- * @extends JavaEEObject
- * @generated
- */
-public interface LocaleEncodingMappingList extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Local Encoding Mappings</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.web.LocaleEncodingMapping}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Local Encoding Mappings</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Local Encoding Mappings</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getLocaleEncodingMappingList_LocalEncodingMappings()
-	 * @generated
-	 */
-	List getLocalEncodingMappings();
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getLocaleEncodingMappingList_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.LocaleEncodingMappingList#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // LocaleEncodingMappingList
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/LoginConfig.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/LoginConfig.java
deleted file mode 100644
index cc9a8ba57..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/LoginConfig.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.web;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Login Config</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	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
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.web.LoginConfig#getAuthMethod <em>Auth Method</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.LoginConfig#getRealmName <em>Realm Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.LoginConfig#getFormLoginConfig <em>Form Login Config</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.LoginConfig#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getLoginConfig()
- * @extends JavaEEObject
- * @generated
- */
-public interface LoginConfig extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Auth Method</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Auth Method</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Auth Method</em>' attribute.
-	 * @see #setAuthMethod(String)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getLoginConfig_AuthMethod()
-	 * @generated
-	 */
-	String getAuthMethod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.LoginConfig#getAuthMethod <em>Auth Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Auth Method</em>' attribute.
-	 * @see #getAuthMethod()
-	 * @generated
-	 */
-	void setAuthMethod(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Realm Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The realm name element specifies the realm name to
-	 * 	    use in HTTP Basic authorization.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Realm Name</em>' attribute.
-	 * @see #setRealmName(String)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getLoginConfig_RealmName()
-	 * @generated
-	 */
-	String getRealmName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.LoginConfig#getRealmName <em>Realm Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Realm Name</em>' attribute.
-	 * @see #getRealmName()
-	 * @generated
-	 */
-	void setRealmName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Form Login Config</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Form Login Config</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Form Login Config</em>' containment reference.
-	 * @see #setFormLoginConfig(FormLoginConfig)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getLoginConfig_FormLoginConfig()
-	 * @generated
-	 */
-	FormLoginConfig getFormLoginConfig();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.LoginConfig#getFormLoginConfig <em>Form Login Config</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Form Login Config</em>' containment reference.
-	 * @see #getFormLoginConfig()
-	 * @generated
-	 */
-	void setFormLoginConfig(FormLoginConfig value);
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getLoginConfig_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.LoginConfig#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // LoginConfig
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/MimeMapping.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/MimeMapping.java
deleted file mode 100644
index 404bc57b2..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/MimeMapping.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.web;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Mime Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The mime-mappingType defines a mapping between an extension
- * 	and a mime type.
- * 
- * 	Used in: web-app
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.web.MimeMapping#getExtension <em>Extension</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.MimeMapping#getMimeType <em>Mime Type</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.MimeMapping#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getMimeMapping()
- * @extends JavaEEObject
- * @generated
- */
-public interface MimeMapping extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Extension</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Extension</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Extension</em>' attribute.
-	 * @see #setExtension(String)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getMimeMapping_Extension()
-	 * @generated
-	 */
-	String getExtension();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.MimeMapping#getExtension <em>Extension</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Extension</em>' attribute.
-	 * @see #getExtension()
-	 * @generated
-	 */
-	void setExtension(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Mime Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Mime Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Mime Type</em>' attribute.
-	 * @see #setMimeType(String)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getMimeMapping_MimeType()
-	 * @generated
-	 */
-	String getMimeType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.MimeMapping#getMimeType <em>Mime Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Mime Type</em>' attribute.
-	 * @see #getMimeType()
-	 * @generated
-	 */
-	void setMimeType(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getMimeMapping_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.MimeMapping#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // MimeMapping
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/NullCharType.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/NullCharType.java
deleted file mode 100644
index 496987a24..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/NullCharType.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.web;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Null Char Type</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getNullCharType()
- * @generated
- */
-public final class NullCharType extends AbstractEnumerator {
-	/**
-	 * The '<em><b></b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b></b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #__LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int _ = 0;
-
-	/**
-	 * The '<em><b></b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #_
-	 * @generated
-	 * @ordered
-	 */
-	public static final NullCharType __LITERAL = new NullCharType(_, "_", ""); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * An array of all the '<em><b>Null Char Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final NullCharType[] VALUES_ARRAY =
-		new NullCharType[] {
-			__LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Null Char Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Null Char Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static NullCharType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			NullCharType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Null Char Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static NullCharType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			NullCharType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Null Char Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static NullCharType get(int value) {
-		switch (value) {
-			case _: return __LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private NullCharType(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //NullCharType
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/SecurityConstraint.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/SecurityConstraint.java
deleted file mode 100644
index b43b1051c..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/SecurityConstraint.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.web;
-
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Security Constraint</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The security-constraintType is used to associate
- * 	security constraints with one or more web resource
- * 	collections
- * 
- * 	Used in: web-app
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.web.SecurityConstraint#getDisplayNames <em>Display Names</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.SecurityConstraint#getWebResourceCollections <em>Web Resource Collections</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.SecurityConstraint#getAuthConstraint <em>Auth Constraint</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.SecurityConstraint#getUserDataConstraint <em>User Data Constraint</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.SecurityConstraint#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getSecurityConstraint()
- * @extends JavaEEObject
- * @generated
- */
-public interface SecurityConstraint extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Display Names</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.DisplayName}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Names</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Names</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getSecurityConstraint_DisplayNames()
-	 * @generated
-	 */
-	List getDisplayNames();
-
-	/**
-	 * Returns the value of the '<em><b>Web Resource Collections</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.web.WebResourceCollection}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Web Resource Collections</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Web Resource Collections</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getSecurityConstraint_WebResourceCollections()
-	 * @generated
-	 */
-	List getWebResourceCollections();
-
-	/**
-	 * Returns the value of the '<em><b>Auth Constraint</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Auth Constraint</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Auth Constraint</em>' containment reference.
-	 * @see #setAuthConstraint(AuthConstraint)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getSecurityConstraint_AuthConstraint()
-	 * @generated
-	 */
-	AuthConstraint getAuthConstraint();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.SecurityConstraint#getAuthConstraint <em>Auth Constraint</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Auth Constraint</em>' containment reference.
-	 * @see #getAuthConstraint()
-	 * @generated
-	 */
-	void setAuthConstraint(AuthConstraint value);
-
-	/**
-	 * Returns the value of the '<em><b>User Data Constraint</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>User Data Constraint</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>User Data Constraint</em>' containment reference.
-	 * @see #setUserDataConstraint(UserDataConstraint)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getSecurityConstraint_UserDataConstraint()
-	 * @generated
-	 */
-	UserDataConstraint getUserDataConstraint();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.SecurityConstraint#getUserDataConstraint <em>User Data Constraint</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>User Data Constraint</em>' containment reference.
-	 * @see #getUserDataConstraint()
-	 * @generated
-	 */
-	void setUserDataConstraint(UserDataConstraint value);
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getSecurityConstraint_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.SecurityConstraint#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // SecurityConstraint
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/Servlet.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/Servlet.java
deleted file mode 100644
index d3353e9d3..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/Servlet.java
+++ /dev/null
@@ -1,306 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.web;
-
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.javaee.core.RunAs;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Servlet</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	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
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.web.Servlet#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.Servlet#getDisplayNames <em>Display Names</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.Servlet#getIcons <em>Icons</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.Servlet#getServletName <em>Servlet Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.Servlet#getServletClass <em>Servlet Class</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.Servlet#getJspFile <em>Jsp File</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.Servlet#getInitParams <em>Init Params</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.Servlet#getLoadOnStartup <em>Load On Startup</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.Servlet#getRunAs <em>Run As</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.Servlet#getSecurityRoleRefs <em>Security Role Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.Servlet#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getServlet()
- * @extends JavaEEObject
- * @generated
- */
-public interface Servlet extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getServlet_Descriptions()
-	 * @generated
-	 */
-	List getDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>Display Names</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.DisplayName}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Names</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Names</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getServlet_DisplayNames()
-	 * @generated
-	 */
-	List getDisplayNames();
-
-	/**
-	 * Returns the value of the '<em><b>Icons</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Icon}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Icons</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Icons</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getServlet_Icons()
-	 * @generated
-	 */
-	List getIcons();
-
-	/**
-	 * Returns the value of the '<em><b>Servlet Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Servlet Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Servlet Name</em>' attribute.
-	 * @see #setServletName(String)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getServlet_ServletName()
-	 * @generated
-	 */
-	String getServletName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.Servlet#getServletName <em>Servlet Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Servlet Name</em>' attribute.
-	 * @see #getServletName()
-	 * @generated
-	 */
-	void setServletName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Servlet Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	      The servlet-class element contains the fully
-	 * 	      qualified class name of the servlet.
-	 * 
-	 * 	    
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Servlet Class</em>' attribute.
-	 * @see #setServletClass(String)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getServlet_ServletClass()
-	 * @generated
-	 */
-	String getServletClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.Servlet#getServletClass <em>Servlet Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Servlet Class</em>' attribute.
-	 * @see #getServletClass()
-	 * @generated
-	 */
-	void setServletClass(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Jsp File</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Jsp File</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Jsp File</em>' attribute.
-	 * @see #setJspFile(String)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getServlet_JspFile()
-	 * @generated
-	 */
-	String getJspFile();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.Servlet#getJspFile <em>Jsp File</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Jsp File</em>' attribute.
-	 * @see #getJspFile()
-	 * @generated
-	 */
-	void setJspFile(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Init Params</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.ParamValue}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Init Params</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Init Params</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getServlet_InitParams()
-	 * @generated
-	 */
-	List getInitParams();
-
-	/**
-	 * Returns the value of the '<em><b>Load On Startup</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    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.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Load On Startup</em>' attribute.
-	 * @see #setLoadOnStartup(Object)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getServlet_LoadOnStartup()
-	 * @generated
-	 */
-	Object getLoadOnStartup();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.Servlet#getLoadOnStartup <em>Load On Startup</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Load On Startup</em>' attribute.
-	 * @see #getLoadOnStartup()
-	 * @generated
-	 */
-	void setLoadOnStartup(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Run As</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Run As</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Run As</em>' containment reference.
-	 * @see #setRunAs(RunAs)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getServlet_RunAs()
-	 * @generated
-	 */
-	RunAs getRunAs();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.Servlet#getRunAs <em>Run As</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Run As</em>' containment reference.
-	 * @see #getRunAs()
-	 * @generated
-	 */
-	void setRunAs(RunAs value);
-
-	/**
-	 * Returns the value of the '<em><b>Security Role Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.SecurityRoleRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Security Role Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Security Role Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getServlet_SecurityRoleRefs()
-	 * @generated
-	 */
-	List getSecurityRoleRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getServlet_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.Servlet#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // Servlet
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/ServletMapping.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/ServletMapping.java
deleted file mode 100644
index 32bc6ab95..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/ServletMapping.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.web;
-
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Servlet Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The servlet-mappingType defines a mapping between a
- * 	servlet and a url pattern.
- * 
- * 	Used in: web-app
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.web.ServletMapping#getServletName <em>Servlet Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.ServletMapping#getUrlPatterns <em>Url Patterns</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.ServletMapping#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getServletMapping()
- * @extends JavaEEObject
- * @generated
- */
-public interface ServletMapping extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Servlet Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Servlet Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Servlet Name</em>' attribute.
-	 * @see #setServletName(String)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getServletMapping_ServletName()
-	 * @generated
-	 */
-	String getServletName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.ServletMapping#getServletName <em>Servlet Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Servlet Name</em>' attribute.
-	 * @see #getServletName()
-	 * @generated
-	 */
-	void setServletName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Url Patterns</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.UrlPatternType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Url Patterns</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Url Patterns</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getServletMapping_UrlPatterns()
-	 * @generated
-	 */
-	List getUrlPatterns();
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getServletMapping_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.ServletMapping#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // ServletMapping
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/SessionConfig.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/SessionConfig.java
deleted file mode 100644
index 5a40b174b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/SessionConfig.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.web;
-
-import java.math.BigInteger;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Session Config</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The session-configType defines the session parameters
- * 	for this web application.
- * 
- * 	Used in: web-app
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.web.SessionConfig#getSessionTimeout <em>Session Timeout</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.SessionConfig#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getSessionConfig()
- * @extends JavaEEObject
- * @generated
- */
-public interface SessionConfig extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Session Timeout</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    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.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Session Timeout</em>' attribute.
-	 * @see #setSessionTimeout(BigInteger)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getSessionConfig_SessionTimeout()
-	 * @generated
-	 */
-	BigInteger getSessionTimeout();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.SessionConfig#getSessionTimeout <em>Session Timeout</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Session Timeout</em>' attribute.
-	 * @see #getSessionTimeout()
-	 * @generated
-	 */
-	void setSessionTimeout(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getSessionConfig_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.SessionConfig#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // SessionConfig
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/TransportGuaranteeType.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/TransportGuaranteeType.java
deleted file mode 100644
index 632172073..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/TransportGuaranteeType.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.web;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Transport Guarantee Type</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * 
- * 
- * 	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
- * 
- *       
- * <!-- end-model-doc -->
- * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getTransportGuaranteeType()
- * @generated
- */
-public final class TransportGuaranteeType extends AbstractEnumerator {
-	/**
-	 * The '<em><b>NONE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>NONE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #NONE_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int NONE = 0;
-
-	/**
-	 * The '<em><b>INTEGRAL</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>INTEGRAL</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #INTEGRAL_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int INTEGRAL = 1;
-
-	/**
-	 * The '<em><b>CONFIDENTIAL</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>CONFIDENTIAL</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #CONFIDENTIAL_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CONFIDENTIAL = 2;
-
-	/**
-	 * The '<em><b>NONE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #NONE
-	 * @generated
-	 * @ordered
-	 */
-	public static final TransportGuaranteeType NONE_LITERAL = new TransportGuaranteeType(NONE, "NONE", "NONE"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>INTEGRAL</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #INTEGRAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final TransportGuaranteeType INTEGRAL_LITERAL = new TransportGuaranteeType(INTEGRAL, "INTEGRAL", "INTEGRAL"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>CONFIDENTIAL</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @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 '<em><b>Transport Guarantee Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final TransportGuaranteeType[] VALUES_ARRAY =
-		new TransportGuaranteeType[] {
-			NONE_LITERAL,
-			INTEGRAL_LITERAL,
-			CONFIDENTIAL_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Transport Guarantee Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Transport Guarantee Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static TransportGuaranteeType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			TransportGuaranteeType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Transport Guarantee Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static TransportGuaranteeType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			TransportGuaranteeType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Transport Guarantee Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static TransportGuaranteeType get(int value) {
-		switch (value) {
-			case NONE: return NONE_LITERAL;
-			case INTEGRAL: return INTEGRAL_LITERAL;
-			case CONFIDENTIAL: return CONFIDENTIAL_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private TransportGuaranteeType(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //TransportGuaranteeType
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/UserDataConstraint.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/UserDataConstraint.java
deleted file mode 100644
index 7dd346e58..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/UserDataConstraint.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.web;
-
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>User Data Constraint</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The user-data-constraintType is used to indicate how
- * 	data communicated between the client and container should be
- * 	protected.
- * 
- * 	Used in: security-constraint
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.web.UserDataConstraint#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.UserDataConstraint#getTransportGuarantee <em>Transport Guarantee</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.UserDataConstraint#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getUserDataConstraint()
- * @extends JavaEEObject
- * @generated
- */
-public interface UserDataConstraint extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getUserDataConstraint_Descriptions()
-	 * @generated
-	 */
-	List getDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>Transport Guarantee</b></em>' attribute.
-	 * The default value is <code>"NONE"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.web.TransportGuaranteeType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Transport Guarantee</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Transport Guarantee</em>' attribute.
-	 * @see org.eclipse.jst.javaee.web.TransportGuaranteeType
-	 * @see #isSetTransportGuarantee()
-	 * @see #unsetTransportGuarantee()
-	 * @see #setTransportGuarantee(TransportGuaranteeType)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getUserDataConstraint_TransportGuarantee()
-	 * @generated
-	 */
-	TransportGuaranteeType getTransportGuarantee();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.UserDataConstraint#getTransportGuarantee <em>Transport Guarantee</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Transport Guarantee</em>' attribute.
-	 * @see org.eclipse.jst.javaee.web.TransportGuaranteeType
-	 * @see #isSetTransportGuarantee()
-	 * @see #unsetTransportGuarantee()
-	 * @see #getTransportGuarantee()
-	 * @generated
-	 */
-	void setTransportGuarantee(TransportGuaranteeType value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.javaee.web.UserDataConstraint#getTransportGuarantee <em>Transport Guarantee</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetTransportGuarantee()
-	 * @see #getTransportGuarantee()
-	 * @see #setTransportGuarantee(TransportGuaranteeType)
-	 * @generated
-	 */
-	void unsetTransportGuarantee();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.web.UserDataConstraint#getTransportGuarantee <em>Transport Guarantee</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Transport Guarantee</em>' attribute is set.
-	 * @see #unsetTransportGuarantee()
-	 * @see #getTransportGuarantee()
-	 * @see #setTransportGuarantee(TransportGuaranteeType)
-	 * @generated
-	 */
-	boolean isSetTransportGuarantee();
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getUserDataConstraint_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.UserDataConstraint#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // UserDataConstraint
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/WebApp.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/WebApp.java
deleted file mode 100644
index 4d48d71e0..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/WebApp.java
+++ /dev/null
@@ -1,707 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.web;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>App</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getGroup <em>Group</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getDisplayNames <em>Display Names</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getIcons <em>Icons</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getDistributables <em>Distributables</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getContextParams <em>Context Params</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getFilters <em>Filters</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getFilterMappings <em>Filter Mappings</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getListeners <em>Listeners</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getServlets <em>Servlets</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getServletMappings <em>Servlet Mappings</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getSessionConfigs <em>Session Configs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getMimeMappings <em>Mime Mappings</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getWelcomeFileLists <em>Welcome File Lists</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getErrorPages <em>Error Pages</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getJspConfigs <em>Jsp Configs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getSecurityConstraints <em>Security Constraints</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getLoginConfigs <em>Login Configs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getSecurityRoles <em>Security Roles</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getEnvEntries <em>Env Entries</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getEjbRefs <em>Ejb Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getEjbLocalRefs <em>Ejb Local Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getServiceRefs <em>Service Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getResourceRefs <em>Resource Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getResourceEnvRefs <em>Resource Env Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getMessageDestinationRefs <em>Message Destination Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getPersistenceContextRefs <em>Persistence Context Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getPersistenceUnitRefs <em>Persistence Unit Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getPostConstructs <em>Post Constructs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getPreDestroys <em>Pre Destroys</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getMessageDestinations <em>Message Destinations</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getLocalEncodingMappingsLists <em>Local Encoding Mappings Lists</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.WebApp#isMetadataComplete <em>Metadata Complete</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getVersion <em>Version</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp()
- * @extends JavaEEObject
- * @generated
- */
-public interface WebApp extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Group</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Group</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Group</em>' attribute list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_Group()
-	 * @generated
-	 */
-	FeatureMap getGroup();
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_Descriptions()
-	 * @generated
-	 */
-	List getDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>Display Names</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.DisplayName}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Names</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Names</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_DisplayNames()
-	 * @generated
-	 */
-	List getDisplayNames();
-
-	/**
-	 * Returns the value of the '<em><b>Icons</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Icon}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Icons</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Icons</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_Icons()
-	 * @generated
-	 */
-	List getIcons();
-
-	/**
-	 * Returns the value of the '<em><b>Distributables</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.EmptyType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Distributables</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Distributables</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_Distributables()
-	 * @generated
-	 */
-	List getDistributables();
-
-	/**
-	 * Returns the value of the '<em><b>Context Params</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.ParamValue}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The context-param element contains the declaration
-	 * 	    of a web application's servlet context
-	 * 	    initialization parameters.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Context Params</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_ContextParams()
-	 * @generated
-	 */
-	List getContextParams();
-
-	/**
-	 * Returns the value of the '<em><b>Filters</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.web.Filter}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Filters</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Filters</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_Filters()
-	 * @generated
-	 */
-	List getFilters();
-
-	/**
-	 * Returns the value of the '<em><b>Filter Mappings</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.web.FilterMapping}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Filter Mappings</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Filter Mappings</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_FilterMappings()
-	 * @generated
-	 */
-	List getFilterMappings();
-
-	/**
-	 * Returns the value of the '<em><b>Listeners</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Listener}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Listeners</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Listeners</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_Listeners()
-	 * @generated
-	 */
-	List getListeners();
-
-	/**
-	 * Returns the value of the '<em><b>Servlets</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.web.Servlet}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Servlets</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Servlets</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_Servlets()
-	 * @generated
-	 */
-	List getServlets();
-
-	/**
-	 * Returns the value of the '<em><b>Servlet Mappings</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.web.ServletMapping}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Servlet Mappings</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Servlet Mappings</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_ServletMappings()
-	 * @generated
-	 */
-	List getServletMappings();
-
-	/**
-	 * Returns the value of the '<em><b>Session Configs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.web.SessionConfig}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Session Configs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Session Configs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_SessionConfigs()
-	 * @generated
-	 */
-	List getSessionConfigs();
-
-	/**
-	 * Returns the value of the '<em><b>Mime Mappings</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.web.MimeMapping}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Mime Mappings</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Mime Mappings</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_MimeMappings()
-	 * @generated
-	 */
-	List getMimeMappings();
-
-	/**
-	 * Returns the value of the '<em><b>Welcome File Lists</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.web.WelcomeFileList}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Welcome File Lists</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Welcome File Lists</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_WelcomeFileLists()
-	 * @generated
-	 */
-	List getWelcomeFileLists();
-
-	/**
-	 * Returns the value of the '<em><b>Error Pages</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.web.ErrorPage}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Error Pages</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Error Pages</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_ErrorPages()
-	 * @generated
-	 */
-	List getErrorPages();
-
-	/**
-	 * Returns the value of the '<em><b>Jsp Configs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.jsp.JspConfig}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Jsp Configs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Jsp Configs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_JspConfigs()
-	 * @generated
-	 */
-	List getJspConfigs();
-
-	/**
-	 * Returns the value of the '<em><b>Security Constraints</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.web.SecurityConstraint}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Security Constraints</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Security Constraints</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_SecurityConstraints()
-	 * @generated
-	 */
-	List getSecurityConstraints();
-
-	/**
-	 * Returns the value of the '<em><b>Login Configs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.web.LoginConfig}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Login Configs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Login Configs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_LoginConfigs()
-	 * @generated
-	 */
-	List getLoginConfigs();
-
-	/**
-	 * Returns the value of the '<em><b>Security Roles</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.SecurityRole}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Security Roles</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Security Roles</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_SecurityRoles()
-	 * @generated
-	 */
-	List getSecurityRoles();
-
-	/**
-	 * Returns the value of the '<em><b>Env Entries</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.EnvEntry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Env Entries</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Env Entries</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_EnvEntries()
-	 * @generated
-	 */
-	List getEnvEntries();
-
-	/**
-	 * Returns the value of the '<em><b>Ejb Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.EjbRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ejb Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ejb Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_EjbRefs()
-	 * @generated
-	 */
-	List getEjbRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Ejb Local Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.EjbLocalRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ejb Local Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ejb Local Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_EjbLocalRefs()
-	 * @generated
-	 */
-	List getEjbLocalRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Service Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.ServiceRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Service Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Service Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_ServiceRefs()
-	 * @generated
-	 */
-	List getServiceRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Resource Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.ResourceRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Resource Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Resource Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_ResourceRefs()
-	 * @generated
-	 */
-	List getResourceRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Resource Env Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.ResourceEnvRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Resource Env Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Resource Env Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_ResourceEnvRefs()
-	 * @generated
-	 */
-	List getResourceEnvRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Message Destination Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.MessageDestinationRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Message Destination Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Message Destination Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_MessageDestinationRefs()
-	 * @generated
-	 */
-	List getMessageDestinationRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Persistence Context Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.PersistenceContextRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Persistence Context Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Persistence Context Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_PersistenceContextRefs()
-	 * @generated
-	 */
-	List getPersistenceContextRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Persistence Unit Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.PersistenceUnitRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Persistence Unit Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Persistence Unit Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_PersistenceUnitRefs()
-	 * @generated
-	 */
-	List getPersistenceUnitRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Post Constructs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.LifecycleCallback}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Post Constructs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Post Constructs</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_PostConstructs()
-	 * @generated
-	 */
-	List getPostConstructs();
-
-	/**
-	 * Returns the value of the '<em><b>Pre Destroys</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.LifecycleCallback}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Pre Destroys</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Pre Destroys</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_PreDestroys()
-	 * @generated
-	 */
-	List getPreDestroys();
-
-	/**
-	 * Returns the value of the '<em><b>Message Destinations</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.MessageDestination}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Message Destinations</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Message Destinations</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_MessageDestinations()
-	 * @generated
-	 */
-	List getMessageDestinations();
-
-	/**
-	 * Returns the value of the '<em><b>Local Encoding Mappings Lists</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.web.LocaleEncodingMappingList}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Local Encoding Mappings Lists</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Local Encoding Mappings Lists</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_LocalEncodingMappingsLists()
-	 * @generated
-	 */
-	List getLocalEncodingMappingsLists();
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.WebApp#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Metadata Complete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	  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.
-	 * 
-	 * 	
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Metadata Complete</em>' attribute.
-	 * @see #isSetMetadataComplete()
-	 * @see #unsetMetadataComplete()
-	 * @see #setMetadataComplete(boolean)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_MetadataComplete()
-	 * @generated
-	 */
-	boolean isMetadataComplete();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.WebApp#isMetadataComplete <em>Metadata Complete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Metadata Complete</em>' attribute.
-	 * @see #isSetMetadataComplete()
-	 * @see #unsetMetadataComplete()
-	 * @see #isMetadataComplete()
-	 * @generated
-	 */
-	void setMetadataComplete(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.javaee.web.WebApp#isMetadataComplete <em>Metadata Complete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetMetadataComplete()
-	 * @see #isMetadataComplete()
-	 * @see #setMetadataComplete(boolean)
-	 * @generated
-	 */
-	void unsetMetadataComplete();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.web.WebApp#isMetadataComplete <em>Metadata Complete</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Metadata Complete</em>' attribute is set.
-	 * @see #unsetMetadataComplete()
-	 * @see #isMetadataComplete()
-	 * @see #setMetadataComplete(boolean)
-	 * @generated
-	 */
-	boolean isSetMetadataComplete();
-
-	/**
-	 * Returns the value of the '<em><b>Version</b></em>' attribute.
-	 * The default value is <code>"2.5"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.web.WebAppVersionType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Version</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Version</em>' attribute.
-	 * @see org.eclipse.jst.javaee.web.WebAppVersionType
-	 * @see #isSetVersion()
-	 * @see #unsetVersion()
-	 * @see #setVersion(WebAppVersionType)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_Version()
-	 * @generated
-	 */
-	WebAppVersionType getVersion();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.WebApp#getVersion <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Version</em>' 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.WebApp#getVersion <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetVersion()
-	 * @see #getVersion()
-	 * @see #setVersion(WebAppVersionType)
-	 * @generated
-	 */
-	void unsetVersion();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.web.WebApp#getVersion <em>Version</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Version</em>' attribute is set.
-	 * @see #unsetVersion()
-	 * @see #getVersion()
-	 * @see #setVersion(WebAppVersionType)
-	 * @generated
-	 */
-	boolean isSetVersion();
-
-} // WebApp
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/WebAppDeploymentDescriptor.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/WebAppDeploymentDescriptor.java
deleted file mode 100644
index 4c56faa65..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/WebAppDeploymentDescriptor.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.web;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>App Deployment Descriptor</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.web.WebAppDeploymentDescriptor#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.WebAppDeploymentDescriptor#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.WebAppDeploymentDescriptor#getXSISchemaLocation <em>XSI Schema Location</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.WebAppDeploymentDescriptor#getWebApp <em>Web App</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebAppDeploymentDescriptor()
- * @extends JavaEEObject
- * @generated
- */
-public interface WebAppDeploymentDescriptor extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Mixed</em>' attribute list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebAppDeploymentDescriptor_Mixed()
-	 * @generated
-	 */
-	FeatureMap getMixed();
-
-	/**
-	 * Returns the value of the '<em><b>XMLNS Prefix Map</b></em>' map.
-	 * The key is of type {@link java.lang.String},
-	 * and the value is of type {@link java.lang.String},
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>XMLNS Prefix Map</em>' map isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>XMLNS Prefix Map</em>' map.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebAppDeploymentDescriptor_XMLNSPrefixMap()
-	 * @generated
-	 */
-	Map getXMLNSPrefixMap();
-
-	/**
-	 * Returns the value of the '<em><b>XSI Schema Location</b></em>' map.
-	 * The key is of type {@link java.lang.String},
-	 * and the value is of type {@link java.lang.String},
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>XSI Schema Location</em>' map isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>XSI Schema Location</em>' map.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebAppDeploymentDescriptor_XSISchemaLocation()
-	 * @generated
-	 */
-	Map getXSISchemaLocation();
-
-	/**
-	 * Returns the value of the '<em><b>Web App</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	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.
-	 * 
-	 *       
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Web App</em>' containment reference.
-	 * @see #setWebApp(WebApp)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebAppDeploymentDescriptor_WebApp()
-	 * @generated
-	 */
-	WebApp getWebApp();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.WebAppDeploymentDescriptor#getWebApp <em>Web App</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Web App</em>' containment reference.
-	 * @see #getWebApp()
-	 * @generated
-	 */
-	void setWebApp(WebApp value);
-
-} // WebAppDeploymentDescriptor
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/WebAppVersionType.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/WebAppVersionType.java
deleted file mode 100644
index 0d452c38f..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/WebAppVersionType.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.web;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>App Version Type</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * 
- * 
- * 	This type contains the recognized versions of
- * 	web-application supported. It is used to designate the
- * 	version of the web application.
- * 
- *       
- * <!-- end-model-doc -->
- * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebAppVersionType()
- * @generated
- */
-public final class WebAppVersionType extends AbstractEnumerator {
-	/**
-	 * The '<em><b>25</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>25</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #_25_LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final int _25 = 0;
-
-	/**
-	 * The '<em><b>25</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #_25
-	 * @generated
-	 * @ordered
-	 */
-	public static final WebAppVersionType _25_LITERAL = new WebAppVersionType(_25, "_25", "2.5"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * An array of all the '<em><b>App Version Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final WebAppVersionType[] VALUES_ARRAY =
-		new WebAppVersionType[] {
-			_25_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>App Version Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>App Version Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static WebAppVersionType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			WebAppVersionType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>App Version Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static WebAppVersionType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			WebAppVersionType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>App Version Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static WebAppVersionType get(int value) {
-		switch (value) {
-			case _25: return _25_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private WebAppVersionType(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //WebAppVersionType
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/WebFactory.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/WebFactory.java
deleted file mode 100644
index 86a6012dd..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/WebFactory.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.web;
-
-import org.eclipse.emf.ecore.EFactory;
-
-import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage
- * @generated
- */
-public interface WebFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	WebFactory eINSTANCE = org.eclipse.jst.javaee.web.internal.impl.WebFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Auth Constraint</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Auth Constraint</em>'.
-	 * @generated
-	 */
-	AuthConstraint createAuthConstraint();
-
-	/**
-	 * Returns a new object of class '<em>Error Page</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Error Page</em>'.
-	 * @generated
-	 */
-	ErrorPage createErrorPage();
-
-	/**
-	 * Returns a new object of class '<em>Filter</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Filter</em>'.
-	 * @generated
-	 */
-	Filter createFilter();
-
-	/**
-	 * Returns a new object of class '<em>Filter Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Filter Mapping</em>'.
-	 * @generated
-	 */
-	FilterMapping createFilterMapping();
-
-	/**
-	 * Returns a new object of class '<em>Form Login Config</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Form Login Config</em>'.
-	 * @generated
-	 */
-	FormLoginConfig createFormLoginConfig();
-
-	/**
-	 * Returns a new object of class '<em>Locale Encoding Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Locale Encoding Mapping</em>'.
-	 * @generated
-	 */
-	LocaleEncodingMapping createLocaleEncodingMapping();
-
-	/**
-	 * Returns a new object of class '<em>Locale Encoding Mapping List</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Locale Encoding Mapping List</em>'.
-	 * @generated
-	 */
-	LocaleEncodingMappingList createLocaleEncodingMappingList();
-
-	/**
-	 * Returns a new object of class '<em>Login Config</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Login Config</em>'.
-	 * @generated
-	 */
-	LoginConfig createLoginConfig();
-
-	/**
-	 * Returns a new object of class '<em>Mime Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Mime Mapping</em>'.
-	 * @generated
-	 */
-	MimeMapping createMimeMapping();
-
-	/**
-	 * Returns a new object of class '<em>Security Constraint</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Security Constraint</em>'.
-	 * @generated
-	 */
-	SecurityConstraint createSecurityConstraint();
-
-	/**
-	 * Returns a new object of class '<em>Servlet</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Servlet</em>'.
-	 * @generated
-	 */
-	Servlet createServlet();
-
-	/**
-	 * Returns a new object of class '<em>Servlet Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Servlet Mapping</em>'.
-	 * @generated
-	 */
-	ServletMapping createServletMapping();
-
-	/**
-	 * Returns a new object of class '<em>Session Config</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Session Config</em>'.
-	 * @generated
-	 */
-	SessionConfig createSessionConfig();
-
-	/**
-	 * Returns a new object of class '<em>User Data Constraint</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>User Data Constraint</em>'.
-	 * @generated
-	 */
-	UserDataConstraint createUserDataConstraint();
-
-	/**
-	 * Returns a new object of class '<em>App</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>App</em>'.
-	 * @generated
-	 */
-	WebApp createWebApp();
-
-	/**
-	 * Returns a new object of class '<em>App Deployment Descriptor</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>App Deployment Descriptor</em>'.
-	 * @generated
-	 */
-	WebAppDeploymentDescriptor createWebAppDeploymentDescriptor();
-
-	/**
-	 * Returns a new object of class '<em>Resource Collection</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Resource Collection</em>'.
-	 * @generated
-	 */
-	WebResourceCollection createWebResourceCollection();
-
-	/**
-	 * Returns a new object of class '<em>Welcome File List</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Welcome File List</em>'.
-	 * @generated
-	 */
-	WelcomeFileList createWelcomeFileList();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	WebPackage getWebPackage();
-
-} //WebFactory
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/WebResourceCollection.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/WebResourceCollection.java
deleted file mode 100644
index 04aca0194..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/WebResourceCollection.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.web;
-
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Resource Collection</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	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
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.web.WebResourceCollection#getWebResourceName <em>Web Resource Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.WebResourceCollection#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.WebResourceCollection#getUrlPatterns <em>Url Patterns</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.WebResourceCollection#getHttpMethods <em>Http Methods</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.WebResourceCollection#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebResourceCollection()
- * @extends JavaEEObject
- * @generated
- */
-public interface WebResourceCollection extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Web Resource Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The web-resource-name contains the name of this web
-	 * 	    resource collection.
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Web Resource Name</em>' attribute.
-	 * @see #setWebResourceName(String)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebResourceCollection_WebResourceName()
-	 * @generated
-	 */
-	String getWebResourceName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.WebResourceCollection#getWebResourceName <em>Web Resource Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Web Resource Name</em>' attribute.
-	 * @see #getWebResourceName()
-	 * @generated
-	 */
-	void setWebResourceName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebResourceCollection_Descriptions()
-	 * @generated
-	 */
-	List getDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>Url Patterns</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.javaee.core.UrlPatternType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Url Patterns</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Url Patterns</em>' containment reference list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebResourceCollection_UrlPatterns()
-	 * @generated
-	 */
-	List getUrlPatterns();
-
-	/**
-	 * Returns the value of the '<em><b>Http Methods</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Http Methods</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Http Methods</em>' attribute list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebResourceCollection_HttpMethods()
-	 * @generated
-	 */
-	List getHttpMethods();
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebResourceCollection_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.WebResourceCollection#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // WebResourceCollection
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/WelcomeFileList.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/WelcomeFileList.java
deleted file mode 100644
index 2872cad8e..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/WelcomeFileList.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.web;
-
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Welcome File List</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- * 
- * 	The welcome-file-list contains an ordered list of welcome
- * 	files elements.
- * 
- * 	Used in: web-app
- * 
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.web.WelcomeFileList#getWelcomeFiles <em>Welcome Files</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.WelcomeFileList#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWelcomeFileList()
- * @extends JavaEEObject
- * @generated
- */
-public interface WelcomeFileList extends JavaEEObject {
-	/**
-	 * Returns the value of the '<em><b>Welcome Files</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 
-	 * 	    The welcome-file element contains file name to use
-	 * 	    as a default welcome file, such as index.html
-	 * 
-	 * 	  
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Welcome Files</em>' attribute list.
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWelcomeFileList_WelcomeFiles()
-	 * @generated
-	 */
-	List getWelcomeFiles();
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWelcomeFileList_Id()
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.web.WelcomeFileList#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // WelcomeFileList
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/AuthConstraintImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/AuthConstraintImpl.java
deleted file mode 100644
index 0e1ecaf91..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/AuthConstraintImpl.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-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.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jst.javaee.core.Description;
-
-import org.eclipse.jst.javaee.web.AuthConstraint;
-
-import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Auth Constraint</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.AuthConstraintImpl#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.AuthConstraintImpl#getRoleNames <em>Role Names</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.AuthConstraintImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class AuthConstraintImpl extends EObjectImpl implements AuthConstraint {
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The cached value of the '{@link #getRoleNames() <em>Role Names</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRoleNames()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList roleNames = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AuthConstraintImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebPackage.Literals.AUTH_CONSTRAINT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, WebPackage.AUTH_CONSTRAINT__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getRoleNames() {
-		if (roleNames == null) {
-			roleNames = new EDataTypeEList(String.class, this, WebPackage.AUTH_CONSTRAINT__ROLE_NAMES);
-		}
-		return roleNames;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.AUTH_CONSTRAINT__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebPackage.AUTH_CONSTRAINT__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebPackage.AUTH_CONSTRAINT__DESCRIPTIONS:
-				return getDescriptions();
-			case WebPackage.AUTH_CONSTRAINT__ROLE_NAMES:
-				return getRoleNames();
-			case WebPackage.AUTH_CONSTRAINT__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebPackage.AUTH_CONSTRAINT__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case WebPackage.AUTH_CONSTRAINT__ROLE_NAMES:
-				getRoleNames().clear();
-				getRoleNames().addAll((Collection)newValue);
-				return;
-			case WebPackage.AUTH_CONSTRAINT__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebPackage.AUTH_CONSTRAINT__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case WebPackage.AUTH_CONSTRAINT__ROLE_NAMES:
-				getRoleNames().clear();
-				return;
-			case WebPackage.AUTH_CONSTRAINT__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebPackage.AUTH_CONSTRAINT__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case WebPackage.AUTH_CONSTRAINT__ROLE_NAMES:
-				return roleNames != null && !roleNames.isEmpty();
-			case WebPackage.AUTH_CONSTRAINT__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (roleNames: "); //$NON-NLS-1$
-		result.append(roleNames);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //AuthConstraintImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/ErrorPageImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/ErrorPageImpl.java
deleted file mode 100644
index 2eed8378d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/ErrorPageImpl.java
+++ /dev/null
@@ -1,330 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-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.ErrorPage;
-
-import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Error Page</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.ErrorPageImpl#getErrorCode <em>Error Code</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.ErrorPageImpl#getExceptionType <em>Exception Type</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.ErrorPageImpl#getLocation <em>Location</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.ErrorPageImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ErrorPageImpl extends EObjectImpl implements ErrorPage {
-	/**
-	 * The default value of the '{@link #getErrorCode() <em>Error Code</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getErrorCode()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger ERROR_CODE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getErrorCode() <em>Error Code</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getErrorCode()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger errorCode = ERROR_CODE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getExceptionType() <em>Exception Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExceptionType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EXCEPTION_TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getExceptionType() <em>Exception Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExceptionType()
-	 * @generated
-	 * @ordered
-	 */
-	protected String exceptionType = EXCEPTION_TYPE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLocation() <em>Location</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocation()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LOCATION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLocation() <em>Location</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocation()
-	 * @generated
-	 * @ordered
-	 */
-	protected String location = LOCATION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ErrorPageImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebPackage.Literals.ERROR_PAGE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getErrorCode() {
-		return errorCode;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setErrorCode(BigInteger newErrorCode) {
-		BigInteger oldErrorCode = errorCode;
-		errorCode = newErrorCode;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.ERROR_PAGE__ERROR_CODE, oldErrorCode, errorCode));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getExceptionType() {
-		return exceptionType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setExceptionType(String newExceptionType) {
-		String oldExceptionType = exceptionType;
-		exceptionType = newExceptionType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.ERROR_PAGE__EXCEPTION_TYPE, oldExceptionType, exceptionType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLocation() {
-		return location;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLocation(String newLocation) {
-		String oldLocation = location;
-		location = newLocation;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.ERROR_PAGE__LOCATION, oldLocation, location));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.ERROR_PAGE__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebPackage.ERROR_PAGE__ERROR_CODE:
-				return getErrorCode();
-			case WebPackage.ERROR_PAGE__EXCEPTION_TYPE:
-				return getExceptionType();
-			case WebPackage.ERROR_PAGE__LOCATION:
-				return getLocation();
-			case WebPackage.ERROR_PAGE__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebPackage.ERROR_PAGE__ERROR_CODE:
-				setErrorCode((BigInteger)newValue);
-				return;
-			case WebPackage.ERROR_PAGE__EXCEPTION_TYPE:
-				setExceptionType((String)newValue);
-				return;
-			case WebPackage.ERROR_PAGE__LOCATION:
-				setLocation((String)newValue);
-				return;
-			case WebPackage.ERROR_PAGE__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebPackage.ERROR_PAGE__ERROR_CODE:
-				setErrorCode(ERROR_CODE_EDEFAULT);
-				return;
-			case WebPackage.ERROR_PAGE__EXCEPTION_TYPE:
-				setExceptionType(EXCEPTION_TYPE_EDEFAULT);
-				return;
-			case WebPackage.ERROR_PAGE__LOCATION:
-				setLocation(LOCATION_EDEFAULT);
-				return;
-			case WebPackage.ERROR_PAGE__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebPackage.ERROR_PAGE__ERROR_CODE:
-				return ERROR_CODE_EDEFAULT == null ? errorCode != null : !ERROR_CODE_EDEFAULT.equals(errorCode);
-			case WebPackage.ERROR_PAGE__EXCEPTION_TYPE:
-				return EXCEPTION_TYPE_EDEFAULT == null ? exceptionType != null : !EXCEPTION_TYPE_EDEFAULT.equals(exceptionType);
-			case WebPackage.ERROR_PAGE__LOCATION:
-				return LOCATION_EDEFAULT == null ? location != null : !LOCATION_EDEFAULT.equals(location);
-			case WebPackage.ERROR_PAGE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (errorCode: "); //$NON-NLS-1$
-		result.append(errorCode);
-		result.append(", exceptionType: "); //$NON-NLS-1$
-		result.append(exceptionType);
-		result.append(", location: "); //$NON-NLS-1$
-		result.append(location);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ErrorPageImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/FilterImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/FilterImpl.java
deleted file mode 100644
index ad98147c5..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/FilterImpl.java
+++ /dev/null
@@ -1,444 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-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.ParamValue;
-
-import org.eclipse.jst.javaee.web.Filter;
-
-import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Filter</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.FilterImpl#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.FilterImpl#getDisplayNames <em>Display Names</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.FilterImpl#getIcons <em>Icons</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.FilterImpl#getFilterName <em>Filter Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.FilterImpl#getFilterClass <em>Filter Class</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.FilterImpl#getInitParams <em>Init Params</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.FilterImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FilterImpl extends EObjectImpl implements Filter {
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayNames() <em>Display Names</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayNames()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList displayNames = null;
-
-	/**
-	 * The cached value of the '{@link #getIcons() <em>Icons</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIcons()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList icons = null;
-
-	/**
-	 * The default value of the '{@link #getFilterName() <em>Filter Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFilterName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String FILTER_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getFilterName() <em>Filter Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFilterName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String filterName = FILTER_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getFilterClass() <em>Filter Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFilterClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String FILTER_CLASS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getFilterClass() <em>Filter Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFilterClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected String filterClass = FILTER_CLASS_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getInitParams() <em>Init Params</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInitParams()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList initParams = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected FilterImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebPackage.Literals.FILTER;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, WebPackage.FILTER__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDisplayNames() {
-		if (displayNames == null) {
-			displayNames = new EObjectContainmentEList(DisplayName.class, this, WebPackage.FILTER__DISPLAY_NAMES);
-		}
-		return displayNames;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getIcons() {
-		if (icons == null) {
-			icons = new EObjectContainmentEList(Icon.class, this, WebPackage.FILTER__ICONS);
-		}
-		return icons;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getFilterName() {
-		return filterName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFilterName(String newFilterName) {
-		String oldFilterName = filterName;
-		filterName = newFilterName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.FILTER__FILTER_NAME, oldFilterName, filterName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getFilterClass() {
-		return filterClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFilterClass(String newFilterClass) {
-		String oldFilterClass = filterClass;
-		filterClass = newFilterClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.FILTER__FILTER_CLASS, oldFilterClass, filterClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getInitParams() {
-		if (initParams == null) {
-			initParams = new EObjectContainmentEList(ParamValue.class, this, WebPackage.FILTER__INIT_PARAMS);
-		}
-		return initParams;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.FILTER__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebPackage.FILTER__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-			case WebPackage.FILTER__DISPLAY_NAMES:
-				return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
-			case WebPackage.FILTER__ICONS:
-				return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
-			case WebPackage.FILTER__INIT_PARAMS:
-				return ((InternalEList)getInitParams()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebPackage.FILTER__DESCRIPTIONS:
-				return getDescriptions();
-			case WebPackage.FILTER__DISPLAY_NAMES:
-				return getDisplayNames();
-			case WebPackage.FILTER__ICONS:
-				return getIcons();
-			case WebPackage.FILTER__FILTER_NAME:
-				return getFilterName();
-			case WebPackage.FILTER__FILTER_CLASS:
-				return getFilterClass();
-			case WebPackage.FILTER__INIT_PARAMS:
-				return getInitParams();
-			case WebPackage.FILTER__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebPackage.FILTER__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case WebPackage.FILTER__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				getDisplayNames().addAll((Collection)newValue);
-				return;
-			case WebPackage.FILTER__ICONS:
-				getIcons().clear();
-				getIcons().addAll((Collection)newValue);
-				return;
-			case WebPackage.FILTER__FILTER_NAME:
-				setFilterName((String)newValue);
-				return;
-			case WebPackage.FILTER__FILTER_CLASS:
-				setFilterClass((String)newValue);
-				return;
-			case WebPackage.FILTER__INIT_PARAMS:
-				getInitParams().clear();
-				getInitParams().addAll((Collection)newValue);
-				return;
-			case WebPackage.FILTER__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebPackage.FILTER__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case WebPackage.FILTER__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				return;
-			case WebPackage.FILTER__ICONS:
-				getIcons().clear();
-				return;
-			case WebPackage.FILTER__FILTER_NAME:
-				setFilterName(FILTER_NAME_EDEFAULT);
-				return;
-			case WebPackage.FILTER__FILTER_CLASS:
-				setFilterClass(FILTER_CLASS_EDEFAULT);
-				return;
-			case WebPackage.FILTER__INIT_PARAMS:
-				getInitParams().clear();
-				return;
-			case WebPackage.FILTER__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebPackage.FILTER__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case WebPackage.FILTER__DISPLAY_NAMES:
-				return displayNames != null && !displayNames.isEmpty();
-			case WebPackage.FILTER__ICONS:
-				return icons != null && !icons.isEmpty();
-			case WebPackage.FILTER__FILTER_NAME:
-				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__INIT_PARAMS:
-				return initParams != null && !initParams.isEmpty();
-			case WebPackage.FILTER__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (filterName: "); //$NON-NLS-1$
-		result.append(filterName);
-		result.append(", filterClass: "); //$NON-NLS-1$
-		result.append(filterClass);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //FilterImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/FilterMappingImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/FilterMappingImpl.java
deleted file mode 100644
index 59415a798..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/FilterMappingImpl.java
+++ /dev/null
@@ -1,362 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-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.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.EDataTypeEList;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jst.javaee.web.DispatcherType;
-import org.eclipse.jst.javaee.web.FilterMapping;
-
-import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Filter Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.FilterMappingImpl#getFilterName <em>Filter Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.FilterMappingImpl#getGroup <em>Group</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.FilterMappingImpl#getUrlPatterns <em>Url Patterns</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.FilterMappingImpl#getServletNames <em>Servlet Names</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.FilterMappingImpl#getDispatchers <em>Dispatchers</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.FilterMappingImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FilterMappingImpl extends EObjectImpl implements FilterMapping {
-	/**
-	 * The default value of the '{@link #getFilterName() <em>Filter Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFilterName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String FILTER_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getFilterName() <em>Filter Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFilterName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String filterName = FILTER_NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getGroup() <em>Group</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGroup()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureMap group = null;
-
-	/**
-	 * The cached value of the '{@link #getDispatchers() <em>Dispatchers</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDispatchers()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList dispatchers = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected FilterMappingImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebPackage.Literals.FILTER_MAPPING;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getFilterName() {
-		return filterName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFilterName(String newFilterName) {
-		String oldFilterName = filterName;
-		filterName = newFilterName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.FILTER_MAPPING__FILTER_NAME, oldFilterName, filterName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureMap getGroup() {
-		if (group == null) {
-			group = new BasicFeatureMap(this, WebPackage.FILTER_MAPPING__GROUP);
-		}
-		return group;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getUrlPatterns() {
-		return ((FeatureMap)getGroup()).list(WebPackage.Literals.FILTER_MAPPING__URL_PATTERNS);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getServletNames() {
-		return ((FeatureMap)getGroup()).list(WebPackage.Literals.FILTER_MAPPING__SERVLET_NAMES);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDispatchers() {
-		if (dispatchers == null) {
-			dispatchers = new EDataTypeEList(DispatcherType.class, this, WebPackage.FILTER_MAPPING__DISPATCHERS);
-		}
-		return dispatchers;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.FILTER_MAPPING__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebPackage.FILTER_MAPPING__GROUP:
-				return ((InternalEList)getGroup()).basicRemove(otherEnd, msgs);
-			case WebPackage.FILTER_MAPPING__URL_PATTERNS:
-				return ((InternalEList)getUrlPatterns()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebPackage.FILTER_MAPPING__FILTER_NAME:
-				return getFilterName();
-			case WebPackage.FILTER_MAPPING__GROUP:
-				if (coreType) return getGroup();
-				return ((FeatureMap.Internal)getGroup()).getWrapper();
-			case WebPackage.FILTER_MAPPING__URL_PATTERNS:
-				return getUrlPatterns();
-			case WebPackage.FILTER_MAPPING__SERVLET_NAMES:
-				return getServletNames();
-			case WebPackage.FILTER_MAPPING__DISPATCHERS:
-				return getDispatchers();
-			case WebPackage.FILTER_MAPPING__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebPackage.FILTER_MAPPING__FILTER_NAME:
-				setFilterName((String)newValue);
-				return;
-			case WebPackage.FILTER_MAPPING__GROUP:
-				((FeatureMap.Internal)getGroup()).set(newValue);
-				return;
-			case WebPackage.FILTER_MAPPING__URL_PATTERNS:
-				getUrlPatterns().clear();
-				getUrlPatterns().addAll((Collection)newValue);
-				return;
-			case WebPackage.FILTER_MAPPING__SERVLET_NAMES:
-				getServletNames().clear();
-				getServletNames().addAll((Collection)newValue);
-				return;
-			case WebPackage.FILTER_MAPPING__DISPATCHERS:
-				getDispatchers().clear();
-				getDispatchers().addAll((Collection)newValue);
-				return;
-			case WebPackage.FILTER_MAPPING__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebPackage.FILTER_MAPPING__FILTER_NAME:
-				setFilterName(FILTER_NAME_EDEFAULT);
-				return;
-			case WebPackage.FILTER_MAPPING__GROUP:
-				getGroup().clear();
-				return;
-			case WebPackage.FILTER_MAPPING__URL_PATTERNS:
-				getUrlPatterns().clear();
-				return;
-			case WebPackage.FILTER_MAPPING__SERVLET_NAMES:
-				getServletNames().clear();
-				return;
-			case WebPackage.FILTER_MAPPING__DISPATCHERS:
-				getDispatchers().clear();
-				return;
-			case WebPackage.FILTER_MAPPING__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebPackage.FILTER_MAPPING__FILTER_NAME:
-				return FILTER_NAME_EDEFAULT == null ? filterName != null : !FILTER_NAME_EDEFAULT.equals(filterName);
-			case WebPackage.FILTER_MAPPING__GROUP:
-				return group != null && !group.isEmpty();
-			case WebPackage.FILTER_MAPPING__URL_PATTERNS:
-				return !getUrlPatterns().isEmpty();
-			case WebPackage.FILTER_MAPPING__SERVLET_NAMES:
-				return !getServletNames().isEmpty();
-			case WebPackage.FILTER_MAPPING__DISPATCHERS:
-				return dispatchers != null && !dispatchers.isEmpty();
-			case WebPackage.FILTER_MAPPING__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (filterName: "); //$NON-NLS-1$
-		result.append(filterName);
-		result.append(", group: "); //$NON-NLS-1$
-		result.append(group);
-		result.append(", dispatchers: "); //$NON-NLS-1$
-		result.append(dispatchers);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //FilterMappingImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/FormLoginConfigImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/FormLoginConfigImpl.java
deleted file mode 100644
index d84485608..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/FormLoginConfigImpl.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-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.FormLoginConfig;
-
-import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Form Login Config</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.FormLoginConfigImpl#getFormLoginPage <em>Form Login Page</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.FormLoginConfigImpl#getFormErrorPage <em>Form Error Page</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.FormLoginConfigImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FormLoginConfigImpl extends EObjectImpl implements FormLoginConfig {
-	/**
-	 * The default value of the '{@link #getFormLoginPage() <em>Form Login Page</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFormLoginPage()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String FORM_LOGIN_PAGE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getFormLoginPage() <em>Form Login Page</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFormLoginPage()
-	 * @generated
-	 * @ordered
-	 */
-	protected String formLoginPage = FORM_LOGIN_PAGE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getFormErrorPage() <em>Form Error Page</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFormErrorPage()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String FORM_ERROR_PAGE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getFormErrorPage() <em>Form Error Page</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFormErrorPage()
-	 * @generated
-	 * @ordered
-	 */
-	protected String formErrorPage = FORM_ERROR_PAGE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected FormLoginConfigImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebPackage.Literals.FORM_LOGIN_CONFIG;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getFormLoginPage() {
-		return formLoginPage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFormLoginPage(String newFormLoginPage) {
-		String oldFormLoginPage = formLoginPage;
-		formLoginPage = newFormLoginPage;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.FORM_LOGIN_CONFIG__FORM_LOGIN_PAGE, oldFormLoginPage, formLoginPage));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getFormErrorPage() {
-		return formErrorPage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFormErrorPage(String newFormErrorPage) {
-		String oldFormErrorPage = formErrorPage;
-		formErrorPage = newFormErrorPage;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.FORM_LOGIN_CONFIG__FORM_ERROR_PAGE, oldFormErrorPage, formErrorPage));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.FORM_LOGIN_CONFIG__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebPackage.FORM_LOGIN_CONFIG__FORM_LOGIN_PAGE:
-				return getFormLoginPage();
-			case WebPackage.FORM_LOGIN_CONFIG__FORM_ERROR_PAGE:
-				return getFormErrorPage();
-			case WebPackage.FORM_LOGIN_CONFIG__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebPackage.FORM_LOGIN_CONFIG__FORM_LOGIN_PAGE:
-				setFormLoginPage((String)newValue);
-				return;
-			case WebPackage.FORM_LOGIN_CONFIG__FORM_ERROR_PAGE:
-				setFormErrorPage((String)newValue);
-				return;
-			case WebPackage.FORM_LOGIN_CONFIG__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebPackage.FORM_LOGIN_CONFIG__FORM_LOGIN_PAGE:
-				setFormLoginPage(FORM_LOGIN_PAGE_EDEFAULT);
-				return;
-			case WebPackage.FORM_LOGIN_CONFIG__FORM_ERROR_PAGE:
-				setFormErrorPage(FORM_ERROR_PAGE_EDEFAULT);
-				return;
-			case WebPackage.FORM_LOGIN_CONFIG__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebPackage.FORM_LOGIN_CONFIG__FORM_LOGIN_PAGE:
-				return FORM_LOGIN_PAGE_EDEFAULT == null ? formLoginPage != null : !FORM_LOGIN_PAGE_EDEFAULT.equals(formLoginPage);
-			case WebPackage.FORM_LOGIN_CONFIG__FORM_ERROR_PAGE:
-				return FORM_ERROR_PAGE_EDEFAULT == null ? formErrorPage != null : !FORM_ERROR_PAGE_EDEFAULT.equals(formErrorPage);
-			case WebPackage.FORM_LOGIN_CONFIG__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (formLoginPage: "); //$NON-NLS-1$
-		result.append(formLoginPage);
-		result.append(", formErrorPage: "); //$NON-NLS-1$
-		result.append(formErrorPage);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //FormLoginConfigImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/LocaleEncodingMappingImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/LocaleEncodingMappingImpl.java
deleted file mode 100644
index bf68f2110..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/LocaleEncodingMappingImpl.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-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.LocaleEncodingMapping;
-
-import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Locale Encoding Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.LocaleEncodingMappingImpl#getLocale <em>Locale</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.LocaleEncodingMappingImpl#getEncoding <em>Encoding</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.LocaleEncodingMappingImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class LocaleEncodingMappingImpl extends EObjectImpl implements LocaleEncodingMapping {
-	/**
-	 * The default value of the '{@link #getLocale() <em>Locale</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocale()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LOCALE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLocale() <em>Locale</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocale()
-	 * @generated
-	 * @ordered
-	 */
-	protected String locale = LOCALE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getEncoding() <em>Encoding</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEncoding()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ENCODING_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getEncoding() <em>Encoding</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEncoding()
-	 * @generated
-	 * @ordered
-	 */
-	protected String encoding = ENCODING_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LocaleEncodingMappingImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebPackage.Literals.LOCALE_ENCODING_MAPPING;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLocale() {
-		return locale;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLocale(String newLocale) {
-		String oldLocale = locale;
-		locale = newLocale;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.LOCALE_ENCODING_MAPPING__LOCALE, oldLocale, locale));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getEncoding() {
-		return encoding;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEncoding(String newEncoding) {
-		String oldEncoding = encoding;
-		encoding = newEncoding;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.LOCALE_ENCODING_MAPPING__ENCODING, oldEncoding, encoding));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.LOCALE_ENCODING_MAPPING__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebPackage.LOCALE_ENCODING_MAPPING__LOCALE:
-				return getLocale();
-			case WebPackage.LOCALE_ENCODING_MAPPING__ENCODING:
-				return getEncoding();
-			case WebPackage.LOCALE_ENCODING_MAPPING__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebPackage.LOCALE_ENCODING_MAPPING__LOCALE:
-				setLocale((String)newValue);
-				return;
-			case WebPackage.LOCALE_ENCODING_MAPPING__ENCODING:
-				setEncoding((String)newValue);
-				return;
-			case WebPackage.LOCALE_ENCODING_MAPPING__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebPackage.LOCALE_ENCODING_MAPPING__LOCALE:
-				setLocale(LOCALE_EDEFAULT);
-				return;
-			case WebPackage.LOCALE_ENCODING_MAPPING__ENCODING:
-				setEncoding(ENCODING_EDEFAULT);
-				return;
-			case WebPackage.LOCALE_ENCODING_MAPPING__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebPackage.LOCALE_ENCODING_MAPPING__LOCALE:
-				return LOCALE_EDEFAULT == null ? locale != null : !LOCALE_EDEFAULT.equals(locale);
-			case WebPackage.LOCALE_ENCODING_MAPPING__ENCODING:
-				return ENCODING_EDEFAULT == null ? encoding != null : !ENCODING_EDEFAULT.equals(encoding);
-			case WebPackage.LOCALE_ENCODING_MAPPING__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (locale: "); //$NON-NLS-1$
-		result.append(locale);
-		result.append(", encoding: "); //$NON-NLS-1$
-		result.append(encoding);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //LocaleEncodingMappingImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/LocaleEncodingMappingListImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/LocaleEncodingMappingListImpl.java
deleted file mode 100644
index 225da4779..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/LocaleEncodingMappingListImpl.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jst.javaee.web.LocaleEncodingMapping;
-import org.eclipse.jst.javaee.web.LocaleEncodingMappingList;
-
-import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Locale Encoding Mapping List</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.LocaleEncodingMappingListImpl#getLocalEncodingMappings <em>Local Encoding Mappings</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.LocaleEncodingMappingListImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class LocaleEncodingMappingListImpl extends EObjectImpl implements LocaleEncodingMappingList {
-	/**
-	 * The cached value of the '{@link #getLocalEncodingMappings() <em>Local Encoding Mappings</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocalEncodingMappings()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList localEncodingMappings = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LocaleEncodingMappingListImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebPackage.Literals.LOCALE_ENCODING_MAPPING_LIST;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getLocalEncodingMappings() {
-		if (localEncodingMappings == null) {
-			localEncodingMappings = new EObjectContainmentEList(LocaleEncodingMapping.class, this, WebPackage.LOCALE_ENCODING_MAPPING_LIST__LOCAL_ENCODING_MAPPINGS);
-		}
-		return localEncodingMappings;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.LOCALE_ENCODING_MAPPING_LIST__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	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 super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebPackage.LOCALE_ENCODING_MAPPING_LIST__LOCAL_ENCODING_MAPPINGS:
-				return getLocalEncodingMappings();
-			case WebPackage.LOCALE_ENCODING_MAPPING_LIST__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebPackage.LOCALE_ENCODING_MAPPING_LIST__LOCAL_ENCODING_MAPPINGS:
-				getLocalEncodingMappings().clear();
-				getLocalEncodingMappings().addAll((Collection)newValue);
-				return;
-			case WebPackage.LOCALE_ENCODING_MAPPING_LIST__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebPackage.LOCALE_ENCODING_MAPPING_LIST__LOCAL_ENCODING_MAPPINGS:
-				getLocalEncodingMappings().clear();
-				return;
-			case WebPackage.LOCALE_ENCODING_MAPPING_LIST__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebPackage.LOCALE_ENCODING_MAPPING_LIST__LOCAL_ENCODING_MAPPINGS:
-				return localEncodingMappings != null && !localEncodingMappings.isEmpty();
-			case WebPackage.LOCALE_ENCODING_MAPPING_LIST__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	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();
-	}
-
-} //LocaleEncodingMappingListImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/LoginConfigImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/LoginConfigImpl.java
deleted file mode 100644
index 564a38e4e..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/LoginConfigImpl.java
+++ /dev/null
@@ -1,354 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-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.FormLoginConfig;
-import org.eclipse.jst.javaee.web.LoginConfig;
-
-import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Login Config</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.LoginConfigImpl#getAuthMethod <em>Auth Method</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.LoginConfigImpl#getRealmName <em>Realm Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.LoginConfigImpl#getFormLoginConfig <em>Form Login Config</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.LoginConfigImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class LoginConfigImpl extends EObjectImpl implements LoginConfig {
-	/**
-	 * The default value of the '{@link #getAuthMethod() <em>Auth Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAuthMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String AUTH_METHOD_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAuthMethod() <em>Auth Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAuthMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected String authMethod = AUTH_METHOD_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getRealmName() <em>Realm Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRealmName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String REALM_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getRealmName() <em>Realm Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRealmName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String realmName = REALM_NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getFormLoginConfig() <em>Form Login Config</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFormLoginConfig()
-	 * @generated
-	 * @ordered
-	 */
-	protected FormLoginConfig formLoginConfig = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LoginConfigImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebPackage.Literals.LOGIN_CONFIG;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getAuthMethod() {
-		return authMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAuthMethod(String newAuthMethod) {
-		String oldAuthMethod = authMethod;
-		authMethod = newAuthMethod;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.LOGIN_CONFIG__AUTH_METHOD, oldAuthMethod, authMethod));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getRealmName() {
-		return realmName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRealmName(String newRealmName) {
-		String oldRealmName = realmName;
-		realmName = newRealmName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.LOGIN_CONFIG__REALM_NAME, oldRealmName, realmName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FormLoginConfig getFormLoginConfig() {
-		return formLoginConfig;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetFormLoginConfig(FormLoginConfig newFormLoginConfig, NotificationChain msgs) {
-		FormLoginConfig oldFormLoginConfig = formLoginConfig;
-		formLoginConfig = newFormLoginConfig;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WebPackage.LOGIN_CONFIG__FORM_LOGIN_CONFIG, oldFormLoginConfig, newFormLoginConfig);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFormLoginConfig(FormLoginConfig newFormLoginConfig) {
-		if (newFormLoginConfig != formLoginConfig) {
-			NotificationChain msgs = null;
-			if (formLoginConfig != null)
-				msgs = ((InternalEObject)formLoginConfig).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WebPackage.LOGIN_CONFIG__FORM_LOGIN_CONFIG, null, msgs);
-			if (newFormLoginConfig != null)
-				msgs = ((InternalEObject)newFormLoginConfig).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WebPackage.LOGIN_CONFIG__FORM_LOGIN_CONFIG, null, msgs);
-			msgs = basicSetFormLoginConfig(newFormLoginConfig, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.LOGIN_CONFIG__FORM_LOGIN_CONFIG, newFormLoginConfig, newFormLoginConfig));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.LOGIN_CONFIG__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebPackage.LOGIN_CONFIG__FORM_LOGIN_CONFIG:
-				return basicSetFormLoginConfig(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebPackage.LOGIN_CONFIG__AUTH_METHOD:
-				return getAuthMethod();
-			case WebPackage.LOGIN_CONFIG__REALM_NAME:
-				return getRealmName();
-			case WebPackage.LOGIN_CONFIG__FORM_LOGIN_CONFIG:
-				return getFormLoginConfig();
-			case WebPackage.LOGIN_CONFIG__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebPackage.LOGIN_CONFIG__AUTH_METHOD:
-				setAuthMethod((String)newValue);
-				return;
-			case WebPackage.LOGIN_CONFIG__REALM_NAME:
-				setRealmName((String)newValue);
-				return;
-			case WebPackage.LOGIN_CONFIG__FORM_LOGIN_CONFIG:
-				setFormLoginConfig((FormLoginConfig)newValue);
-				return;
-			case WebPackage.LOGIN_CONFIG__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebPackage.LOGIN_CONFIG__AUTH_METHOD:
-				setAuthMethod(AUTH_METHOD_EDEFAULT);
-				return;
-			case WebPackage.LOGIN_CONFIG__REALM_NAME:
-				setRealmName(REALM_NAME_EDEFAULT);
-				return;
-			case WebPackage.LOGIN_CONFIG__FORM_LOGIN_CONFIG:
-				setFormLoginConfig((FormLoginConfig)null);
-				return;
-			case WebPackage.LOGIN_CONFIG__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebPackage.LOGIN_CONFIG__AUTH_METHOD:
-				return AUTH_METHOD_EDEFAULT == null ? authMethod != null : !AUTH_METHOD_EDEFAULT.equals(authMethod);
-			case WebPackage.LOGIN_CONFIG__REALM_NAME:
-				return REALM_NAME_EDEFAULT == null ? realmName != null : !REALM_NAME_EDEFAULT.equals(realmName);
-			case WebPackage.LOGIN_CONFIG__FORM_LOGIN_CONFIG:
-				return formLoginConfig != null;
-			case WebPackage.LOGIN_CONFIG__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (authMethod: "); //$NON-NLS-1$
-		result.append(authMethod);
-		result.append(", realmName: "); //$NON-NLS-1$
-		result.append(realmName);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //LoginConfigImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/MimeMappingImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/MimeMappingImpl.java
deleted file mode 100644
index 9dbf69fc0..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/MimeMappingImpl.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-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.MimeMapping;
-
-import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Mime Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.MimeMappingImpl#getExtension <em>Extension</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.MimeMappingImpl#getMimeType <em>Mime Type</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.MimeMappingImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MimeMappingImpl extends EObjectImpl implements MimeMapping {
-	/**
-	 * The default value of the '{@link #getExtension() <em>Extension</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExtension()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EXTENSION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getExtension() <em>Extension</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExtension()
-	 * @generated
-	 * @ordered
-	 */
-	protected String extension = EXTENSION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getMimeType() <em>Mime Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMimeType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MIME_TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMimeType() <em>Mime Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMimeType()
-	 * @generated
-	 * @ordered
-	 */
-	protected String mimeType = MIME_TYPE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MimeMappingImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebPackage.Literals.MIME_MAPPING;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getExtension() {
-		return extension;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setExtension(String newExtension) {
-		String oldExtension = extension;
-		extension = newExtension;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.MIME_MAPPING__EXTENSION, oldExtension, extension));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getMimeType() {
-		return mimeType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMimeType(String newMimeType) {
-		String oldMimeType = mimeType;
-		mimeType = newMimeType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.MIME_MAPPING__MIME_TYPE, oldMimeType, mimeType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.MIME_MAPPING__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebPackage.MIME_MAPPING__EXTENSION:
-				return getExtension();
-			case WebPackage.MIME_MAPPING__MIME_TYPE:
-				return getMimeType();
-			case WebPackage.MIME_MAPPING__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebPackage.MIME_MAPPING__EXTENSION:
-				setExtension((String)newValue);
-				return;
-			case WebPackage.MIME_MAPPING__MIME_TYPE:
-				setMimeType((String)newValue);
-				return;
-			case WebPackage.MIME_MAPPING__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebPackage.MIME_MAPPING__EXTENSION:
-				setExtension(EXTENSION_EDEFAULT);
-				return;
-			case WebPackage.MIME_MAPPING__MIME_TYPE:
-				setMimeType(MIME_TYPE_EDEFAULT);
-				return;
-			case WebPackage.MIME_MAPPING__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebPackage.MIME_MAPPING__EXTENSION:
-				return EXTENSION_EDEFAULT == null ? extension != null : !EXTENSION_EDEFAULT.equals(extension);
-			case WebPackage.MIME_MAPPING__MIME_TYPE:
-				return MIME_TYPE_EDEFAULT == null ? mimeType != null : !MIME_TYPE_EDEFAULT.equals(mimeType);
-			case WebPackage.MIME_MAPPING__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (extension: "); //$NON-NLS-1$
-		result.append(extension);
-		result.append(", mimeType: "); //$NON-NLS-1$
-		result.append(mimeType);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //MimeMappingImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/SecurityConstraintImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/SecurityConstraintImpl.java
deleted file mode 100644
index de769c726..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/SecurityConstraintImpl.java
+++ /dev/null
@@ -1,396 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jst.javaee.core.DisplayName;
-
-import org.eclipse.jst.javaee.web.AuthConstraint;
-import org.eclipse.jst.javaee.web.SecurityConstraint;
-import org.eclipse.jst.javaee.web.UserDataConstraint;
-import org.eclipse.jst.javaee.web.WebResourceCollection;
-
-import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Security Constraint</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.SecurityConstraintImpl#getDisplayNames <em>Display Names</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.SecurityConstraintImpl#getWebResourceCollections <em>Web Resource Collections</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.SecurityConstraintImpl#getAuthConstraint <em>Auth Constraint</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.SecurityConstraintImpl#getUserDataConstraint <em>User Data Constraint</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.SecurityConstraintImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SecurityConstraintImpl extends EObjectImpl implements SecurityConstraint {
-	/**
-	 * The cached value of the '{@link #getDisplayNames() <em>Display Names</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayNames()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList displayNames = null;
-
-	/**
-	 * The cached value of the '{@link #getWebResourceCollections() <em>Web Resource Collections</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWebResourceCollections()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList webResourceCollections = null;
-
-	/**
-	 * The cached value of the '{@link #getAuthConstraint() <em>Auth Constraint</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAuthConstraint()
-	 * @generated
-	 * @ordered
-	 */
-	protected AuthConstraint authConstraint = null;
-
-	/**
-	 * The cached value of the '{@link #getUserDataConstraint() <em>User Data Constraint</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUserDataConstraint()
-	 * @generated
-	 * @ordered
-	 */
-	protected UserDataConstraint userDataConstraint = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SecurityConstraintImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebPackage.Literals.SECURITY_CONSTRAINT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDisplayNames() {
-		if (displayNames == null) {
-			displayNames = new EObjectContainmentEList(DisplayName.class, this, WebPackage.SECURITY_CONSTRAINT__DISPLAY_NAMES);
-		}
-		return displayNames;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getWebResourceCollections() {
-		if (webResourceCollections == null) {
-			webResourceCollections = new EObjectContainmentEList(WebResourceCollection.class, this, WebPackage.SECURITY_CONSTRAINT__WEB_RESOURCE_COLLECTIONS);
-		}
-		return webResourceCollections;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AuthConstraint getAuthConstraint() {
-		return authConstraint;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetAuthConstraint(AuthConstraint newAuthConstraint, NotificationChain msgs) {
-		AuthConstraint oldAuthConstraint = authConstraint;
-		authConstraint = newAuthConstraint;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WebPackage.SECURITY_CONSTRAINT__AUTH_CONSTRAINT, oldAuthConstraint, newAuthConstraint);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAuthConstraint(AuthConstraint newAuthConstraint) {
-		if (newAuthConstraint != authConstraint) {
-			NotificationChain msgs = null;
-			if (authConstraint != null)
-				msgs = ((InternalEObject)authConstraint).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WebPackage.SECURITY_CONSTRAINT__AUTH_CONSTRAINT, null, msgs);
-			if (newAuthConstraint != null)
-				msgs = ((InternalEObject)newAuthConstraint).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WebPackage.SECURITY_CONSTRAINT__AUTH_CONSTRAINT, null, msgs);
-			msgs = basicSetAuthConstraint(newAuthConstraint, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.SECURITY_CONSTRAINT__AUTH_CONSTRAINT, newAuthConstraint, newAuthConstraint));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public UserDataConstraint getUserDataConstraint() {
-		return userDataConstraint;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetUserDataConstraint(UserDataConstraint newUserDataConstraint, NotificationChain msgs) {
-		UserDataConstraint oldUserDataConstraint = userDataConstraint;
-		userDataConstraint = newUserDataConstraint;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WebPackage.SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT, oldUserDataConstraint, newUserDataConstraint);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setUserDataConstraint(UserDataConstraint newUserDataConstraint) {
-		if (newUserDataConstraint != userDataConstraint) {
-			NotificationChain msgs = null;
-			if (userDataConstraint != null)
-				msgs = ((InternalEObject)userDataConstraint).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WebPackage.SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT, null, msgs);
-			if (newUserDataConstraint != null)
-				msgs = ((InternalEObject)newUserDataConstraint).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WebPackage.SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT, null, msgs);
-			msgs = basicSetUserDataConstraint(newUserDataConstraint, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT, newUserDataConstraint, newUserDataConstraint));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.SECURITY_CONSTRAINT__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebPackage.SECURITY_CONSTRAINT__DISPLAY_NAMES:
-				return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
-			case WebPackage.SECURITY_CONSTRAINT__WEB_RESOURCE_COLLECTIONS:
-				return ((InternalEList)getWebResourceCollections()).basicRemove(otherEnd, msgs);
-			case WebPackage.SECURITY_CONSTRAINT__AUTH_CONSTRAINT:
-				return basicSetAuthConstraint(null, msgs);
-			case WebPackage.SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT:
-				return basicSetUserDataConstraint(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebPackage.SECURITY_CONSTRAINT__DISPLAY_NAMES:
-				return getDisplayNames();
-			case WebPackage.SECURITY_CONSTRAINT__WEB_RESOURCE_COLLECTIONS:
-				return getWebResourceCollections();
-			case WebPackage.SECURITY_CONSTRAINT__AUTH_CONSTRAINT:
-				return getAuthConstraint();
-			case WebPackage.SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT:
-				return getUserDataConstraint();
-			case WebPackage.SECURITY_CONSTRAINT__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebPackage.SECURITY_CONSTRAINT__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				getDisplayNames().addAll((Collection)newValue);
-				return;
-			case WebPackage.SECURITY_CONSTRAINT__WEB_RESOURCE_COLLECTIONS:
-				getWebResourceCollections().clear();
-				getWebResourceCollections().addAll((Collection)newValue);
-				return;
-			case WebPackage.SECURITY_CONSTRAINT__AUTH_CONSTRAINT:
-				setAuthConstraint((AuthConstraint)newValue);
-				return;
-			case WebPackage.SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT:
-				setUserDataConstraint((UserDataConstraint)newValue);
-				return;
-			case WebPackage.SECURITY_CONSTRAINT__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebPackage.SECURITY_CONSTRAINT__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				return;
-			case WebPackage.SECURITY_CONSTRAINT__WEB_RESOURCE_COLLECTIONS:
-				getWebResourceCollections().clear();
-				return;
-			case WebPackage.SECURITY_CONSTRAINT__AUTH_CONSTRAINT:
-				setAuthConstraint((AuthConstraint)null);
-				return;
-			case WebPackage.SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT:
-				setUserDataConstraint((UserDataConstraint)null);
-				return;
-			case WebPackage.SECURITY_CONSTRAINT__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebPackage.SECURITY_CONSTRAINT__DISPLAY_NAMES:
-				return displayNames != null && !displayNames.isEmpty();
-			case WebPackage.SECURITY_CONSTRAINT__WEB_RESOURCE_COLLECTIONS:
-				return webResourceCollections != null && !webResourceCollections.isEmpty();
-			case WebPackage.SECURITY_CONSTRAINT__AUTH_CONSTRAINT:
-				return authConstraint != null;
-			case WebPackage.SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT:
-				return userDataConstraint != null;
-			case WebPackage.SECURITY_CONSTRAINT__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	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();
-	}
-
-} //SecurityConstraintImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/ServletImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/ServletImpl.java
deleted file mode 100644
index f531f1e70..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/ServletImpl.java
+++ /dev/null
@@ -1,656 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-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.ParamValue;
-import org.eclipse.jst.javaee.core.RunAs;
-import org.eclipse.jst.javaee.core.SecurityRoleRef;
-
-import org.eclipse.jst.javaee.web.Servlet;
-
-import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Servlet</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.ServletImpl#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.ServletImpl#getDisplayNames <em>Display Names</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.ServletImpl#getIcons <em>Icons</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.ServletImpl#getServletName <em>Servlet Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.ServletImpl#getServletClass <em>Servlet Class</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.ServletImpl#getJspFile <em>Jsp File</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.ServletImpl#getInitParams <em>Init Params</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.ServletImpl#getLoadOnStartup <em>Load On Startup</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.ServletImpl#getRunAs <em>Run As</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.ServletImpl#getSecurityRoleRefs <em>Security Role Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.ServletImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ServletImpl extends EObjectImpl implements Servlet {
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayNames() <em>Display Names</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayNames()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList displayNames = null;
-
-	/**
-	 * The cached value of the '{@link #getIcons() <em>Icons</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIcons()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList icons = null;
-
-	/**
-	 * The default value of the '{@link #getServletName() <em>Servlet Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getServletName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SERVLET_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getServletName() <em>Servlet Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getServletName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String servletName = SERVLET_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getServletClass() <em>Servlet Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getServletClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SERVLET_CLASS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getServletClass() <em>Servlet Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getServletClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected String servletClass = SERVLET_CLASS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getJspFile() <em>Jsp File</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getJspFile()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String JSP_FILE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getJspFile() <em>Jsp File</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getJspFile()
-	 * @generated
-	 * @ordered
-	 */
-	protected String jspFile = JSP_FILE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getInitParams() <em>Init Params</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInitParams()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList initParams = null;
-
-	/**
-	 * The default value of the '{@link #getLoadOnStartup() <em>Load On Startup</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLoadOnStartup()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object LOAD_ON_STARTUP_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLoadOnStartup() <em>Load On Startup</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLoadOnStartup()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object loadOnStartup = LOAD_ON_STARTUP_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getRunAs() <em>Run As</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRunAs()
-	 * @generated
-	 * @ordered
-	 */
-	protected RunAs runAs = null;
-
-	/**
-	 * The cached value of the '{@link #getSecurityRoleRefs() <em>Security Role Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSecurityRoleRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList securityRoleRefs = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ServletImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebPackage.Literals.SERVLET;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, WebPackage.SERVLET__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDisplayNames() {
-		if (displayNames == null) {
-			displayNames = new EObjectContainmentEList(DisplayName.class, this, WebPackage.SERVLET__DISPLAY_NAMES);
-		}
-		return displayNames;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getIcons() {
-		if (icons == null) {
-			icons = new EObjectContainmentEList(Icon.class, this, WebPackage.SERVLET__ICONS);
-		}
-		return icons;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getServletName() {
-		return servletName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setServletName(String newServletName) {
-		String oldServletName = servletName;
-		servletName = newServletName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.SERVLET__SERVLET_NAME, oldServletName, servletName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getServletClass() {
-		return servletClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setServletClass(String newServletClass) {
-		String oldServletClass = servletClass;
-		servletClass = newServletClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.SERVLET__SERVLET_CLASS, oldServletClass, servletClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getJspFile() {
-		return jspFile;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setJspFile(String newJspFile) {
-		String oldJspFile = jspFile;
-		jspFile = newJspFile;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.SERVLET__JSP_FILE, oldJspFile, jspFile));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getInitParams() {
-		if (initParams == null) {
-			initParams = new EObjectContainmentEList(ParamValue.class, this, WebPackage.SERVLET__INIT_PARAMS);
-		}
-		return initParams;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getLoadOnStartup() {
-		return loadOnStartup;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLoadOnStartup(Object newLoadOnStartup) {
-		Object oldLoadOnStartup = loadOnStartup;
-		loadOnStartup = newLoadOnStartup;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.SERVLET__LOAD_ON_STARTUP, oldLoadOnStartup, loadOnStartup));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RunAs getRunAs() {
-		return runAs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetRunAs(RunAs newRunAs, NotificationChain msgs) {
-		RunAs oldRunAs = runAs;
-		runAs = newRunAs;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WebPackage.SERVLET__RUN_AS, oldRunAs, newRunAs);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRunAs(RunAs newRunAs) {
-		if (newRunAs != runAs) {
-			NotificationChain msgs = null;
-			if (runAs != null)
-				msgs = ((InternalEObject)runAs).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WebPackage.SERVLET__RUN_AS, null, msgs);
-			if (newRunAs != null)
-				msgs = ((InternalEObject)newRunAs).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WebPackage.SERVLET__RUN_AS, null, msgs);
-			msgs = basicSetRunAs(newRunAs, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.SERVLET__RUN_AS, newRunAs, newRunAs));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getSecurityRoleRefs() {
-		if (securityRoleRefs == null) {
-			securityRoleRefs = new EObjectContainmentEList(SecurityRoleRef.class, this, WebPackage.SERVLET__SECURITY_ROLE_REFS);
-		}
-		return securityRoleRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.SERVLET__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebPackage.SERVLET__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-			case WebPackage.SERVLET__DISPLAY_NAMES:
-				return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
-			case WebPackage.SERVLET__ICONS:
-				return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
-			case WebPackage.SERVLET__INIT_PARAMS:
-				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 super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebPackage.SERVLET__DESCRIPTIONS:
-				return getDescriptions();
-			case WebPackage.SERVLET__DISPLAY_NAMES:
-				return getDisplayNames();
-			case WebPackage.SERVLET__ICONS:
-				return getIcons();
-			case WebPackage.SERVLET__SERVLET_NAME:
-				return getServletName();
-			case WebPackage.SERVLET__SERVLET_CLASS:
-				return getServletClass();
-			case WebPackage.SERVLET__JSP_FILE:
-				return getJspFile();
-			case WebPackage.SERVLET__INIT_PARAMS:
-				return getInitParams();
-			case WebPackage.SERVLET__LOAD_ON_STARTUP:
-				return getLoadOnStartup();
-			case WebPackage.SERVLET__RUN_AS:
-				return getRunAs();
-			case WebPackage.SERVLET__SECURITY_ROLE_REFS:
-				return getSecurityRoleRefs();
-			case WebPackage.SERVLET__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebPackage.SERVLET__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case WebPackage.SERVLET__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				getDisplayNames().addAll((Collection)newValue);
-				return;
-			case WebPackage.SERVLET__ICONS:
-				getIcons().clear();
-				getIcons().addAll((Collection)newValue);
-				return;
-			case WebPackage.SERVLET__SERVLET_NAME:
-				setServletName((String)newValue);
-				return;
-			case WebPackage.SERVLET__SERVLET_CLASS:
-				setServletClass((String)newValue);
-				return;
-			case WebPackage.SERVLET__JSP_FILE:
-				setJspFile((String)newValue);
-				return;
-			case WebPackage.SERVLET__INIT_PARAMS:
-				getInitParams().clear();
-				getInitParams().addAll((Collection)newValue);
-				return;
-			case WebPackage.SERVLET__LOAD_ON_STARTUP:
-				setLoadOnStartup((Object)newValue);
-				return;
-			case WebPackage.SERVLET__RUN_AS:
-				setRunAs((RunAs)newValue);
-				return;
-			case WebPackage.SERVLET__SECURITY_ROLE_REFS:
-				getSecurityRoleRefs().clear();
-				getSecurityRoleRefs().addAll((Collection)newValue);
-				return;
-			case WebPackage.SERVLET__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebPackage.SERVLET__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case WebPackage.SERVLET__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				return;
-			case WebPackage.SERVLET__ICONS:
-				getIcons().clear();
-				return;
-			case WebPackage.SERVLET__SERVLET_NAME:
-				setServletName(SERVLET_NAME_EDEFAULT);
-				return;
-			case WebPackage.SERVLET__SERVLET_CLASS:
-				setServletClass(SERVLET_CLASS_EDEFAULT);
-				return;
-			case WebPackage.SERVLET__JSP_FILE:
-				setJspFile(JSP_FILE_EDEFAULT);
-				return;
-			case WebPackage.SERVLET__INIT_PARAMS:
-				getInitParams().clear();
-				return;
-			case WebPackage.SERVLET__LOAD_ON_STARTUP:
-				setLoadOnStartup(LOAD_ON_STARTUP_EDEFAULT);
-				return;
-			case WebPackage.SERVLET__RUN_AS:
-				setRunAs((RunAs)null);
-				return;
-			case WebPackage.SERVLET__SECURITY_ROLE_REFS:
-				getSecurityRoleRefs().clear();
-				return;
-			case WebPackage.SERVLET__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebPackage.SERVLET__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case WebPackage.SERVLET__DISPLAY_NAMES:
-				return displayNames != null && !displayNames.isEmpty();
-			case WebPackage.SERVLET__ICONS:
-				return icons != null && !icons.isEmpty();
-			case WebPackage.SERVLET__SERVLET_NAME:
-				return SERVLET_NAME_EDEFAULT == null ? servletName != null : !SERVLET_NAME_EDEFAULT.equals(servletName);
-			case WebPackage.SERVLET__SERVLET_CLASS:
-				return SERVLET_CLASS_EDEFAULT == null ? servletClass != null : !SERVLET_CLASS_EDEFAULT.equals(servletClass);
-			case WebPackage.SERVLET__JSP_FILE:
-				return JSP_FILE_EDEFAULT == null ? jspFile != null : !JSP_FILE_EDEFAULT.equals(jspFile);
-			case WebPackage.SERVLET__INIT_PARAMS:
-				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__RUN_AS:
-				return runAs != null;
-			case WebPackage.SERVLET__SECURITY_ROLE_REFS:
-				return securityRoleRefs != null && !securityRoleRefs.isEmpty();
-			case WebPackage.SERVLET__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (servletName: "); //$NON-NLS-1$
-		result.append(servletName);
-		result.append(", servletClass: "); //$NON-NLS-1$
-		result.append(servletClass);
-		result.append(", jspFile: "); //$NON-NLS-1$
-		result.append(jspFile);
-		result.append(", loadOnStartup: "); //$NON-NLS-1$
-		result.append(loadOnStartup);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ServletImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/ServletMappingImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/ServletMappingImpl.java
deleted file mode 100644
index ee352f0f3..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/ServletMappingImpl.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jst.javaee.core.UrlPatternType;
-
-import org.eclipse.jst.javaee.web.ServletMapping;
-
-import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Servlet Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.ServletMappingImpl#getServletName <em>Servlet Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.ServletMappingImpl#getUrlPatterns <em>Url Patterns</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.ServletMappingImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ServletMappingImpl extends EObjectImpl implements ServletMapping {
-	/**
-	 * The default value of the '{@link #getServletName() <em>Servlet Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getServletName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SERVLET_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getServletName() <em>Servlet Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getServletName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String servletName = SERVLET_NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getUrlPatterns() <em>Url Patterns</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUrlPatterns()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList urlPatterns = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ServletMappingImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebPackage.Literals.SERVLET_MAPPING;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getServletName() {
-		return servletName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setServletName(String newServletName) {
-		String oldServletName = servletName;
-		servletName = newServletName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.SERVLET_MAPPING__SERVLET_NAME, oldServletName, servletName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getUrlPatterns() {
-		if (urlPatterns == null) {
-			urlPatterns = new EObjectContainmentEList(UrlPatternType.class, this, WebPackage.SERVLET_MAPPING__URL_PATTERNS);
-		}
-		return urlPatterns;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.SERVLET_MAPPING__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebPackage.SERVLET_MAPPING__URL_PATTERNS:
-				return ((InternalEList)getUrlPatterns()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebPackage.SERVLET_MAPPING__SERVLET_NAME:
-				return getServletName();
-			case WebPackage.SERVLET_MAPPING__URL_PATTERNS:
-				return getUrlPatterns();
-			case WebPackage.SERVLET_MAPPING__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebPackage.SERVLET_MAPPING__SERVLET_NAME:
-				setServletName((String)newValue);
-				return;
-			case WebPackage.SERVLET_MAPPING__URL_PATTERNS:
-				getUrlPatterns().clear();
-				getUrlPatterns().addAll((Collection)newValue);
-				return;
-			case WebPackage.SERVLET_MAPPING__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebPackage.SERVLET_MAPPING__SERVLET_NAME:
-				setServletName(SERVLET_NAME_EDEFAULT);
-				return;
-			case WebPackage.SERVLET_MAPPING__URL_PATTERNS:
-				getUrlPatterns().clear();
-				return;
-			case WebPackage.SERVLET_MAPPING__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebPackage.SERVLET_MAPPING__SERVLET_NAME:
-				return SERVLET_NAME_EDEFAULT == null ? servletName != null : !SERVLET_NAME_EDEFAULT.equals(servletName);
-			case WebPackage.SERVLET_MAPPING__URL_PATTERNS:
-				return urlPatterns != null && !urlPatterns.isEmpty();
-			case WebPackage.SERVLET_MAPPING__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (servletName: "); //$NON-NLS-1$
-		result.append(servletName);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ServletMappingImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/SessionConfigImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/SessionConfigImpl.java
deleted file mode 100644
index 4fbed8de4..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/SessionConfigImpl.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-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.SessionConfig;
-
-import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Session Config</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.SessionConfigImpl#getSessionTimeout <em>Session Timeout</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.SessionConfigImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SessionConfigImpl extends EObjectImpl implements SessionConfig {
-	/**
-	 * The default value of the '{@link #getSessionTimeout() <em>Session Timeout</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSessionTimeout()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger SESSION_TIMEOUT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getSessionTimeout() <em>Session Timeout</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSessionTimeout()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger sessionTimeout = SESSION_TIMEOUT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SessionConfigImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebPackage.Literals.SESSION_CONFIG;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getSessionTimeout() {
-		return sessionTimeout;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSessionTimeout(BigInteger newSessionTimeout) {
-		BigInteger oldSessionTimeout = sessionTimeout;
-		sessionTimeout = newSessionTimeout;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.SESSION_CONFIG__SESSION_TIMEOUT, oldSessionTimeout, sessionTimeout));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.SESSION_CONFIG__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebPackage.SESSION_CONFIG__SESSION_TIMEOUT:
-				return getSessionTimeout();
-			case WebPackage.SESSION_CONFIG__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebPackage.SESSION_CONFIG__SESSION_TIMEOUT:
-				if(newValue.getClass() == Integer.class) {
-			        Integer i = (Integer) newValue;
-				    setSessionTimeout(BigInteger.valueOf(i));
-				} else if (newValue.getClass() == BigInteger.class)
-					setSessionTimeout( (BigInteger) newValue);
-				else {
-					// do nothing if value is not Integer or BigInteger.
-				}
-				return;
-			case WebPackage.SESSION_CONFIG__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebPackage.SESSION_CONFIG__SESSION_TIMEOUT:
-				setSessionTimeout(SESSION_TIMEOUT_EDEFAULT);
-				return;
-			case WebPackage.SESSION_CONFIG__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebPackage.SESSION_CONFIG__SESSION_TIMEOUT:
-				return SESSION_TIMEOUT_EDEFAULT == null ? sessionTimeout != null : !SESSION_TIMEOUT_EDEFAULT.equals(sessionTimeout);
-			case WebPackage.SESSION_CONFIG__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (sessionTimeout: "); //$NON-NLS-1$
-		result.append(sessionTimeout);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //SessionConfigImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/UserDataConstraintImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/UserDataConstraintImpl.java
deleted file mode 100644
index 0071ad107..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/UserDataConstraintImpl.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jst.javaee.core.Description;
-
-import org.eclipse.jst.javaee.web.TransportGuaranteeType;
-import org.eclipse.jst.javaee.web.UserDataConstraint;
-
-import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>User Data Constraint</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.UserDataConstraintImpl#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.UserDataConstraintImpl#getTransportGuarantee <em>Transport Guarantee</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.UserDataConstraintImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class UserDataConstraintImpl extends EObjectImpl implements UserDataConstraint {
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The default value of the '{@link #getTransportGuarantee() <em>Transport Guarantee</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTransportGuarantee()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final TransportGuaranteeType TRANSPORT_GUARANTEE_EDEFAULT = TransportGuaranteeType.NONE_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getTransportGuarantee() <em>Transport Guarantee</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTransportGuarantee()
-	 * @generated
-	 * @ordered
-	 */
-	protected TransportGuaranteeType transportGuarantee = TRANSPORT_GUARANTEE_EDEFAULT;
-
-	/**
-	 * This is true if the Transport Guarantee attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean transportGuaranteeESet = false;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected UserDataConstraintImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebPackage.Literals.USER_DATA_CONSTRAINT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, WebPackage.USER_DATA_CONSTRAINT__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TransportGuaranteeType getTransportGuarantee() {
-		return transportGuarantee;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTransportGuarantee(TransportGuaranteeType newTransportGuarantee) {
-		TransportGuaranteeType oldTransportGuarantee = transportGuarantee;
-		transportGuarantee = newTransportGuarantee == null ? TRANSPORT_GUARANTEE_EDEFAULT : newTransportGuarantee;
-		boolean oldTransportGuaranteeESet = transportGuaranteeESet;
-		transportGuaranteeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.USER_DATA_CONSTRAINT__TRANSPORT_GUARANTEE, oldTransportGuarantee, transportGuarantee, !oldTransportGuaranteeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetTransportGuarantee() {
-		TransportGuaranteeType oldTransportGuarantee = transportGuarantee;
-		boolean oldTransportGuaranteeESet = transportGuaranteeESet;
-		transportGuarantee = TRANSPORT_GUARANTEE_EDEFAULT;
-		transportGuaranteeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, WebPackage.USER_DATA_CONSTRAINT__TRANSPORT_GUARANTEE, oldTransportGuarantee, TRANSPORT_GUARANTEE_EDEFAULT, oldTransportGuaranteeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetTransportGuarantee() {
-		return transportGuaranteeESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.USER_DATA_CONSTRAINT__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebPackage.USER_DATA_CONSTRAINT__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebPackage.USER_DATA_CONSTRAINT__DESCRIPTIONS:
-				return getDescriptions();
-			case WebPackage.USER_DATA_CONSTRAINT__TRANSPORT_GUARANTEE:
-				return getTransportGuarantee();
-			case WebPackage.USER_DATA_CONSTRAINT__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebPackage.USER_DATA_CONSTRAINT__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case WebPackage.USER_DATA_CONSTRAINT__TRANSPORT_GUARANTEE:
-				setTransportGuarantee((TransportGuaranteeType)newValue);
-				return;
-			case WebPackage.USER_DATA_CONSTRAINT__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebPackage.USER_DATA_CONSTRAINT__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case WebPackage.USER_DATA_CONSTRAINT__TRANSPORT_GUARANTEE:
-				unsetTransportGuarantee();
-				return;
-			case WebPackage.USER_DATA_CONSTRAINT__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebPackage.USER_DATA_CONSTRAINT__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case WebPackage.USER_DATA_CONSTRAINT__TRANSPORT_GUARANTEE:
-				return isSetTransportGuarantee();
-			case WebPackage.USER_DATA_CONSTRAINT__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (transportGuarantee: "); //$NON-NLS-1$
-		if (transportGuaranteeESet) result.append(transportGuarantee); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //UserDataConstraintImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WebAppDeploymentDescriptorImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WebAppDeploymentDescriptorImpl.java
deleted file mode 100644
index d16bdc498..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WebAppDeploymentDescriptorImpl.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.web.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.web.WebAppDeploymentDescriptor;
-
-import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>App Deployment Descriptor</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppDeploymentDescriptorImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppDeploymentDescriptorImpl#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppDeploymentDescriptorImpl#getXSISchemaLocation <em>XSI Schema Location</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppDeploymentDescriptorImpl#getWebApp <em>Web App</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class WebAppDeploymentDescriptorImpl extends EObjectImpl implements WebAppDeploymentDescriptor {
-	/**
-	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMixed()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureMap mixed = null;
-
-	/**
-	 * The cached value of the '{@link #getXMLNSPrefixMap() <em>XMLNS Prefix Map</em>}' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getXMLNSPrefixMap()
-	 * @generated
-	 * @ordered
-	 */
-	protected EMap xMLNSPrefixMap = null;
-
-	/**
-	 * The cached value of the '{@link #getXSISchemaLocation() <em>XSI Schema Location</em>}' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getXSISchemaLocation()
-	 * @generated
-	 * @ordered
-	 */
-	protected EMap xSISchemaLocation = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected WebAppDeploymentDescriptorImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebPackage.Literals.WEB_APP_DEPLOYMENT_DESCRIPTOR;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureMap getMixed() {
-		if (mixed == null) {
-			mixed = new BasicFeatureMap(this, WebPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__MIXED);
-		}
-		return mixed;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Map 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);
-		}
-		return xMLNSPrefixMap.map();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Map 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);
-		}
-		return xSISchemaLocation.map();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WebApp getWebApp() {
-		return (WebApp)getMixed().get(WebPackage.Literals.WEB_APP_DEPLOYMENT_DESCRIPTOR__WEB_APP, true);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetWebApp(WebApp newWebApp, NotificationChain msgs) {
-		return ((FeatureMap.Internal)getMixed()).basicAdd(WebPackage.Literals.WEB_APP_DEPLOYMENT_DESCRIPTOR__WEB_APP, newWebApp, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setWebApp(WebApp newWebApp) {
-		((FeatureMap.Internal)getMixed()).set(WebPackage.Literals.WEB_APP_DEPLOYMENT_DESCRIPTOR__WEB_APP, newWebApp);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__MIXED:
-				return ((InternalEList)getMixed()).basicRemove(otherEnd, msgs);
-			case WebPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP:
-				return ((InternalEList)((EMap.InternalMapView)getXMLNSPrefixMap()).eMap()).basicRemove(otherEnd, msgs);
-			case WebPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION:
-				return ((InternalEList)((EMap.InternalMapView)getXSISchemaLocation()).eMap()).basicRemove(otherEnd, msgs);
-			case WebPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__WEB_APP:
-				return basicSetWebApp(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__MIXED:
-				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();
-				else return getXMLNSPrefixMap();
-			case WebPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION:
-				if (coreType) return ((EMap.InternalMapView)getXSISchemaLocation()).eMap();
-				else return getXSISchemaLocation();
-			case WebPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__WEB_APP:
-				return getWebApp();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__MIXED:
-				((FeatureMap.Internal)getMixed()).set(newValue);
-				return;
-			case WebPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP:
-				((EStructuralFeature.Setting)((EMap.InternalMapView)getXMLNSPrefixMap()).eMap()).set(newValue);
-				return;
-			case WebPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION:
-				((EStructuralFeature.Setting)((EMap.InternalMapView)getXSISchemaLocation()).eMap()).set(newValue);
-				return;
-			case WebPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__WEB_APP:
-				setWebApp((WebApp)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__MIXED:
-				getMixed().clear();
-				return;
-			case WebPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP:
-				getXMLNSPrefixMap().clear();
-				return;
-			case WebPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION:
-				getXSISchemaLocation().clear();
-				return;
-			case WebPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__WEB_APP:
-				setWebApp((WebApp)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__MIXED:
-				return mixed != null && !mixed.isEmpty();
-			case WebPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP:
-				return xMLNSPrefixMap != null && !xMLNSPrefixMap.isEmpty();
-			case WebPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION:
-				return xSISchemaLocation != null && !xSISchemaLocation.isEmpty();
-			case WebPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR__WEB_APP:
-				return getWebApp() != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	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
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WebAppImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WebAppImpl.java
deleted file mode 100644
index a119b217f..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WebAppImpl.java
+++ /dev/null
@@ -1,1114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-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.web.WebApp;
-import org.eclipse.jst.javaee.web.WebAppVersionType;
-
-import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>App</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getGroup <em>Group</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getDisplayNames <em>Display Names</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getIcons <em>Icons</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getDistributables <em>Distributables</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getContextParams <em>Context Params</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getFilters <em>Filters</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getFilterMappings <em>Filter Mappings</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getListeners <em>Listeners</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getServlets <em>Servlets</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getServletMappings <em>Servlet Mappings</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getSessionConfigs <em>Session Configs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getMimeMappings <em>Mime Mappings</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getWelcomeFileLists <em>Welcome File Lists</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getErrorPages <em>Error Pages</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getJspConfigs <em>Jsp Configs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getSecurityConstraints <em>Security Constraints</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getLoginConfigs <em>Login Configs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getSecurityRoles <em>Security Roles</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getEnvEntries <em>Env Entries</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getEjbRefs <em>Ejb Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getEjbLocalRefs <em>Ejb Local Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getServiceRefs <em>Service Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getResourceRefs <em>Resource Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getResourceEnvRefs <em>Resource Env Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getMessageDestinationRefs <em>Message Destination Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getPersistenceContextRefs <em>Persistence Context Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getPersistenceUnitRefs <em>Persistence Unit Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getPostConstructs <em>Post Constructs</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getPreDestroys <em>Pre Destroys</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getMessageDestinations <em>Message Destinations</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getLocalEncodingMappingsLists <em>Local Encoding Mappings Lists</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#isMetadataComplete <em>Metadata Complete</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getVersion <em>Version</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class WebAppImpl extends EObjectImpl implements WebApp {
-	/**
-	 * The cached value of the '{@link #getGroup() <em>Group</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGroup()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureMap group = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isMetadataComplete() <em>Metadata Complete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMetadataComplete()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean METADATA_COMPLETE_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isMetadataComplete() <em>Metadata Complete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMetadataComplete()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean metadataComplete = METADATA_COMPLETE_EDEFAULT;
-
-	/**
-	 * This is true if the Metadata Complete attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean metadataCompleteESet = false;
-
-	/**
-	 * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final WebAppVersionType VERSION_EDEFAULT = WebAppVersionType._25_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getVersion() <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected WebAppVersionType version = VERSION_EDEFAULT;
-
-	/**
-	 * This is true if the Version attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean versionESet = false;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected WebAppImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebPackage.Literals.WEB_APP;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureMap getGroup() {
-		if (group == null) {
-			group = new BasicFeatureMap(this, WebPackage.WEB_APP__GROUP);
-		}
-		return group;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDescriptions() {
-		return ((FeatureMap)getGroup()).list(WebPackage.Literals.WEB_APP__DESCRIPTIONS);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDisplayNames() {
-		return ((FeatureMap)getGroup()).list(WebPackage.Literals.WEB_APP__DISPLAY_NAMES);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getIcons() {
-		return ((FeatureMap)getGroup()).list(WebPackage.Literals.WEB_APP__ICONS);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDistributables() {
-		return ((FeatureMap)getGroup()).list(WebPackage.Literals.WEB_APP__DISTRIBUTABLES);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getContextParams() {
-		return ((FeatureMap)getGroup()).list(WebPackage.Literals.WEB_APP__CONTEXT_PARAMS);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getFilters() {
-		return ((FeatureMap)getGroup()).list(WebPackage.Literals.WEB_APP__FILTERS);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getFilterMappings() {
-		return ((FeatureMap)getGroup()).list(WebPackage.Literals.WEB_APP__FILTER_MAPPINGS);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getListeners() {
-		return ((FeatureMap)getGroup()).list(WebPackage.Literals.WEB_APP__LISTENERS);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getServlets() {
-		return ((FeatureMap)getGroup()).list(WebPackage.Literals.WEB_APP__SERVLETS);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getServletMappings() {
-		return ((FeatureMap)getGroup()).list(WebPackage.Literals.WEB_APP__SERVLET_MAPPINGS);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getSessionConfigs() {
-		return ((FeatureMap)getGroup()).list(WebPackage.Literals.WEB_APP__SESSION_CONFIGS);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getMimeMappings() {
-		return ((FeatureMap)getGroup()).list(WebPackage.Literals.WEB_APP__MIME_MAPPINGS);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getWelcomeFileLists() {
-		return ((FeatureMap)getGroup()).list(WebPackage.Literals.WEB_APP__WELCOME_FILE_LISTS);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getErrorPages() {
-		return ((FeatureMap)getGroup()).list(WebPackage.Literals.WEB_APP__ERROR_PAGES);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getJspConfigs() {
-		return ((FeatureMap)getGroup()).list(WebPackage.Literals.WEB_APP__JSP_CONFIGS);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getSecurityConstraints() {
-		return ((FeatureMap)getGroup()).list(WebPackage.Literals.WEB_APP__SECURITY_CONSTRAINTS);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getLoginConfigs() {
-		return ((FeatureMap)getGroup()).list(WebPackage.Literals.WEB_APP__LOGIN_CONFIGS);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getSecurityRoles() {
-		return ((FeatureMap)getGroup()).list(WebPackage.Literals.WEB_APP__SECURITY_ROLES);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getEnvEntries() {
-		return ((FeatureMap)getGroup()).list(WebPackage.Literals.WEB_APP__ENV_ENTRIES);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getEjbRefs() {
-		return ((FeatureMap)getGroup()).list(WebPackage.Literals.WEB_APP__EJB_REFS);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getEjbLocalRefs() {
-		return ((FeatureMap)getGroup()).list(WebPackage.Literals.WEB_APP__EJB_LOCAL_REFS);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getServiceRefs() {
-		return ((FeatureMap)getGroup()).list(WebPackage.Literals.WEB_APP__SERVICE_REFS);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getResourceRefs() {
-		return ((FeatureMap)getGroup()).list(WebPackage.Literals.WEB_APP__RESOURCE_REFS);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getResourceEnvRefs() {
-		return ((FeatureMap)getGroup()).list(WebPackage.Literals.WEB_APP__RESOURCE_ENV_REFS);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getMessageDestinationRefs() {
-		return ((FeatureMap)getGroup()).list(WebPackage.Literals.WEB_APP__MESSAGE_DESTINATION_REFS);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPersistenceContextRefs() {
-		return ((FeatureMap)getGroup()).list(WebPackage.Literals.WEB_APP__PERSISTENCE_CONTEXT_REFS);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPersistenceUnitRefs() {
-		return ((FeatureMap)getGroup()).list(WebPackage.Literals.WEB_APP__PERSISTENCE_UNIT_REFS);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPostConstructs() {
-		return ((FeatureMap)getGroup()).list(WebPackage.Literals.WEB_APP__POST_CONSTRUCTS);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPreDestroys() {
-		return ((FeatureMap)getGroup()).list(WebPackage.Literals.WEB_APP__PRE_DESTROYS);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getMessageDestinations() {
-		return ((FeatureMap)getGroup()).list(WebPackage.Literals.WEB_APP__MESSAGE_DESTINATIONS);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getLocalEncodingMappingsLists() {
-		return ((FeatureMap)getGroup()).list(WebPackage.Literals.WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.WEB_APP__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isMetadataComplete() {
-		return metadataComplete;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @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_APP__METADATA_COMPLETE, oldMetadataComplete, metadataComplete, !oldMetadataCompleteESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @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_APP__METADATA_COMPLETE, oldMetadataComplete, METADATA_COMPLETE_EDEFAULT, oldMetadataCompleteESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetMetadataComplete() {
-		return metadataCompleteESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WebAppVersionType getVersion() {
-		return version;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @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_APP__VERSION, oldVersion, version, !oldVersionESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @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_APP__VERSION, oldVersion, VERSION_EDEFAULT, oldVersionESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetVersion() {
-		return versionESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebPackage.WEB_APP__GROUP:
-				return ((InternalEList)getGroup()).basicRemove(otherEnd, msgs);
-			case WebPackage.WEB_APP__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-			case WebPackage.WEB_APP__DISPLAY_NAMES:
-				return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
-			case WebPackage.WEB_APP__ICONS:
-				return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
-			case WebPackage.WEB_APP__DISTRIBUTABLES:
-				return ((InternalEList)getDistributables()).basicRemove(otherEnd, msgs);
-			case WebPackage.WEB_APP__CONTEXT_PARAMS:
-				return ((InternalEList)getContextParams()).basicRemove(otherEnd, msgs);
-			case WebPackage.WEB_APP__FILTERS:
-				return ((InternalEList)getFilters()).basicRemove(otherEnd, msgs);
-			case WebPackage.WEB_APP__FILTER_MAPPINGS:
-				return ((InternalEList)getFilterMappings()).basicRemove(otherEnd, msgs);
-			case WebPackage.WEB_APP__LISTENERS:
-				return ((InternalEList)getListeners()).basicRemove(otherEnd, msgs);
-			case WebPackage.WEB_APP__SERVLETS:
-				return ((InternalEList)getServlets()).basicRemove(otherEnd, msgs);
-			case WebPackage.WEB_APP__SERVLET_MAPPINGS:
-				return ((InternalEList)getServletMappings()).basicRemove(otherEnd, msgs);
-			case WebPackage.WEB_APP__SESSION_CONFIGS:
-				return ((InternalEList)getSessionConfigs()).basicRemove(otherEnd, msgs);
-			case WebPackage.WEB_APP__MIME_MAPPINGS:
-				return ((InternalEList)getMimeMappings()).basicRemove(otherEnd, msgs);
-			case WebPackage.WEB_APP__WELCOME_FILE_LISTS:
-				return ((InternalEList)getWelcomeFileLists()).basicRemove(otherEnd, msgs);
-			case WebPackage.WEB_APP__ERROR_PAGES:
-				return ((InternalEList)getErrorPages()).basicRemove(otherEnd, msgs);
-			case WebPackage.WEB_APP__JSP_CONFIGS:
-				return ((InternalEList)getJspConfigs()).basicRemove(otherEnd, msgs);
-			case WebPackage.WEB_APP__SECURITY_CONSTRAINTS:
-				return ((InternalEList)getSecurityConstraints()).basicRemove(otherEnd, msgs);
-			case WebPackage.WEB_APP__LOGIN_CONFIGS:
-				return ((InternalEList)getLoginConfigs()).basicRemove(otherEnd, msgs);
-			case WebPackage.WEB_APP__SECURITY_ROLES:
-				return ((InternalEList)getSecurityRoles()).basicRemove(otherEnd, msgs);
-			case WebPackage.WEB_APP__ENV_ENTRIES:
-				return ((InternalEList)getEnvEntries()).basicRemove(otherEnd, msgs);
-			case WebPackage.WEB_APP__EJB_REFS:
-				return ((InternalEList)getEjbRefs()).basicRemove(otherEnd, msgs);
-			case WebPackage.WEB_APP__EJB_LOCAL_REFS:
-				return ((InternalEList)getEjbLocalRefs()).basicRemove(otherEnd, msgs);
-			case WebPackage.WEB_APP__SERVICE_REFS:
-				return ((InternalEList)getServiceRefs()).basicRemove(otherEnd, msgs);
-			case WebPackage.WEB_APP__RESOURCE_REFS:
-				return ((InternalEList)getResourceRefs()).basicRemove(otherEnd, msgs);
-			case WebPackage.WEB_APP__RESOURCE_ENV_REFS:
-				return ((InternalEList)getResourceEnvRefs()).basicRemove(otherEnd, msgs);
-			case WebPackage.WEB_APP__MESSAGE_DESTINATION_REFS:
-				return ((InternalEList)getMessageDestinationRefs()).basicRemove(otherEnd, msgs);
-			case WebPackage.WEB_APP__PERSISTENCE_CONTEXT_REFS:
-				return ((InternalEList)getPersistenceContextRefs()).basicRemove(otherEnd, msgs);
-			case WebPackage.WEB_APP__PERSISTENCE_UNIT_REFS:
-				return ((InternalEList)getPersistenceUnitRefs()).basicRemove(otherEnd, msgs);
-			case WebPackage.WEB_APP__POST_CONSTRUCTS:
-				return ((InternalEList)getPostConstructs()).basicRemove(otherEnd, msgs);
-			case WebPackage.WEB_APP__PRE_DESTROYS:
-				return ((InternalEList)getPreDestroys()).basicRemove(otherEnd, msgs);
-			case WebPackage.WEB_APP__MESSAGE_DESTINATIONS:
-				return ((InternalEList)getMessageDestinations()).basicRemove(otherEnd, msgs);
-			case WebPackage.WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS:
-				return ((InternalEList)getLocalEncodingMappingsLists()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebPackage.WEB_APP__GROUP:
-				if (coreType) return getGroup();
-				return ((FeatureMap.Internal)getGroup()).getWrapper();
-			case WebPackage.WEB_APP__DESCRIPTIONS:
-				return getDescriptions();
-			case WebPackage.WEB_APP__DISPLAY_NAMES:
-				return getDisplayNames();
-			case WebPackage.WEB_APP__ICONS:
-				return getIcons();
-			case WebPackage.WEB_APP__DISTRIBUTABLES:
-				return getDistributables();
-			case WebPackage.WEB_APP__CONTEXT_PARAMS:
-				return getContextParams();
-			case WebPackage.WEB_APP__FILTERS:
-				return getFilters();
-			case WebPackage.WEB_APP__FILTER_MAPPINGS:
-				return getFilterMappings();
-			case WebPackage.WEB_APP__LISTENERS:
-				return getListeners();
-			case WebPackage.WEB_APP__SERVLETS:
-				return getServlets();
-			case WebPackage.WEB_APP__SERVLET_MAPPINGS:
-				return getServletMappings();
-			case WebPackage.WEB_APP__SESSION_CONFIGS:
-				return getSessionConfigs();
-			case WebPackage.WEB_APP__MIME_MAPPINGS:
-				return getMimeMappings();
-			case WebPackage.WEB_APP__WELCOME_FILE_LISTS:
-				return getWelcomeFileLists();
-			case WebPackage.WEB_APP__ERROR_PAGES:
-				return getErrorPages();
-			case WebPackage.WEB_APP__JSP_CONFIGS:
-				return getJspConfigs();
-			case WebPackage.WEB_APP__SECURITY_CONSTRAINTS:
-				return getSecurityConstraints();
-			case WebPackage.WEB_APP__LOGIN_CONFIGS:
-				return getLoginConfigs();
-			case WebPackage.WEB_APP__SECURITY_ROLES:
-				return getSecurityRoles();
-			case WebPackage.WEB_APP__ENV_ENTRIES:
-				return getEnvEntries();
-			case WebPackage.WEB_APP__EJB_REFS:
-				return getEjbRefs();
-			case WebPackage.WEB_APP__EJB_LOCAL_REFS:
-				return getEjbLocalRefs();
-			case WebPackage.WEB_APP__SERVICE_REFS:
-				return getServiceRefs();
-			case WebPackage.WEB_APP__RESOURCE_REFS:
-				return getResourceRefs();
-			case WebPackage.WEB_APP__RESOURCE_ENV_REFS:
-				return getResourceEnvRefs();
-			case WebPackage.WEB_APP__MESSAGE_DESTINATION_REFS:
-				return getMessageDestinationRefs();
-			case WebPackage.WEB_APP__PERSISTENCE_CONTEXT_REFS:
-				return getPersistenceContextRefs();
-			case WebPackage.WEB_APP__PERSISTENCE_UNIT_REFS:
-				return getPersistenceUnitRefs();
-			case WebPackage.WEB_APP__POST_CONSTRUCTS:
-				return getPostConstructs();
-			case WebPackage.WEB_APP__PRE_DESTROYS:
-				return getPreDestroys();
-			case WebPackage.WEB_APP__MESSAGE_DESTINATIONS:
-				return getMessageDestinations();
-			case WebPackage.WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS:
-				return getLocalEncodingMappingsLists();
-			case WebPackage.WEB_APP__ID:
-				return getId();
-			case WebPackage.WEB_APP__METADATA_COMPLETE:
-				return isMetadataComplete() ? Boolean.TRUE : Boolean.FALSE;
-			case WebPackage.WEB_APP__VERSION:
-				return getVersion();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebPackage.WEB_APP__GROUP:
-				((FeatureMap.Internal)getGroup()).set(newValue);
-				return;
-			case WebPackage.WEB_APP__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case WebPackage.WEB_APP__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				getDisplayNames().addAll((Collection)newValue);
-				return;
-			case WebPackage.WEB_APP__ICONS:
-				getIcons().clear();
-				getIcons().addAll((Collection)newValue);
-				return;
-			case WebPackage.WEB_APP__DISTRIBUTABLES:
-				getDistributables().clear();
-				getDistributables().addAll((Collection)newValue);
-				return;
-			case WebPackage.WEB_APP__CONTEXT_PARAMS:
-				getContextParams().clear();
-				getContextParams().addAll((Collection)newValue);
-				return;
-			case WebPackage.WEB_APP__FILTERS:
-				getFilters().clear();
-				getFilters().addAll((Collection)newValue);
-				return;
-			case WebPackage.WEB_APP__FILTER_MAPPINGS:
-				getFilterMappings().clear();
-				getFilterMappings().addAll((Collection)newValue);
-				return;
-			case WebPackage.WEB_APP__LISTENERS:
-				getListeners().clear();
-				getListeners().addAll((Collection)newValue);
-				return;
-			case WebPackage.WEB_APP__SERVLETS:
-				getServlets().clear();
-				getServlets().addAll((Collection)newValue);
-				return;
-			case WebPackage.WEB_APP__SERVLET_MAPPINGS:
-				getServletMappings().clear();
-				getServletMappings().addAll((Collection)newValue);
-				return;
-			case WebPackage.WEB_APP__SESSION_CONFIGS:
-				getSessionConfigs().clear();
-				getSessionConfigs().addAll((Collection)newValue);
-				return;
-			case WebPackage.WEB_APP__MIME_MAPPINGS:
-				getMimeMappings().clear();
-				getMimeMappings().addAll((Collection)newValue);
-				return;
-			case WebPackage.WEB_APP__WELCOME_FILE_LISTS:
-				getWelcomeFileLists().clear();
-				getWelcomeFileLists().addAll((Collection)newValue);
-				return;
-			case WebPackage.WEB_APP__ERROR_PAGES:
-				getErrorPages().clear();
-				getErrorPages().addAll((Collection)newValue);
-				return;
-			case WebPackage.WEB_APP__JSP_CONFIGS:
-				getJspConfigs().clear();
-				getJspConfigs().addAll((Collection)newValue);
-				return;
-			case WebPackage.WEB_APP__SECURITY_CONSTRAINTS:
-				getSecurityConstraints().clear();
-				getSecurityConstraints().addAll((Collection)newValue);
-				return;
-			case WebPackage.WEB_APP__LOGIN_CONFIGS:
-				getLoginConfigs().clear();
-				getLoginConfigs().addAll((Collection)newValue);
-				return;
-			case WebPackage.WEB_APP__SECURITY_ROLES:
-				getSecurityRoles().clear();
-				getSecurityRoles().addAll((Collection)newValue);
-				return;
-			case WebPackage.WEB_APP__ENV_ENTRIES:
-				getEnvEntries().clear();
-				getEnvEntries().addAll((Collection)newValue);
-				return;
-			case WebPackage.WEB_APP__EJB_REFS:
-				getEjbRefs().clear();
-				getEjbRefs().addAll((Collection)newValue);
-				return;
-			case WebPackage.WEB_APP__EJB_LOCAL_REFS:
-				getEjbLocalRefs().clear();
-				getEjbLocalRefs().addAll((Collection)newValue);
-				return;
-			case WebPackage.WEB_APP__SERVICE_REFS:
-				getServiceRefs().clear();
-				getServiceRefs().addAll((Collection)newValue);
-				return;
-			case WebPackage.WEB_APP__RESOURCE_REFS:
-				getResourceRefs().clear();
-				getResourceRefs().addAll((Collection)newValue);
-				return;
-			case WebPackage.WEB_APP__RESOURCE_ENV_REFS:
-				getResourceEnvRefs().clear();
-				getResourceEnvRefs().addAll((Collection)newValue);
-				return;
-			case WebPackage.WEB_APP__MESSAGE_DESTINATION_REFS:
-				getMessageDestinationRefs().clear();
-				getMessageDestinationRefs().addAll((Collection)newValue);
-				return;
-			case WebPackage.WEB_APP__PERSISTENCE_CONTEXT_REFS:
-				getPersistenceContextRefs().clear();
-				getPersistenceContextRefs().addAll((Collection)newValue);
-				return;
-			case WebPackage.WEB_APP__PERSISTENCE_UNIT_REFS:
-				getPersistenceUnitRefs().clear();
-				getPersistenceUnitRefs().addAll((Collection)newValue);
-				return;
-			case WebPackage.WEB_APP__POST_CONSTRUCTS:
-				getPostConstructs().clear();
-				getPostConstructs().addAll((Collection)newValue);
-				return;
-			case WebPackage.WEB_APP__PRE_DESTROYS:
-				getPreDestroys().clear();
-				getPreDestroys().addAll((Collection)newValue);
-				return;
-			case WebPackage.WEB_APP__MESSAGE_DESTINATIONS:
-				getMessageDestinations().clear();
-				getMessageDestinations().addAll((Collection)newValue);
-				return;
-			case WebPackage.WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS:
-				getLocalEncodingMappingsLists().clear();
-				getLocalEncodingMappingsLists().addAll((Collection)newValue);
-				return;
-			case WebPackage.WEB_APP__ID:
-				setId((String)newValue);
-				return;
-			case WebPackage.WEB_APP__METADATA_COMPLETE:
-				setMetadataComplete(((Boolean)newValue).booleanValue());
-				return;
-			case WebPackage.WEB_APP__VERSION:
-				setVersion((WebAppVersionType)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebPackage.WEB_APP__GROUP:
-				getGroup().clear();
-				return;
-			case WebPackage.WEB_APP__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case WebPackage.WEB_APP__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				return;
-			case WebPackage.WEB_APP__ICONS:
-				getIcons().clear();
-				return;
-			case WebPackage.WEB_APP__DISTRIBUTABLES:
-				getDistributables().clear();
-				return;
-			case WebPackage.WEB_APP__CONTEXT_PARAMS:
-				getContextParams().clear();
-				return;
-			case WebPackage.WEB_APP__FILTERS:
-				getFilters().clear();
-				return;
-			case WebPackage.WEB_APP__FILTER_MAPPINGS:
-				getFilterMappings().clear();
-				return;
-			case WebPackage.WEB_APP__LISTENERS:
-				getListeners().clear();
-				return;
-			case WebPackage.WEB_APP__SERVLETS:
-				getServlets().clear();
-				return;
-			case WebPackage.WEB_APP__SERVLET_MAPPINGS:
-				getServletMappings().clear();
-				return;
-			case WebPackage.WEB_APP__SESSION_CONFIGS:
-				getSessionConfigs().clear();
-				return;
-			case WebPackage.WEB_APP__MIME_MAPPINGS:
-				getMimeMappings().clear();
-				return;
-			case WebPackage.WEB_APP__WELCOME_FILE_LISTS:
-				getWelcomeFileLists().clear();
-				return;
-			case WebPackage.WEB_APP__ERROR_PAGES:
-				getErrorPages().clear();
-				return;
-			case WebPackage.WEB_APP__JSP_CONFIGS:
-				getJspConfigs().clear();
-				return;
-			case WebPackage.WEB_APP__SECURITY_CONSTRAINTS:
-				getSecurityConstraints().clear();
-				return;
-			case WebPackage.WEB_APP__LOGIN_CONFIGS:
-				getLoginConfigs().clear();
-				return;
-			case WebPackage.WEB_APP__SECURITY_ROLES:
-				getSecurityRoles().clear();
-				return;
-			case WebPackage.WEB_APP__ENV_ENTRIES:
-				getEnvEntries().clear();
-				return;
-			case WebPackage.WEB_APP__EJB_REFS:
-				getEjbRefs().clear();
-				return;
-			case WebPackage.WEB_APP__EJB_LOCAL_REFS:
-				getEjbLocalRefs().clear();
-				return;
-			case WebPackage.WEB_APP__SERVICE_REFS:
-				getServiceRefs().clear();
-				return;
-			case WebPackage.WEB_APP__RESOURCE_REFS:
-				getResourceRefs().clear();
-				return;
-			case WebPackage.WEB_APP__RESOURCE_ENV_REFS:
-				getResourceEnvRefs().clear();
-				return;
-			case WebPackage.WEB_APP__MESSAGE_DESTINATION_REFS:
-				getMessageDestinationRefs().clear();
-				return;
-			case WebPackage.WEB_APP__PERSISTENCE_CONTEXT_REFS:
-				getPersistenceContextRefs().clear();
-				return;
-			case WebPackage.WEB_APP__PERSISTENCE_UNIT_REFS:
-				getPersistenceUnitRefs().clear();
-				return;
-			case WebPackage.WEB_APP__POST_CONSTRUCTS:
-				getPostConstructs().clear();
-				return;
-			case WebPackage.WEB_APP__PRE_DESTROYS:
-				getPreDestroys().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__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case WebPackage.WEB_APP__METADATA_COMPLETE:
-				unsetMetadataComplete();
-				return;
-			case WebPackage.WEB_APP__VERSION:
-				unsetVersion();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebPackage.WEB_APP__GROUP:
-				return group != null && !group.isEmpty();
-			case WebPackage.WEB_APP__DESCRIPTIONS:
-				return !getDescriptions().isEmpty();
-			case WebPackage.WEB_APP__DISPLAY_NAMES:
-				return !getDisplayNames().isEmpty();
-			case WebPackage.WEB_APP__ICONS:
-				return !getIcons().isEmpty();
-			case WebPackage.WEB_APP__DISTRIBUTABLES:
-				return !getDistributables().isEmpty();
-			case WebPackage.WEB_APP__CONTEXT_PARAMS:
-				return !getContextParams().isEmpty();
-			case WebPackage.WEB_APP__FILTERS:
-				return !getFilters().isEmpty();
-			case WebPackage.WEB_APP__FILTER_MAPPINGS:
-				return !getFilterMappings().isEmpty();
-			case WebPackage.WEB_APP__LISTENERS:
-				return !getListeners().isEmpty();
-			case WebPackage.WEB_APP__SERVLETS:
-				return !getServlets().isEmpty();
-			case WebPackage.WEB_APP__SERVLET_MAPPINGS:
-				return !getServletMappings().isEmpty();
-			case WebPackage.WEB_APP__SESSION_CONFIGS:
-				return !getSessionConfigs().isEmpty();
-			case WebPackage.WEB_APP__MIME_MAPPINGS:
-				return !getMimeMappings().isEmpty();
-			case WebPackage.WEB_APP__WELCOME_FILE_LISTS:
-				return !getWelcomeFileLists().isEmpty();
-			case WebPackage.WEB_APP__ERROR_PAGES:
-				return !getErrorPages().isEmpty();
-			case WebPackage.WEB_APP__JSP_CONFIGS:
-				return !getJspConfigs().isEmpty();
-			case WebPackage.WEB_APP__SECURITY_CONSTRAINTS:
-				return !getSecurityConstraints().isEmpty();
-			case WebPackage.WEB_APP__LOGIN_CONFIGS:
-				return !getLoginConfigs().isEmpty();
-			case WebPackage.WEB_APP__SECURITY_ROLES:
-				return !getSecurityRoles().isEmpty();
-			case WebPackage.WEB_APP__ENV_ENTRIES:
-				return !getEnvEntries().isEmpty();
-			case WebPackage.WEB_APP__EJB_REFS:
-				return !getEjbRefs().isEmpty();
-			case WebPackage.WEB_APP__EJB_LOCAL_REFS:
-				return !getEjbLocalRefs().isEmpty();
-			case WebPackage.WEB_APP__SERVICE_REFS:
-				return !getServiceRefs().isEmpty();
-			case WebPackage.WEB_APP__RESOURCE_REFS:
-				return !getResourceRefs().isEmpty();
-			case WebPackage.WEB_APP__RESOURCE_ENV_REFS:
-				return !getResourceEnvRefs().isEmpty();
-			case WebPackage.WEB_APP__MESSAGE_DESTINATION_REFS:
-				return !getMessageDestinationRefs().isEmpty();
-			case WebPackage.WEB_APP__PERSISTENCE_CONTEXT_REFS:
-				return !getPersistenceContextRefs().isEmpty();
-			case WebPackage.WEB_APP__PERSISTENCE_UNIT_REFS:
-				return !getPersistenceUnitRefs().isEmpty();
-			case WebPackage.WEB_APP__POST_CONSTRUCTS:
-				return !getPostConstructs().isEmpty();
-			case WebPackage.WEB_APP__PRE_DESTROYS:
-				return !getPreDestroys().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__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case WebPackage.WEB_APP__METADATA_COMPLETE:
-				return isSetMetadataComplete();
-			case WebPackage.WEB_APP__VERSION:
-				return isSetVersion();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	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();
-	}
-
-} //WebAppImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WebFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WebFactoryImpl.java
deleted file mode 100644
index bba32cba9..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WebFactoryImpl.java
+++ /dev/null
@@ -1,789 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.web.internal.impl;
-
-import java.math.BigInteger;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-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.emf.ecore.util.Diagnostician;
-
-import org.eclipse.emf.ecore.xml.type.XMLTypeFactory;
-import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-
-import org.eclipse.jst.javaee.web.*;
-
-import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class WebFactoryImpl extends EFactoryImpl implements WebFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static WebFactory init() {
-		try {
-			WebFactory theWebFactory = (WebFactory)EPackage.Registry.INSTANCE.getEFactory("http://java.sun.com/xml/ns/javaee/web"); //$NON-NLS-1$ 
-			if (theWebFactory != null) {
-				return theWebFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new WebFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WebFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case WebPackage.AUTH_CONSTRAINT: return (EObject)createAuthConstraint();
-			case WebPackage.ERROR_PAGE: return (EObject)createErrorPage();
-			case WebPackage.FILTER: return (EObject)createFilter();
-			case WebPackage.FILTER_MAPPING: return (EObject)createFilterMapping();
-			case WebPackage.FORM_LOGIN_CONFIG: return (EObject)createFormLoginConfig();
-			case WebPackage.LOCALE_ENCODING_MAPPING: return (EObject)createLocaleEncodingMapping();
-			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.SECURITY_CONSTRAINT: return (EObject)createSecurityConstraint();
-			case WebPackage.SERVLET: return (EObject)createServlet();
-			case WebPackage.SERVLET_MAPPING: return (EObject)createServletMapping();
-			case WebPackage.SESSION_CONFIG: return (EObject)createSessionConfig();
-			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_RESOURCE_COLLECTION: return (EObject)createWebResourceCollection();
-			case WebPackage.WELCOME_FILE_LIST: return (EObject)createWelcomeFileList();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case WebPackage.DISPATCHER_TYPE:
-				return createDispatcherTypeFromString(eDataType, initialValue);
-			case WebPackage.NULL_CHAR_TYPE:
-				return createNullCharTypeFromString(eDataType, initialValue);
-			case WebPackage.TRANSPORT_GUARANTEE_TYPE:
-				return createTransportGuaranteeTypeFromString(eDataType, initialValue);
-			case WebPackage.WEB_APP_VERSION_TYPE:
-				return createWebAppVersionTypeFromString(eDataType, initialValue);
-			case WebPackage.AUTH_METHOD_TYPE:
-				return createAuthMethodTypeFromString(eDataType, initialValue);
-			case WebPackage.DISPATCHER_TYPE_OBJECT:
-				return createDispatcherTypeObjectFromString(eDataType, initialValue);
-			case WebPackage.ENCODING_TYPE:
-				return createEncodingTypeFromString(eDataType, initialValue);
-			case WebPackage.ERROR_CODE_TYPE:
-				return createErrorCodeTypeFromString(eDataType, initialValue);
-			case WebPackage.FILTER_NAME_TYPE:
-				return createFilterNameTypeFromString(eDataType, initialValue);
-			case WebPackage.HTTP_METHOD_TYPE:
-				return createHttpMethodTypeFromString(eDataType, initialValue);
-			case WebPackage.LOAD_ON_STARTUP_TYPE:
-				return createLoadOnStartupTypeFromString(eDataType, initialValue);
-			case WebPackage.LOCALE_TYPE:
-				return createLocaleTypeFromString(eDataType, initialValue);
-			case WebPackage.MIME_TYPE_TYPE:
-				return createMimeTypeTypeFromString(eDataType, initialValue);
-			case WebPackage.NON_EMPTY_STRING_TYPE:
-				return createNonEmptyStringTypeFromString(eDataType, initialValue);
-			case WebPackage.NULL_CHAR_TYPE_OBJECT:
-				return createNullCharTypeObjectFromString(eDataType, initialValue);
-			case WebPackage.SERVLET_NAME_TYPE:
-				return createServletNameTypeFromString(eDataType, initialValue);
-			case WebPackage.TRANSPORT_GUARANTEE_TYPE_OBJECT:
-				return createTransportGuaranteeTypeObjectFromString(eDataType, initialValue);
-			case WebPackage.WAR_PATH_TYPE:
-				return createWarPathTypeFromString(eDataType, initialValue);
-			case WebPackage.WEB_APP_VERSION_TYPE_OBJECT:
-				return createWebAppVersionTypeObjectFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case WebPackage.DISPATCHER_TYPE:
-				return convertDispatcherTypeToString(eDataType, instanceValue);
-			case WebPackage.NULL_CHAR_TYPE:
-				return convertNullCharTypeToString(eDataType, instanceValue);
-			case WebPackage.TRANSPORT_GUARANTEE_TYPE:
-				return convertTransportGuaranteeTypeToString(eDataType, instanceValue);
-			case WebPackage.WEB_APP_VERSION_TYPE:
-				return convertWebAppVersionTypeToString(eDataType, instanceValue);
-			case WebPackage.AUTH_METHOD_TYPE:
-				return convertAuthMethodTypeToString(eDataType, instanceValue);
-			case WebPackage.DISPATCHER_TYPE_OBJECT:
-				return convertDispatcherTypeObjectToString(eDataType, instanceValue);
-			case WebPackage.ENCODING_TYPE:
-				return convertEncodingTypeToString(eDataType, instanceValue);
-			case WebPackage.ERROR_CODE_TYPE:
-				return convertErrorCodeTypeToString(eDataType, instanceValue);
-			case WebPackage.FILTER_NAME_TYPE:
-				return convertFilterNameTypeToString(eDataType, instanceValue);
-			case WebPackage.HTTP_METHOD_TYPE:
-				return convertHttpMethodTypeToString(eDataType, instanceValue);
-			case WebPackage.LOAD_ON_STARTUP_TYPE:
-				return convertLoadOnStartupTypeToString(eDataType, instanceValue);
-			case WebPackage.LOCALE_TYPE:
-				return convertLocaleTypeToString(eDataType, instanceValue);
-			case WebPackage.MIME_TYPE_TYPE:
-				return convertMimeTypeTypeToString(eDataType, instanceValue);
-			case WebPackage.NON_EMPTY_STRING_TYPE:
-				return convertNonEmptyStringTypeToString(eDataType, instanceValue);
-			case WebPackage.NULL_CHAR_TYPE_OBJECT:
-				return convertNullCharTypeObjectToString(eDataType, instanceValue);
-			case WebPackage.SERVLET_NAME_TYPE:
-				return convertServletNameTypeToString(eDataType, instanceValue);
-			case WebPackage.TRANSPORT_GUARANTEE_TYPE_OBJECT:
-				return convertTransportGuaranteeTypeObjectToString(eDataType, instanceValue);
-			case WebPackage.WAR_PATH_TYPE:
-				return convertWarPathTypeToString(eDataType, instanceValue);
-			case WebPackage.WEB_APP_VERSION_TYPE_OBJECT:
-				return convertWebAppVersionTypeObjectToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AuthConstraint createAuthConstraint() {
-		AuthConstraintImpl authConstraint = new AuthConstraintImpl();
-		return authConstraint;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ErrorPage createErrorPage() {
-		ErrorPageImpl errorPage = new ErrorPageImpl();
-		return errorPage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Filter createFilter() {
-		FilterImpl filter = new FilterImpl();
-		return filter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FilterMapping createFilterMapping() {
-		FilterMappingImpl filterMapping = new FilterMappingImpl();
-		return filterMapping;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FormLoginConfig createFormLoginConfig() {
-		FormLoginConfigImpl formLoginConfig = new FormLoginConfigImpl();
-		return formLoginConfig;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LocaleEncodingMapping createLocaleEncodingMapping() {
-		LocaleEncodingMappingImpl localeEncodingMapping = new LocaleEncodingMappingImpl();
-		return localeEncodingMapping;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LocaleEncodingMappingList createLocaleEncodingMappingList() {
-		LocaleEncodingMappingListImpl localeEncodingMappingList = new LocaleEncodingMappingListImpl();
-		return localeEncodingMappingList;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LoginConfig createLoginConfig() {
-		LoginConfigImpl loginConfig = new LoginConfigImpl();
-		return loginConfig;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MimeMapping createMimeMapping() {
-		MimeMappingImpl mimeMapping = new MimeMappingImpl();
-		return mimeMapping;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SecurityConstraint createSecurityConstraint() {
-		SecurityConstraintImpl securityConstraint = new SecurityConstraintImpl();
-		return securityConstraint;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Servlet createServlet() {
-		ServletImpl servlet = new ServletImpl();
-		return servlet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ServletMapping createServletMapping() {
-		ServletMappingImpl servletMapping = new ServletMappingImpl();
-		return servletMapping;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SessionConfig createSessionConfig() {
-		SessionConfigImpl sessionConfig = new SessionConfigImpl();
-		return sessionConfig;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public UserDataConstraint createUserDataConstraint() {
-		UserDataConstraintImpl userDataConstraint = new UserDataConstraintImpl();
-		return userDataConstraint;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WebApp createWebApp() {
-		WebAppImpl webApp = new WebAppImpl();
-		return webApp;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WebAppDeploymentDescriptor createWebAppDeploymentDescriptor() {
-		WebAppDeploymentDescriptorImpl webAppDeploymentDescriptor = new WebAppDeploymentDescriptorImpl();
-		return webAppDeploymentDescriptor;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WebResourceCollection createWebResourceCollection() {
-		WebResourceCollectionImpl webResourceCollection = new WebResourceCollectionImpl();
-		return webResourceCollection;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WelcomeFileList createWelcomeFileList() {
-		WelcomeFileListImpl welcomeFileList = new WelcomeFileListImpl();
-		return welcomeFileList;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DispatcherType createDispatcherTypeFromString(EDataType eDataType, String initialValue) {
-		DispatcherType result = DispatcherType.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;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertDispatcherTypeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NullCharType createNullCharTypeFromString(EDataType eDataType, String initialValue) {
-		NullCharType result = NullCharType.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;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertNullCharTypeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @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$
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertTransportGuaranteeTypeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WebAppVersionType createWebAppVersionTypeFromString(EDataType eDataType, String initialValue) {
-		WebAppVersionType result = WebAppVersionType.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;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertWebAppVersionTypeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createAuthMethodTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.TOKEN, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertAuthMethodTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.Literals.TOKEN, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DispatcherType createDispatcherTypeObjectFromString(EDataType eDataType, String initialValue) {
-		return (DispatcherType)createDispatcherTypeFromString(WebPackage.Literals.DISPATCHER_TYPE, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertDispatcherTypeObjectToString(EDataType eDataType, Object instanceValue) {
-		return convertDispatcherTypeToString(WebPackage.Literals.DISPATCHER_TYPE, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createEncodingTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.STRING, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertEncodingTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.Literals.STRING, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger createErrorCodeTypeFromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.POSITIVE_INTEGER, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertErrorCodeTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.Literals.POSITIVE_INTEGER, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createFilterNameTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)createNonEmptyStringTypeFromString(WebPackage.Literals.NON_EMPTY_STRING_TYPE, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertFilterNameTypeToString(EDataType eDataType, Object instanceValue) {
-		return convertNonEmptyStringTypeToString(WebPackage.Literals.NON_EMPTY_STRING_TYPE, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createHttpMethodTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.TOKEN, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertHttpMethodTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.Literals.TOKEN, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object createLoadOnStartupTypeFromString(EDataType eDataType, String initialValue) {
-		if (initialValue == null) return null;
-		Object result = null;
-		RuntimeException exception = null;
-		try {
-			result = (Object)createNullCharTypeFromString(WebPackage.Literals.NULL_CHAR_TYPE, initialValue);
-			if (result != null && Diagnostician.INSTANCE.validate(eDataType, result, null, null)) {
-				return result;
-			}
-		}
-		catch (RuntimeException e) {
-			exception = e;
-		}
-		try {
-			result = (Object)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.INTEGER, initialValue);
-			if (result != null && Diagnostician.INSTANCE.validate(eDataType, result, null, null)) {
-				return result;
-			}
-		}
-		catch (RuntimeException e) {
-			exception = e;
-		}
-		if (result != null || exception == null) return result;
-    
-		throw exception;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public String convertLoadOnStartupTypeToString(EDataType eDataType, Object instanceValue) {
-		if (instanceValue == null) return null;
-		if (WebPackage.Literals.NULL_CHAR_TYPE.isInstance(instanceValue)) {
-			try {
-				String value = convertNullCharTypeToString(WebPackage.Literals.NULL_CHAR_TYPE, instanceValue);
-				if (value != null) return value;
-			}
-			catch (Exception e) {
-			}
-		}
-		if (XMLTypePackage.Literals.INTEGER.isInstance(instanceValue)) {
-			try {
-				String value = XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.Literals.INTEGER, instanceValue);
-				if (value != null) return value;
-			}
-			catch (Exception e) {
-			}
-		}
-		String value = instanceValue.toString();
-		if (value != null) return value;
-		throw new IllegalArgumentException("Invalid value: '"+instanceValue+"' for datatype :"+eDataType.getName());
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createLocaleTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.STRING, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertLocaleTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.Literals.STRING, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createMimeTypeTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.TOKEN, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertMimeTypeTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.Literals.TOKEN, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createNonEmptyStringTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.TOKEN, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertNonEmptyStringTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.Literals.TOKEN, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NullCharType createNullCharTypeObjectFromString(EDataType eDataType, String initialValue) {
-		return (NullCharType)createNullCharTypeFromString(WebPackage.Literals.NULL_CHAR_TYPE, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertNullCharTypeObjectToString(EDataType eDataType, Object instanceValue) {
-		return convertNullCharTypeToString(WebPackage.Literals.NULL_CHAR_TYPE, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createServletNameTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)createNonEmptyStringTypeFromString(WebPackage.Literals.NON_EMPTY_STRING_TYPE, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertServletNameTypeToString(EDataType eDataType, Object instanceValue) {
-		return convertNonEmptyStringTypeToString(WebPackage.Literals.NON_EMPTY_STRING_TYPE, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TransportGuaranteeType createTransportGuaranteeTypeObjectFromString(EDataType eDataType, String initialValue) {
-		return (TransportGuaranteeType)createTransportGuaranteeTypeFromString(WebPackage.Literals.TRANSPORT_GUARANTEE_TYPE, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertTransportGuaranteeTypeObjectToString(EDataType eDataType, Object instanceValue) {
-		return convertTransportGuaranteeTypeToString(WebPackage.Literals.TRANSPORT_GUARANTEE_TYPE, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createWarPathTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.TOKEN, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertWarPathTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.Literals.TOKEN, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WebAppVersionType createWebAppVersionTypeObjectFromString(EDataType eDataType, String initialValue) {
-		return (WebAppVersionType)createWebAppVersionTypeFromString(WebPackage.Literals.WEB_APP_VERSION_TYPE, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertWebAppVersionTypeObjectToString(EDataType eDataType, Object instanceValue) {
-		return convertWebAppVersionTypeToString(WebPackage.Literals.WEB_APP_VERSION_TYPE, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WebPackage getWebPackage() {
-		return (WebPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	public static WebPackage getPackage() {
-		return WebPackage.eINSTANCE;
-	}
-
-} //WebFactoryImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WebPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WebPackageImpl.java
deleted file mode 100644
index 9a42bca54..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WebPackageImpl.java
+++ /dev/null
@@ -1,3248 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.web.internal.impl;
-
-import java.math.BigInteger;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EValidator;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.emf.ecore.xml.namespace.XMLNamespacePackage;
-
-import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-
-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.jsp.internal.impl.JspPackageImpl;
-
-import org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage;
-
-import org.eclipse.jst.javaee.web.AuthConstraint;
-import org.eclipse.jst.javaee.web.DispatcherType;
-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.FormLoginConfig;
-import org.eclipse.jst.javaee.web.LocaleEncodingMapping;
-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.NullCharType;
-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.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.WebFactory;
-import org.eclipse.jst.javaee.web.WebResourceCollection;
-import org.eclipse.jst.javaee.web.WelcomeFileList;
-
-import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
-
-import org.eclipse.jst.javaee.web.internal.util.WebValidator;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class WebPackageImpl extends EPackageImpl implements WebPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass authConstraintEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass errorPageEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass filterEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass filterMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass formLoginConfigEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass localeEncodingMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass localeEncodingMappingListEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass loginConfigEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass mimeMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass securityConstraintEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass servletEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass servletMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass sessionConfigEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass userDataConstraintEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass webAppEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass webAppDeploymentDescriptorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass webResourceCollectionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass welcomeFileListEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum dispatcherTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum nullCharTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum transportGuaranteeTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum webAppVersionTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType authMethodTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType dispatcherTypeObjectEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType encodingTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType errorCodeTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType filterNameTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType httpMethodTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType loadOnStartupTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType localeTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType mimeTypeTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType nonEmptyStringTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType nullCharTypeObjectEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType servletNameTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType transportGuaranteeTypeObjectEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType warPathTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType webAppVersionTypeObjectEDataType = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>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.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private WebPackageImpl() {
-		super(eNS_URI, WebFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> 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.
-	 * <p>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.
-	 * <p>Invocation of this method will not affect any packages that have
-	 * already been initialized.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static WebPackage init() {
-		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());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		XMLNamespacePackage.eINSTANCE.eClass();
-		XMLTypePackage.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);
-		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);
-		JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) instanceof JspPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) : JspPackage.eINSTANCE);
-
-		// Create package meta-data objects
-		theWebPackage.createPackageContents();
-		theApplicationPackage.createPackageContents();
-		theJavaeePackage.createPackageContents();
-		theEjbPackage.createPackageContents();
-		theApplicationclientPackage.createPackageContents();
-		theJspPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theWebPackage.initializePackageContents();
-		theApplicationPackage.initializePackageContents();
-		theJavaeePackage.initializePackageContents();
-		theEjbPackage.initializePackageContents();
-		theApplicationclientPackage.initializePackageContents();
-		theJspPackage.initializePackageContents();
-
-		// Register package validator
-		EValidator.Registry.INSTANCE.put
-			(theWebPackage, 
-			 new EValidator.Descriptor() {
-				 public EValidator getEValidator() {
-					 return WebValidator.INSTANCE;
-				 }
-			 });
-
-		// Mark meta-data to indicate it can't be changed
-		theWebPackage.freeze();
-
-		return theWebPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getAuthConstraint() {
-		return authConstraintEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getAuthConstraint_Descriptions() {
-		return (EReference)authConstraintEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAuthConstraint_RoleNames() {
-		return (EAttribute)authConstraintEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAuthConstraint_Id() {
-		return (EAttribute)authConstraintEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getErrorPage() {
-		return errorPageEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getErrorPage_ErrorCode() {
-		return (EAttribute)errorPageEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getErrorPage_ExceptionType() {
-		return (EAttribute)errorPageEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getErrorPage_Location() {
-		return (EAttribute)errorPageEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getErrorPage_Id() {
-		return (EAttribute)errorPageEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getFilter() {
-		return filterEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getFilter_Descriptions() {
-		return (EReference)filterEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getFilter_DisplayNames() {
-		return (EReference)filterEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getFilter_Icons() {
-		return (EReference)filterEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFilter_FilterName() {
-		return (EAttribute)filterEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFilter_FilterClass() {
-		return (EAttribute)filterEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getFilter_InitParams() {
-		return (EReference)filterEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFilter_Id() {
-		return (EAttribute)filterEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getFilterMapping() {
-		return filterMappingEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFilterMapping_FilterName() {
-		return (EAttribute)filterMappingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFilterMapping_Group() {
-		return (EAttribute)filterMappingEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getFilterMapping_UrlPatterns() {
-		return (EReference)filterMappingEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFilterMapping_ServletNames() {
-		return (EAttribute)filterMappingEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFilterMapping_Dispatchers() {
-		return (EAttribute)filterMappingEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFilterMapping_Id() {
-		return (EAttribute)filterMappingEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getFormLoginConfig() {
-		return formLoginConfigEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFormLoginConfig_FormLoginPage() {
-		return (EAttribute)formLoginConfigEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFormLoginConfig_FormErrorPage() {
-		return (EAttribute)formLoginConfigEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFormLoginConfig_Id() {
-		return (EAttribute)formLoginConfigEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getLocaleEncodingMapping() {
-		return localeEncodingMappingEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getLocaleEncodingMapping_Locale() {
-		return (EAttribute)localeEncodingMappingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getLocaleEncodingMapping_Encoding() {
-		return (EAttribute)localeEncodingMappingEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getLocaleEncodingMapping_Id() {
-		return (EAttribute)localeEncodingMappingEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getLocaleEncodingMappingList() {
-		return localeEncodingMappingListEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getLocaleEncodingMappingList_LocalEncodingMappings() {
-		return (EReference)localeEncodingMappingListEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getLocaleEncodingMappingList_Id() {
-		return (EAttribute)localeEncodingMappingListEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getLoginConfig() {
-		return loginConfigEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getLoginConfig_AuthMethod() {
-		return (EAttribute)loginConfigEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getLoginConfig_RealmName() {
-		return (EAttribute)loginConfigEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getLoginConfig_FormLoginConfig() {
-		return (EReference)loginConfigEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getLoginConfig_Id() {
-		return (EAttribute)loginConfigEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMimeMapping() {
-		return mimeMappingEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMimeMapping_Extension() {
-		return (EAttribute)mimeMappingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMimeMapping_MimeType() {
-		return (EAttribute)mimeMappingEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMimeMapping_Id() {
-		return (EAttribute)mimeMappingEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getSecurityConstraint() {
-		return securityConstraintEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSecurityConstraint_DisplayNames() {
-		return (EReference)securityConstraintEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSecurityConstraint_WebResourceCollections() {
-		return (EReference)securityConstraintEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSecurityConstraint_AuthConstraint() {
-		return (EReference)securityConstraintEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSecurityConstraint_UserDataConstraint() {
-		return (EReference)securityConstraintEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSecurityConstraint_Id() {
-		return (EAttribute)securityConstraintEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getServlet() {
-		return servletEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getServlet_Descriptions() {
-		return (EReference)servletEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getServlet_DisplayNames() {
-		return (EReference)servletEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getServlet_Icons() {
-		return (EReference)servletEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getServlet_ServletName() {
-		return (EAttribute)servletEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getServlet_ServletClass() {
-		return (EAttribute)servletEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getServlet_JspFile() {
-		return (EAttribute)servletEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getServlet_InitParams() {
-		return (EReference)servletEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getServlet_LoadOnStartup() {
-		return (EAttribute)servletEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getServlet_RunAs() {
-		return (EReference)servletEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getServlet_SecurityRoleRefs() {
-		return (EReference)servletEClass.getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getServlet_Id() {
-		return (EAttribute)servletEClass.getEStructuralFeatures().get(10);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getServletMapping() {
-		return servletMappingEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getServletMapping_ServletName() {
-		return (EAttribute)servletMappingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getServletMapping_UrlPatterns() {
-		return (EReference)servletMappingEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getServletMapping_Id() {
-		return (EAttribute)servletMappingEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getSessionConfig() {
-		return sessionConfigEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSessionConfig_SessionTimeout() {
-		return (EAttribute)sessionConfigEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSessionConfig_Id() {
-		return (EAttribute)sessionConfigEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getUserDataConstraint() {
-		return userDataConstraintEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getUserDataConstraint_Descriptions() {
-		return (EReference)userDataConstraintEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getUserDataConstraint_TransportGuarantee() {
-		return (EAttribute)userDataConstraintEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getUserDataConstraint_Id() {
-		return (EAttribute)userDataConstraintEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getWebApp() {
-		return webAppEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWebApp_Group() {
-		return (EAttribute)webAppEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebApp_Descriptions() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebApp_DisplayNames() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebApp_Icons() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebApp_Distributables() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebApp_ContextParams() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebApp_Filters() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebApp_FilterMappings() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebApp_Listeners() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebApp_Servlets() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebApp_ServletMappings() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(10);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebApp_SessionConfigs() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(11);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebApp_MimeMappings() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(12);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebApp_WelcomeFileLists() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(13);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebApp_ErrorPages() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(14);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebApp_JspConfigs() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(15);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebApp_SecurityConstraints() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(16);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebApp_LoginConfigs() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(17);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebApp_SecurityRoles() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(18);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebApp_EnvEntries() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(19);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebApp_EjbRefs() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(20);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebApp_EjbLocalRefs() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(21);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebApp_ServiceRefs() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(22);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebApp_ResourceRefs() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(23);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebApp_ResourceEnvRefs() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(24);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebApp_MessageDestinationRefs() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(25);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebApp_PersistenceContextRefs() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(26);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebApp_PersistenceUnitRefs() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(27);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebApp_PostConstructs() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(28);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebApp_PreDestroys() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(29);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebApp_MessageDestinations() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(30);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebApp_LocalEncodingMappingsLists() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(31);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWebApp_Id() {
-		return (EAttribute)webAppEClass.getEStructuralFeatures().get(32);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWebApp_MetadataComplete() {
-		return (EAttribute)webAppEClass.getEStructuralFeatures().get(33);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWebApp_Version() {
-		return (EAttribute)webAppEClass.getEStructuralFeatures().get(34);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getWebAppDeploymentDescriptor() {
-		return webAppDeploymentDescriptorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWebAppDeploymentDescriptor_Mixed() {
-		return (EAttribute)webAppDeploymentDescriptorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebAppDeploymentDescriptor_XMLNSPrefixMap() {
-		return (EReference)webAppDeploymentDescriptorEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebAppDeploymentDescriptor_XSISchemaLocation() {
-		return (EReference)webAppDeploymentDescriptorEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebAppDeploymentDescriptor_WebApp() {
-		return (EReference)webAppDeploymentDescriptorEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getWebResourceCollection() {
-		return webResourceCollectionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWebResourceCollection_WebResourceName() {
-		return (EAttribute)webResourceCollectionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebResourceCollection_Descriptions() {
-		return (EReference)webResourceCollectionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebResourceCollection_UrlPatterns() {
-		return (EReference)webResourceCollectionEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWebResourceCollection_HttpMethods() {
-		return (EAttribute)webResourceCollectionEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWebResourceCollection_Id() {
-		return (EAttribute)webResourceCollectionEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getWelcomeFileList() {
-		return welcomeFileListEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWelcomeFileList_WelcomeFiles() {
-		return (EAttribute)welcomeFileListEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWelcomeFileList_Id() {
-		return (EAttribute)welcomeFileListEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getDispatcherType() {
-		return dispatcherTypeEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getNullCharType() {
-		return nullCharTypeEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getTransportGuaranteeType() {
-		return transportGuaranteeTypeEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getWebAppVersionType() {
-		return webAppVersionTypeEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getAuthMethodType() {
-		return authMethodTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getDispatcherTypeObject() {
-		return dispatcherTypeObjectEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getEncodingType() {
-		return encodingTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getErrorCodeType() {
-		return errorCodeTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getFilterNameType() {
-		return filterNameTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getHttpMethodType() {
-		return httpMethodTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getLoadOnStartupType() {
-		return loadOnStartupTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getLocaleType() {
-		return localeTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getMimeTypeType() {
-		return mimeTypeTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getNonEmptyStringType() {
-		return nonEmptyStringTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getNullCharTypeObject() {
-		return nullCharTypeObjectEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getServletNameType() {
-		return servletNameTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getTransportGuaranteeTypeObject() {
-		return transportGuaranteeTypeObjectEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getWarPathType() {
-		return warPathTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getWebAppVersionTypeObject() {
-		return webAppVersionTypeObjectEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WebFactory getWebFactory() {
-		return (WebFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @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.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @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);
-
-		sessionConfigEClass = createEClass(SESSION_CONFIG);
-		createEAttribute(sessionConfigEClass, SESSION_CONFIG__SESSION_TIMEOUT);
-		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);
-		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);
-
-		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);
-
-		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);
-
-		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);
-		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);
-		transportGuaranteeTypeObjectEDataType = createEDataType(TRANSPORT_GUARANTEE_TYPE_OBJECT);
-		warPathTypeEDataType = createEDataType(WAR_PATH_TYPE);
-		webAppVersionTypeObjectEDataType = createEDataType(WEB_APP_VERSION_TYPE_OBJECT);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @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.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @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);
-
-		// 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$
-
-		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$
-		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", "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$
-
-		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$
-
-		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(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$
-
-		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.ERROR_LITERAL);
-
-		initEEnum(nullCharTypeEEnum, NullCharType.class, "NullCharType"); //$NON-NLS-1$
-		addEEnumLiteral(nullCharTypeEEnum, NullCharType.__LITERAL);
-
-		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);
-
-		// 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$
-
-		// Create resource
-		createResource(eNS_URI);
-
-		// Create annotations
-		// http:///org/eclipse/emf/ecore/util/ExtendedMetaData
-		createExtendedMetaDataAnnotations();
-	}
-
-	/**
-	 * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void createExtendedMetaDataAnnotations() {
-		String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$				
-		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
-		  (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_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{L}-[\\p{Cc}\\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
-		  (getMimeMapping_MimeType(), 
-		   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$
-		   });		
-		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, 
-		   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$
-		   });		
-		addAnnotation
-		  (nullCharTypeEEnum, 
-		   source, 
-		   new String[] {
-			 "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
-		  (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", "display-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (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
-		  (servletEClass, 
-		   source, 
-		   new String[] {
-			 "name", "servletType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getServlet_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
-		  (getServlet_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
-		  (getServlet_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
-		  (getServlet_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$
-		   });			
-		addAnnotation
-		  (getServlet_ServletClass(), 
-		   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$
-		   });		
-		addAnnotation
-		  (getServlet_JspFile(), 
-		   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$
-		   });		
-		addAnnotation
-		  (getServlet_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
-		  (getServlet_LoadOnStartup(), 
-		   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$
-		   });		
-		addAnnotation
-		  (getServlet_RunAs(), 
-		   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$
-		   });		
-		addAnnotation
-		  (getServlet_SecurityRoleRefs(), 
-		   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$
-		   });		
-		addAnnotation
-		  (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$
-		   });		
-		addAnnotation
-		  (getServletMapping_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$
-		   });		
-		addAnnotation
-		  (getServletMapping_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (servletNameTypeEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "servlet-nameType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "baseType", "nonEmptyStringType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (sessionConfigEClass, 
-		   source, 
-		   new String[] {
-			 "name", "session-configType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getSessionConfig_SessionTimeout(), 
-		   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$
-		   });		
-		addAnnotation
-		  (getSessionConfig_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (transportGuaranteeTypeEEnum, 
-		   source, 
-		   new String[] {
-			 "name", "transport-guaranteeType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (transportGuaranteeTypeObjectEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "transport-guaranteeType:Object", //$NON-NLS-1$ //$NON-NLS-2$
-			 "baseType", "transport-guaranteeType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (userDataConstraintEClass, 
-		   source, 
-		   new String[] {
-			 "name", "user-data-constraintType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getUserDataConstraint_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
-		  (getUserDataConstraint_TransportGuarantee(), 
-		   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$
-		   });		
-		addAnnotation
-		  (getUserDataConstraint_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (warPathTypeEDataType, 
-		   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$
-		   });		
-		addAnnotation
-		  (webAppEClass, 
-		   source, 
-		   new String[] {
-			 "name", "web-appType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getWebApp_Group(), 
-		   source, 
-		   new String[] {
-			 "kind", "group", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "group:0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getWebApp_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$
-			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getWebApp_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$
-			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getWebApp_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
-		  (getWebApp_Distributables(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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
-		  (getWebApp_ContextParams(), 
-		   source, 
-		   new String[] {
-			 "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
-		  (getWebApp_Filters(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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
-		  (getWebApp_FilterMappings(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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
-		  (getWebApp_Listeners(), 
-		   source, 
-		   new String[] {
-			 "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
-		  (getWebApp_Servlets(), 
-		   source, 
-		   new String[] {
-			 "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
-		  (getWebApp_ServletMappings(), 
-		   source, 
-		   new String[] {
-			 "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
-		  (getWebApp_SessionConfigs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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
-		  (getWebApp_MimeMappings(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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
-		  (getWebApp_WelcomeFileLists(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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
-		  (getWebApp_ErrorPages(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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
-		  (getWebApp_JspConfigs(), 
-		   source, 
-		   new String[] {
-			 "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
-		  (getWebApp_SecurityConstraints(), 
-		   source, 
-		   new String[] {
-			 "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
-		  (getWebApp_LoginConfigs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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
-		  (getWebApp_SecurityRoles(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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
-		  (getWebApp_EnvEntries(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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
-		  (getWebApp_EjbRefs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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
-		  (getWebApp_EjbLocalRefs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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
-		  (getWebApp_ServiceRefs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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
-		  (getWebApp_ResourceRefs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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
-		  (getWebApp_ResourceEnvRefs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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
-		  (getWebApp_MessageDestinationRefs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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
-		  (getWebApp_PersistenceContextRefs(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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
-		  (getWebApp_PersistenceUnitRefs(), 
-		   source, 
-		   new String[] {
-			 "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
-		  (getWebApp_PostConstructs(), 
-		   source, 
-		   new String[] {
-			 "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
-		  (getWebApp_PreDestroys(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$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
-		  (getWebApp_MessageDestinations(), 
-		   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$
-			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getWebApp_LocalEncodingMappingsLists(), 
-		   source, 
-		   new String[] {
-			 "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
-		  (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(), 
-		   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$
-		   });			
-		addAnnotation
-		  (webAppVersionTypeEEnum, 
-		   source, 
-		   new String[] {
-			 "name", "web-app-versionType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (webAppVersionTypeObjectEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "web-app-versionType:Object", //$NON-NLS-1$ //$NON-NLS-2$
-			 "baseType", "web-app-versionType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (webResourceCollectionEClass, 
-		   source, 
-		   new String[] {
-			 "name", "web-resource-collectionType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getWebResourceCollection_WebResourceName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "web-resource-name", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getWebResourceCollection_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
-		  (getWebResourceCollection_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$
-		   });		
-		addAnnotation
-		  (getWebResourceCollection_HttpMethods(), 
-		   source, 
-		   new String[] {
-			 "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_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (welcomeFileListEClass, 
-		   source, 
-		   new String[] {
-			 "name", "welcome-file-listType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getWelcomeFileList_WelcomeFiles(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "welcome-file", //$NON-NLS-1$ //$NON-NLS-2$
-			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getWelcomeFileList_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
-		   });
-	}
-
-} //WebPackageImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WebResourceCollectionImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WebResourceCollectionImpl.java
deleted file mode 100644
index f5a506581..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WebResourceCollectionImpl.java
+++ /dev/null
@@ -1,353 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-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.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jst.javaee.core.Description;
-import org.eclipse.jst.javaee.core.UrlPatternType;
-
-import org.eclipse.jst.javaee.web.WebResourceCollection;
-
-import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Resource Collection</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebResourceCollectionImpl#getWebResourceName <em>Web Resource Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebResourceCollectionImpl#getDescriptions <em>Descriptions</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebResourceCollectionImpl#getUrlPatterns <em>Url Patterns</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebResourceCollectionImpl#getHttpMethods <em>Http Methods</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebResourceCollectionImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class WebResourceCollectionImpl extends EObjectImpl implements WebResourceCollection {
-	/**
-	 * The default value of the '{@link #getWebResourceName() <em>Web Resource Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWebResourceName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String WEB_RESOURCE_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getWebResourceName() <em>Web Resource Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWebResourceName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String webResourceName = WEB_RESOURCE_NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The cached value of the '{@link #getUrlPatterns() <em>Url Patterns</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUrlPatterns()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList urlPatterns = null;
-
-	/**
-	 * The cached value of the '{@link #getHttpMethods() <em>Http Methods</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHttpMethods()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList httpMethods = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected WebResourceCollectionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebPackage.Literals.WEB_RESOURCE_COLLECTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getWebResourceName() {
-		return webResourceName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setWebResourceName(String newWebResourceName) {
-		String oldWebResourceName = webResourceName;
-		webResourceName = newWebResourceName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.WEB_RESOURCE_COLLECTION__WEB_RESOURCE_NAME, oldWebResourceName, webResourceName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, WebPackage.WEB_RESOURCE_COLLECTION__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getUrlPatterns() {
-		if (urlPatterns == null) {
-			urlPatterns = new EObjectContainmentEList(UrlPatternType.class, this, WebPackage.WEB_RESOURCE_COLLECTION__URL_PATTERNS);
-		}
-		return urlPatterns;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getHttpMethods() {
-		if (httpMethods == null) {
-			httpMethods = new EDataTypeEList(String.class, this, WebPackage.WEB_RESOURCE_COLLECTION__HTTP_METHODS);
-		}
-		return httpMethods;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.WEB_RESOURCE_COLLECTION__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebPackage.WEB_RESOURCE_COLLECTION__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-			case WebPackage.WEB_RESOURCE_COLLECTION__URL_PATTERNS:
-				return ((InternalEList)getUrlPatterns()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebPackage.WEB_RESOURCE_COLLECTION__WEB_RESOURCE_NAME:
-				return getWebResourceName();
-			case WebPackage.WEB_RESOURCE_COLLECTION__DESCRIPTIONS:
-				return getDescriptions();
-			case WebPackage.WEB_RESOURCE_COLLECTION__URL_PATTERNS:
-				return getUrlPatterns();
-			case WebPackage.WEB_RESOURCE_COLLECTION__HTTP_METHODS:
-				return getHttpMethods();
-			case WebPackage.WEB_RESOURCE_COLLECTION__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebPackage.WEB_RESOURCE_COLLECTION__WEB_RESOURCE_NAME:
-				setWebResourceName((String)newValue);
-				return;
-			case WebPackage.WEB_RESOURCE_COLLECTION__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case WebPackage.WEB_RESOURCE_COLLECTION__URL_PATTERNS:
-				getUrlPatterns().clear();
-				getUrlPatterns().addAll((Collection)newValue);
-				return;
-			case WebPackage.WEB_RESOURCE_COLLECTION__HTTP_METHODS:
-				getHttpMethods().clear();
-				getHttpMethods().addAll((Collection)newValue);
-				return;
-			case WebPackage.WEB_RESOURCE_COLLECTION__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebPackage.WEB_RESOURCE_COLLECTION__WEB_RESOURCE_NAME:
-				setWebResourceName(WEB_RESOURCE_NAME_EDEFAULT);
-				return;
-			case WebPackage.WEB_RESOURCE_COLLECTION__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case WebPackage.WEB_RESOURCE_COLLECTION__URL_PATTERNS:
-				getUrlPatterns().clear();
-				return;
-			case WebPackage.WEB_RESOURCE_COLLECTION__HTTP_METHODS:
-				getHttpMethods().clear();
-				return;
-			case WebPackage.WEB_RESOURCE_COLLECTION__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebPackage.WEB_RESOURCE_COLLECTION__WEB_RESOURCE_NAME:
-				return WEB_RESOURCE_NAME_EDEFAULT == null ? webResourceName != null : !WEB_RESOURCE_NAME_EDEFAULT.equals(webResourceName);
-			case WebPackage.WEB_RESOURCE_COLLECTION__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case WebPackage.WEB_RESOURCE_COLLECTION__URL_PATTERNS:
-				return urlPatterns != null && !urlPatterns.isEmpty();
-			case WebPackage.WEB_RESOURCE_COLLECTION__HTTP_METHODS:
-				return httpMethods != null && !httpMethods.isEmpty();
-			case WebPackage.WEB_RESOURCE_COLLECTION__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (webResourceName: "); //$NON-NLS-1$
-		result.append(webResourceName);
-		result.append(", httpMethods: "); //$NON-NLS-1$
-		result.append(httpMethods);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //WebResourceCollectionImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WelcomeFileListImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WelcomeFileListImpl.java
deleted file mode 100644
index 4518b97c4..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WelcomeFileListImpl.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-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.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-
-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.WelcomeFileList;
-
-import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Welcome File List</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WelcomeFileListImpl#getWelcomeFiles <em>Welcome Files</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WelcomeFileListImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class WelcomeFileListImpl extends EObjectImpl implements WelcomeFileList {
-	/**
-	 * The cached value of the '{@link #getWelcomeFiles() <em>Welcome Files</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWelcomeFiles()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList welcomeFiles = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected WelcomeFileListImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebPackage.Literals.WELCOME_FILE_LIST;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getWelcomeFiles() {
-		if (welcomeFiles == null) {
-			welcomeFiles = new EDataTypeEList(String.class, this, WebPackage.WELCOME_FILE_LIST__WELCOME_FILES);
-		}
-		return welcomeFiles;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebPackage.WELCOME_FILE_LIST__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebPackage.WELCOME_FILE_LIST__WELCOME_FILES:
-				return getWelcomeFiles();
-			case WebPackage.WELCOME_FILE_LIST__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebPackage.WELCOME_FILE_LIST__WELCOME_FILES:
-				getWelcomeFiles().clear();
-				getWelcomeFiles().addAll((Collection)newValue);
-				return;
-			case WebPackage.WELCOME_FILE_LIST__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebPackage.WELCOME_FILE_LIST__WELCOME_FILES:
-				getWelcomeFiles().clear();
-				return;
-			case WebPackage.WELCOME_FILE_LIST__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebPackage.WELCOME_FILE_LIST__WELCOME_FILES:
-				return welcomeFiles != null && !welcomeFiles.isEmpty();
-			case WebPackage.WELCOME_FILE_LIST__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (welcomeFiles: "); //$NON-NLS-1$
-		result.append(welcomeFiles);
-		result.append(", id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //WelcomeFileListImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/metadata/WebPackage.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/metadata/WebPackage.java
deleted file mode 100644
index fed1a4a43..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/metadata/WebPackage.java
+++ /dev/null
@@ -1,4630 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.web.internal.metadata;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.jst.javaee.web.WebFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> 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>
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * 
- *       @(#)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.
- * 
- *     
- * 
- *       
- * 
- * 	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
- * 
- * 	
- *     
- * 
- * 
- *       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
- *     
- * 
- * 
- *       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.
- * 
- *     
- * 
- * 
- * 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
- *     
- * 
- * 
- *       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.
- * 
- *     
- * 
- * 
- *       (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:
- * 
- *     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.
- *   
- *     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
- *   
- * 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.
- * 
- *         &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.
- *   
- * 
- *       @(#)jsp_2_1.xsds	1.5 08/11/05
- *     
- * 
- * 
- *       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.
- * 
- *     
- * 
- * 
- *       This is the XML Schema for the JSP 2.1 deployment descriptor
- *       types.  The JSP 2.1 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
- *       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.
- * 
- *     
- * <!-- end-model-doc -->
- * @see org.eclipse.jst.javaee.web.WebFactory
- * @generated
- */
-public interface WebPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "web"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	String eNS_URI = "http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "web"; //$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	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 <em>Auth Constraint</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.web.internal.impl.AuthConstraintImpl
-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getAuthConstraint()
-	 * @generated
-	 */
-	int AUTH_CONSTRAINT = 0;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AUTH_CONSTRAINT__DESCRIPTIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Role Names</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AUTH_CONSTRAINT__ROLE_NAMES = 1;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AUTH_CONSTRAINT__ID = 2;
-
-	/**
-	 * The number of structural features of the '<em>Auth Constraint</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AUTH_CONSTRAINT_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.ErrorPageImpl <em>Error Page</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.web.internal.impl.ErrorPageImpl
-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getErrorPage()
-	 * @generated
-	 */
-	int ERROR_PAGE = 1;
-
-	/**
-	 * The feature id for the '<em><b>Error Code</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ERROR_PAGE__ERROR_CODE = 0;
-
-	/**
-	 * The feature id for the '<em><b>Exception Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ERROR_PAGE__EXCEPTION_TYPE = 1;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ERROR_PAGE__LOCATION = 2;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ERROR_PAGE__ID = 3;
-
-	/**
-	 * The number of structural features of the '<em>Error Page</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ERROR_PAGE_FEATURE_COUNT = 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.FilterImpl <em>Filter</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.web.internal.impl.FilterImpl
-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getFilter()
-	 * @generated
-	 */
-	int FILTER = 2;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FILTER__DESCRIPTIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FILTER__DISPLAY_NAMES = 1;
-
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FILTER__ICONS = 2;
-
-	/**
-	 * The feature id for the '<em><b>Filter Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FILTER__FILTER_NAME = 3;
-
-	/**
-	 * The feature id for the '<em><b>Filter Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FILTER__FILTER_CLASS = 4;
-
-	/**
-	 * The feature id for the '<em><b>Init Params</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FILTER__INIT_PARAMS = 5;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FILTER__ID = 6;
-
-	/**
-	 * The number of structural features of the '<em>Filter</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FILTER_FEATURE_COUNT = 7;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.FilterMappingImpl <em>Filter Mapping</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.web.internal.impl.FilterMappingImpl
-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getFilterMapping()
-	 * @generated
-	 */
-	int FILTER_MAPPING = 3;
-
-	/**
-	 * The feature id for the '<em><b>Filter Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FILTER_MAPPING__FILTER_NAME = 0;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FILTER_MAPPING__GROUP = 1;
-
-	/**
-	 * The feature id for the '<em><b>Url Patterns</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FILTER_MAPPING__URL_PATTERNS = 2;
-
-	/**
-	 * The feature id for the '<em><b>Servlet Names</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FILTER_MAPPING__SERVLET_NAMES = 3;
-
-	/**
-	 * The feature id for the '<em><b>Dispatchers</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FILTER_MAPPING__DISPATCHERS = 4;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FILTER_MAPPING__ID = 5;
-
-	/**
-	 * The number of structural features of the '<em>Filter Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FILTER_MAPPING_FEATURE_COUNT = 6;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.FormLoginConfigImpl <em>Form Login Config</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.web.internal.impl.FormLoginConfigImpl
-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getFormLoginConfig()
-	 * @generated
-	 */
-	int FORM_LOGIN_CONFIG = 4;
-
-	/**
-	 * The feature id for the '<em><b>Form Login Page</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FORM_LOGIN_CONFIG__FORM_LOGIN_PAGE = 0;
-
-	/**
-	 * The feature id for the '<em><b>Form Error Page</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FORM_LOGIN_CONFIG__FORM_ERROR_PAGE = 1;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FORM_LOGIN_CONFIG__ID = 2;
-
-	/**
-	 * The number of structural features of the '<em>Form Login Config</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FORM_LOGIN_CONFIG_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.LocaleEncodingMappingImpl <em>Locale Encoding Mapping</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.web.internal.impl.LocaleEncodingMappingImpl
-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getLocaleEncodingMapping()
-	 * @generated
-	 */
-	int LOCALE_ENCODING_MAPPING = 5;
-
-	/**
-	 * The feature id for the '<em><b>Locale</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOCALE_ENCODING_MAPPING__LOCALE = 0;
-
-	/**
-	 * The feature id for the '<em><b>Encoding</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOCALE_ENCODING_MAPPING__ENCODING = 1;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOCALE_ENCODING_MAPPING__ID = 2;
-
-	/**
-	 * The number of structural features of the '<em>Locale Encoding Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOCALE_ENCODING_MAPPING_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.LocaleEncodingMappingListImpl <em>Locale Encoding Mapping List</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.web.internal.impl.LocaleEncodingMappingListImpl
-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getLocaleEncodingMappingList()
-	 * @generated
-	 */
-	int LOCALE_ENCODING_MAPPING_LIST = 6;
-
-	/**
-	 * The feature id for the '<em><b>Local Encoding Mappings</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOCALE_ENCODING_MAPPING_LIST__LOCAL_ENCODING_MAPPINGS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOCALE_ENCODING_MAPPING_LIST__ID = 1;
-
-	/**
-	 * The number of structural features of the '<em>Locale Encoding Mapping List</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOCALE_ENCODING_MAPPING_LIST_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.LoginConfigImpl <em>Login Config</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.web.internal.impl.LoginConfigImpl
-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getLoginConfig()
-	 * @generated
-	 */
-	int LOGIN_CONFIG = 7;
-
-	/**
-	 * The feature id for the '<em><b>Auth Method</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOGIN_CONFIG__AUTH_METHOD = 0;
-
-	/**
-	 * The feature id for the '<em><b>Realm Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOGIN_CONFIG__REALM_NAME = 1;
-
-	/**
-	 * The feature id for the '<em><b>Form Login Config</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOGIN_CONFIG__FORM_LOGIN_CONFIG = 2;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOGIN_CONFIG__ID = 3;
-
-	/**
-	 * The number of structural features of the '<em>Login Config</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOGIN_CONFIG_FEATURE_COUNT = 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.MimeMappingImpl <em>Mime Mapping</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.web.internal.impl.MimeMappingImpl
-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getMimeMapping()
-	 * @generated
-	 */
-	int MIME_MAPPING = 8;
-
-	/**
-	 * The feature id for the '<em><b>Extension</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_MAPPING__EXTENSION = 0;
-
-	/**
-	 * The feature id for the '<em><b>Mime Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_MAPPING__MIME_TYPE = 1;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_MAPPING__ID = 2;
-
-	/**
-	 * The number of structural features of the '<em>Mime Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_MAPPING_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.SecurityConstraintImpl <em>Security Constraint</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.web.internal.impl.SecurityConstraintImpl
-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getSecurityConstraint()
-	 * @generated
-	 */
-	int SECURITY_CONSTRAINT = 9;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECURITY_CONSTRAINT__DISPLAY_NAMES = 0;
-
-	/**
-	 * The feature id for the '<em><b>Web Resource Collections</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECURITY_CONSTRAINT__WEB_RESOURCE_COLLECTIONS = 1;
-
-	/**
-	 * The feature id for the '<em><b>Auth Constraint</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECURITY_CONSTRAINT__AUTH_CONSTRAINT = 2;
-
-	/**
-	 * The feature id for the '<em><b>User Data Constraint</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT = 3;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECURITY_CONSTRAINT__ID = 4;
-
-	/**
-	 * The number of structural features of the '<em>Security Constraint</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECURITY_CONSTRAINT_FEATURE_COUNT = 5;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.ServletImpl <em>Servlet</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.web.internal.impl.ServletImpl
-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getServlet()
-	 * @generated
-	 */
-	int SERVLET = 10;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVLET__DESCRIPTIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVLET__DISPLAY_NAMES = 1;
-
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVLET__ICONS = 2;
-
-	/**
-	 * The feature id for the '<em><b>Servlet Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVLET__SERVLET_NAME = 3;
-
-	/**
-	 * The feature id for the '<em><b>Servlet Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVLET__SERVLET_CLASS = 4;
-
-	/**
-	 * The feature id for the '<em><b>Jsp File</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVLET__JSP_FILE = 5;
-
-	/**
-	 * The feature id for the '<em><b>Init Params</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVLET__INIT_PARAMS = 6;
-
-	/**
-	 * The feature id for the '<em><b>Load On Startup</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVLET__LOAD_ON_STARTUP = 7;
-
-	/**
-	 * The feature id for the '<em><b>Run As</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVLET__RUN_AS = 8;
-
-	/**
-	 * The feature id for the '<em><b>Security Role Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVLET__SECURITY_ROLE_REFS = 9;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVLET__ID = 10;
-
-	/**
-	 * The number of structural features of the '<em>Servlet</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVLET_FEATURE_COUNT = 11;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.ServletMappingImpl <em>Servlet Mapping</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.web.internal.impl.ServletMappingImpl
-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getServletMapping()
-	 * @generated
-	 */
-	int SERVLET_MAPPING = 11;
-
-	/**
-	 * The feature id for the '<em><b>Servlet Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVLET_MAPPING__SERVLET_NAME = 0;
-
-	/**
-	 * The feature id for the '<em><b>Url Patterns</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVLET_MAPPING__URL_PATTERNS = 1;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVLET_MAPPING__ID = 2;
-
-	/**
-	 * The number of structural features of the '<em>Servlet Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVLET_MAPPING_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.SessionConfigImpl <em>Session Config</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.web.internal.impl.SessionConfigImpl
-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getSessionConfig()
-	 * @generated
-	 */
-	int SESSION_CONFIG = 12;
-
-	/**
-	 * The feature id for the '<em><b>Session Timeout</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION_CONFIG__SESSION_TIMEOUT = 0;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION_CONFIG__ID = 1;
-
-	/**
-	 * The number of structural features of the '<em>Session Config</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION_CONFIG_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.UserDataConstraintImpl <em>User Data Constraint</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.web.internal.impl.UserDataConstraintImpl
-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getUserDataConstraint()
-	 * @generated
-	 */
-	int USER_DATA_CONSTRAINT = 13;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USER_DATA_CONSTRAINT__DESCRIPTIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Transport Guarantee</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USER_DATA_CONSTRAINT__TRANSPORT_GUARANTEE = 1;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USER_DATA_CONSTRAINT__ID = 2;
-
-	/**
-	 * The number of structural features of the '<em>User Data Constraint</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USER_DATA_CONSTRAINT_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl <em>App</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebAppImpl
-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getWebApp()
-	 * @generated
-	 */
-	int WEB_APP = 14;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__GROUP = 0;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__DESCRIPTIONS = 1;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__DISPLAY_NAMES = 2;
-
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__ICONS = 3;
-
-	/**
-	 * The feature id for the '<em><b>Distributables</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__DISTRIBUTABLES = 4;
-
-	/**
-	 * The feature id for the '<em><b>Context Params</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__CONTEXT_PARAMS = 5;
-
-	/**
-	 * The feature id for the '<em><b>Filters</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__FILTERS = 6;
-
-	/**
-	 * The feature id for the '<em><b>Filter Mappings</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__FILTER_MAPPINGS = 7;
-
-	/**
-	 * The feature id for the '<em><b>Listeners</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__LISTENERS = 8;
-
-	/**
-	 * The feature id for the '<em><b>Servlets</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__SERVLETS = 9;
-
-	/**
-	 * The feature id for the '<em><b>Servlet Mappings</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__SERVLET_MAPPINGS = 10;
-
-	/**
-	 * The feature id for the '<em><b>Session Configs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__SESSION_CONFIGS = 11;
-
-	/**
-	 * The feature id for the '<em><b>Mime Mappings</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__MIME_MAPPINGS = 12;
-
-	/**
-	 * The feature id for the '<em><b>Welcome File Lists</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__WELCOME_FILE_LISTS = 13;
-
-	/**
-	 * The feature id for the '<em><b>Error Pages</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__ERROR_PAGES = 14;
-
-	/**
-	 * The feature id for the '<em><b>Jsp Configs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__JSP_CONFIGS = 15;
-
-	/**
-	 * The feature id for the '<em><b>Security Constraints</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__SECURITY_CONSTRAINTS = 16;
-
-	/**
-	 * The feature id for the '<em><b>Login Configs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__LOGIN_CONFIGS = 17;
-
-	/**
-	 * The feature id for the '<em><b>Security Roles</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__SECURITY_ROLES = 18;
-
-	/**
-	 * The feature id for the '<em><b>Env Entries</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__ENV_ENTRIES = 19;
-
-	/**
-	 * The feature id for the '<em><b>Ejb Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__EJB_REFS = 20;
-
-	/**
-	 * The feature id for the '<em><b>Ejb Local Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__EJB_LOCAL_REFS = 21;
-
-	/**
-	 * The feature id for the '<em><b>Service Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__SERVICE_REFS = 22;
-
-	/**
-	 * The feature id for the '<em><b>Resource Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__RESOURCE_REFS = 23;
-
-	/**
-	 * The feature id for the '<em><b>Resource Env Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__RESOURCE_ENV_REFS = 24;
-
-	/**
-	 * The feature id for the '<em><b>Message Destination Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__MESSAGE_DESTINATION_REFS = 25;
-
-	/**
-	 * The feature id for the '<em><b>Persistence Context Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__PERSISTENCE_CONTEXT_REFS = 26;
-
-	/**
-	 * The feature id for the '<em><b>Persistence Unit Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__PERSISTENCE_UNIT_REFS = 27;
-
-	/**
-	 * The feature id for the '<em><b>Post Constructs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__POST_CONSTRUCTS = 28;
-
-	/**
-	 * The feature id for the '<em><b>Pre Destroys</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__PRE_DESTROYS = 29;
-
-	/**
-	 * The feature id for the '<em><b>Message Destinations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__MESSAGE_DESTINATIONS = 30;
-
-	/**
-	 * The feature id for the '<em><b>Local Encoding Mappings Lists</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS = 31;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__ID = 32;
-
-	/**
-	 * The feature id for the '<em><b>Metadata Complete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__METADATA_COMPLETE = 33;
-
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__VERSION = 34;
-
-	/**
-	 * The number of structural features of the '<em>App</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP_FEATURE_COUNT = 35;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.WebAppDeploymentDescriptorImpl <em>App Deployment Descriptor</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebAppDeploymentDescriptorImpl
-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getWebAppDeploymentDescriptor()
-	 * @generated
-	 */
-	int WEB_APP_DEPLOYMENT_DESCRIPTOR = 15;
-
-	/**
-	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP_DEPLOYMENT_DESCRIPTOR__MIXED = 0;
-
-	/**
-	 * The feature id for the '<em><b>XMLNS Prefix Map</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP = 1;
-
-	/**
-	 * The feature id for the '<em><b>XSI Schema Location</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION = 2;
-
-	/**
-	 * The feature id for the '<em><b>Web App</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP_DEPLOYMENT_DESCRIPTOR__WEB_APP = 3;
-
-	/**
-	 * The number of structural features of the '<em>App Deployment Descriptor</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP_DEPLOYMENT_DESCRIPTOR_FEATURE_COUNT = 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.WebResourceCollectionImpl <em>Resource Collection</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebResourceCollectionImpl
-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getWebResourceCollection()
-	 * @generated
-	 */
-	int WEB_RESOURCE_COLLECTION = 16;
-
-	/**
-	 * The feature id for the '<em><b>Web Resource Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_RESOURCE_COLLECTION__WEB_RESOURCE_NAME = 0;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_RESOURCE_COLLECTION__DESCRIPTIONS = 1;
-
-	/**
-	 * The feature id for the '<em><b>Url Patterns</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_RESOURCE_COLLECTION__URL_PATTERNS = 2;
-
-	/**
-	 * The feature id for the '<em><b>Http Methods</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_RESOURCE_COLLECTION__HTTP_METHODS = 3;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_RESOURCE_COLLECTION__ID = 4;
-
-	/**
-	 * The number of structural features of the '<em>Resource Collection</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_RESOURCE_COLLECTION_FEATURE_COUNT = 5;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.WelcomeFileListImpl <em>Welcome File List</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.web.internal.impl.WelcomeFileListImpl
-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getWelcomeFileList()
-	 * @generated
-	 */
-	int WELCOME_FILE_LIST = 17;
-
-	/**
-	 * The feature id for the '<em><b>Welcome Files</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WELCOME_FILE_LIST__WELCOME_FILES = 0;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WELCOME_FILE_LIST__ID = 1;
-
-	/**
-	 * The number of structural features of the '<em>Welcome File List</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WELCOME_FILE_LIST_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.DispatcherType <em>Dispatcher Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.web.DispatcherType
-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getDispatcherType()
-	 * @generated
-	 */
-	int DISPATCHER_TYPE = 18;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.NullCharType <em>Null Char Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.web.NullCharType
-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getNullCharType()
-	 * @generated
-	 */
-	int NULL_CHAR_TYPE = 19;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.TransportGuaranteeType <em>Transport Guarantee Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.web.TransportGuaranteeType
-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getTransportGuaranteeType()
-	 * @generated
-	 */
-	int TRANSPORT_GUARANTEE_TYPE = 20;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.WebAppVersionType <em>App Version Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.web.WebAppVersionType
-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getWebAppVersionType()
-	 * @generated
-	 */
-	int WEB_APP_VERSION_TYPE = 21;
-
-	/**
-	 * The meta object id for the '<em>Auth Method Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getAuthMethodType()
-	 * @generated
-	 */
-	int AUTH_METHOD_TYPE = 22;
-
-	/**
-	 * The meta object id for the '<em>Dispatcher Type Object</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.web.DispatcherType
-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getDispatcherTypeObject()
-	 * @generated
-	 */
-	int DISPATCHER_TYPE_OBJECT = 23;
-
-	/**
-	 * The meta object id for the '<em>Encoding Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getEncodingType()
-	 * @generated
-	 */
-	int ENCODING_TYPE = 24;
-
-	/**
-	 * The meta object id for the '<em>Error Code Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.math.BigInteger
-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getErrorCodeType()
-	 * @generated
-	 */
-	int ERROR_CODE_TYPE = 25;
-
-	/**
-	 * The meta object id for the '<em>Filter Name Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getFilterNameType()
-	 * @generated
-	 */
-	int FILTER_NAME_TYPE = 26;
-
-	/**
-	 * The meta object id for the '<em>Http Method Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getHttpMethodType()
-	 * @generated
-	 */
-	int HTTP_METHOD_TYPE = 27;
-
-	/**
-	 * The meta object id for the '<em>Load On Startup Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.Object
-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getLoadOnStartupType()
-	 * @generated
-	 */
-	int LOAD_ON_STARTUP_TYPE = 28;
-
-	/**
-	 * The meta object id for the '<em>Locale Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getLocaleType()
-	 * @generated
-	 */
-	int LOCALE_TYPE = 29;
-
-	/**
-	 * The meta object id for the '<em>Mime Type Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getMimeTypeType()
-	 * @generated
-	 */
-	int MIME_TYPE_TYPE = 30;
-
-	/**
-	 * The meta object id for the '<em>Non Empty String Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getNonEmptyStringType()
-	 * @generated
-	 */
-	int NON_EMPTY_STRING_TYPE = 31;
-
-	/**
-	 * The meta object id for the '<em>Null Char Type Object</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.web.NullCharType
-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getNullCharTypeObject()
-	 * @generated
-	 */
-	int NULL_CHAR_TYPE_OBJECT = 32;
-
-	/**
-	 * The meta object id for the '<em>Servlet Name Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getServletNameType()
-	 * @generated
-	 */
-	int SERVLET_NAME_TYPE = 33;
-
-	/**
-	 * The meta object id for the '<em>Transport Guarantee Type Object</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.web.TransportGuaranteeType
-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getTransportGuaranteeTypeObject()
-	 * @generated
-	 */
-	int TRANSPORT_GUARANTEE_TYPE_OBJECT = 34;
-
-	/**
-	 * The meta object id for the '<em>War Path Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getWarPathType()
-	 * @generated
-	 */
-	int WAR_PATH_TYPE = 35;
-
-	/**
-	 * The meta object id for the '<em>App Version Type Object</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.javaee.web.WebAppVersionType
-	 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getWebAppVersionTypeObject()
-	 * @generated
-	 */
-	int WEB_APP_VERSION_TYPE_OBJECT = 36;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.AuthConstraint <em>Auth Constraint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Auth Constraint</em>'.
-	 * @see org.eclipse.jst.javaee.web.AuthConstraint
-	 * @generated
-	 */
-	EClass getAuthConstraint();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.AuthConstraint#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.javaee.web.AuthConstraint#getDescriptions()
-	 * @see #getAuthConstraint()
-	 * @generated
-	 */
-	EReference getAuthConstraint_Descriptions();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.web.AuthConstraint#getRoleNames <em>Role Names</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Role Names</em>'.
-	 * @see org.eclipse.jst.javaee.web.AuthConstraint#getRoleNames()
-	 * @see #getAuthConstraint()
-	 * @generated
-	 */
-	EAttribute getAuthConstraint_RoleNames();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.AuthConstraint#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.web.AuthConstraint#getId()
-	 * @see #getAuthConstraint()
-	 * @generated
-	 */
-	EAttribute getAuthConstraint_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.ErrorPage <em>Error Page</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Error Page</em>'.
-	 * @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 <em>Error Code</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Error Code</em>'.
-	 * @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 <em>Exception Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Exception Type</em>'.
-	 * @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 <em>Location</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Location</em>'.
-	 * @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 <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.web.ErrorPage#getId()
-	 * @see #getErrorPage()
-	 * @generated
-	 */
-	EAttribute getErrorPage_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.Filter <em>Filter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Filter</em>'.
-	 * @see org.eclipse.jst.javaee.web.Filter
-	 * @generated
-	 */
-	EClass getFilter();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.Filter#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.javaee.web.Filter#getDescriptions()
-	 * @see #getFilter()
-	 * @generated
-	 */
-	EReference getFilter_Descriptions();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.Filter#getDisplayNames <em>Display Names</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Display Names</em>'.
-	 * @see org.eclipse.jst.javaee.web.Filter#getDisplayNames()
-	 * @see #getFilter()
-	 * @generated
-	 */
-	EReference getFilter_DisplayNames();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.Filter#getIcons <em>Icons</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Icons</em>'.
-	 * @see org.eclipse.jst.javaee.web.Filter#getIcons()
-	 * @see #getFilter()
-	 * @generated
-	 */
-	EReference getFilter_Icons();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.Filter#getFilterName <em>Filter Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Filter Name</em>'.
-	 * @see org.eclipse.jst.javaee.web.Filter#getFilterName()
-	 * @see #getFilter()
-	 * @generated
-	 */
-	EAttribute getFilter_FilterName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.Filter#getFilterClass <em>Filter Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Filter Class</em>'.
-	 * @see org.eclipse.jst.javaee.web.Filter#getFilterClass()
-	 * @see #getFilter()
-	 * @generated
-	 */
-	EAttribute getFilter_FilterClass();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.Filter#getInitParams <em>Init Params</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Init Params</em>'.
-	 * @see org.eclipse.jst.javaee.web.Filter#getInitParams()
-	 * @see #getFilter()
-	 * @generated
-	 */
-	EReference getFilter_InitParams();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.Filter#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.web.Filter#getId()
-	 * @see #getFilter()
-	 * @generated
-	 */
-	EAttribute getFilter_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.FilterMapping <em>Filter Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Filter Mapping</em>'.
-	 * @see org.eclipse.jst.javaee.web.FilterMapping
-	 * @generated
-	 */
-	EClass getFilterMapping();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.FilterMapping#getFilterName <em>Filter Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Filter Name</em>'.
-	 * @see org.eclipse.jst.javaee.web.FilterMapping#getFilterName()
-	 * @see #getFilterMapping()
-	 * @generated
-	 */
-	EAttribute getFilterMapping_FilterName();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.web.FilterMapping#getGroup <em>Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Group</em>'.
-	 * @see org.eclipse.jst.javaee.web.FilterMapping#getGroup()
-	 * @see #getFilterMapping()
-	 * @generated
-	 */
-	EAttribute getFilterMapping_Group();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.FilterMapping#getUrlPatterns <em>Url Patterns</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Url Patterns</em>'.
-	 * @see org.eclipse.jst.javaee.web.FilterMapping#getUrlPatterns()
-	 * @see #getFilterMapping()
-	 * @generated
-	 */
-	EReference getFilterMapping_UrlPatterns();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.web.FilterMapping#getServletNames <em>Servlet Names</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Servlet Names</em>'.
-	 * @see org.eclipse.jst.javaee.web.FilterMapping#getServletNames()
-	 * @see #getFilterMapping()
-	 * @generated
-	 */
-	EAttribute getFilterMapping_ServletNames();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.web.FilterMapping#getDispatchers <em>Dispatchers</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Dispatchers</em>'.
-	 * @see org.eclipse.jst.javaee.web.FilterMapping#getDispatchers()
-	 * @see #getFilterMapping()
-	 * @generated
-	 */
-	EAttribute getFilterMapping_Dispatchers();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.FilterMapping#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.javaee.web.FilterMapping#getId()
-	 * @see #getFilterMapping()
-	 * @generated
-	 */
-	EAttribute getFilterMapping_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.web.FormLoginConfig <em>Form Login Config</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Form Login Config</em>'.
-	 * @see org.eclipse.jst.javaee.web.FormLoginConfig
-	 * @generated
-	 */
-	EClass getFormLoginConfig();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.FormLoginConfig#getFormLoginPage <em>Form Login Page</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Form Login Page</em>'.
-	 * @see org.eclipse.jst.javaee.web.FormLoginConfig#getFormLoginPage()
-	 * @see #getFormLoginConfig()
-	 * @generated
-	 */
-	EAttribute getFormLoginConfig_FormLoginPage();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.FormLoginConfig#getFormErrorPage <em>Form Error Page</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Form Error Page</em>'.
-	 * @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 <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @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 <em>Locale Encoding Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Locale Encoding Mapping</em>'.
-	 * @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 <em>Locale</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Locale</em>'.
-	 * @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 <em>Encoding</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Encoding</em>'.
-	 * @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 <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @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 <em>Locale Encoding Mapping List</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Locale Encoding Mapping List</em>'.
-	 * @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 <em>Local Encoding Mappings</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Local Encoding Mappings</em>'.
-	 * @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 <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @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 <em>Login Config</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Login Config</em>'.
-	 * @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 <em>Auth Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Auth Method</em>'.
-	 * @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 <em>Realm Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Realm Name</em>'.
-	 * @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 <em>Form Login Config</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Form Login Config</em>'.
-	 * @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 <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @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 <em>Mime Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Mime Mapping</em>'.
-	 * @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 <em>Extension</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Extension</em>'.
-	 * @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 <em>Mime Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Mime Type</em>'.
-	 * @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 <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @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.SecurityConstraint <em>Security Constraint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Security Constraint</em>'.
-	 * @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 <em>Display Names</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Display Names</em>'.
-	 * @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 <em>Web Resource Collections</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Web Resource Collections</em>'.
-	 * @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 <em>Auth Constraint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Auth Constraint</em>'.
-	 * @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 <em>User Data Constraint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>User Data Constraint</em>'.
-	 * @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 <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @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 <em>Servlet</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Servlet</em>'.
-	 * @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 <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @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 <em>Display Names</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Display Names</em>'.
-	 * @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 <em>Icons</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Icons</em>'.
-	 * @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 <em>Servlet Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Servlet Name</em>'.
-	 * @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 <em>Servlet Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Servlet Class</em>'.
-	 * @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 <em>Jsp File</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Jsp File</em>'.
-	 * @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 <em>Init Params</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Init Params</em>'.
-	 * @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 <em>Load On Startup</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Load On Startup</em>'.
-	 * @see org.eclipse.jst.javaee.web.Servlet#getLoadOnStartup()
-	 * @see #getServlet()
-	 * @generated
-	 */
-	EAttribute getServlet_LoadOnStartup();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.web.Servlet#getRunAs <em>Run As</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Run As</em>'.
-	 * @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 <em>Security Role Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Security Role Refs</em>'.
-	 * @see org.eclipse.jst.javaee.web.Servlet#getSecurityRoleRefs()
-	 * @see #getServlet()
-	 * @generated
-	 */
-	EReference getServlet_SecurityRoleRefs();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.Servlet#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @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 <em>Servlet Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Servlet Mapping</em>'.
-	 * @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 <em>Servlet Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Servlet Name</em>'.
-	 * @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 <em>Url Patterns</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Url Patterns</em>'.
-	 * @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 <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @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 <em>Session Config</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Session Config</em>'.
-	 * @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 <em>Session Timeout</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Session Timeout</em>'.
-	 * @see org.eclipse.jst.javaee.web.SessionConfig#getSessionTimeout()
-	 * @see #getSessionConfig()
-	 * @generated
-	 */
-	EAttribute getSessionConfig_SessionTimeout();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.SessionConfig#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @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 <em>User Data Constraint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>User Data Constraint</em>'.
-	 * @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 <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @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 <em>Transport Guarantee</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Transport Guarantee</em>'.
-	 * @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 <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @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 <em>App</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>App</em>'.
-	 * @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 <em>Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Group</em>'.
-	 * @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 <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @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 <em>Display Names</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Display Names</em>'.
-	 * @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 <em>Icons</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Icons</em>'.
-	 * @see org.eclipse.jst.javaee.web.WebApp#getIcons()
-	 * @see #getWebApp()
-	 * @generated
-	 */
-	EReference getWebApp_Icons();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getDistributables <em>Distributables</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Distributables</em>'.
-	 * @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 <em>Context Params</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Context Params</em>'.
-	 * @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 <em>Filters</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Filters</em>'.
-	 * @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 <em>Filter Mappings</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Filter Mappings</em>'.
-	 * @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 <em>Listeners</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Listeners</em>'.
-	 * @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 <em>Servlets</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Servlets</em>'.
-	 * @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 <em>Servlet Mappings</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Servlet Mappings</em>'.
-	 * @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 <em>Session Configs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Session Configs</em>'.
-	 * @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 <em>Mime Mappings</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Mime Mappings</em>'.
-	 * @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 <em>Welcome File Lists</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Welcome File Lists</em>'.
-	 * @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 <em>Error Pages</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Error Pages</em>'.
-	 * @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 <em>Jsp Configs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Jsp Configs</em>'.
-	 * @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 <em>Security Constraints</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Security Constraints</em>'.
-	 * @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 <em>Login Configs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Login Configs</em>'.
-	 * @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 <em>Security Roles</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Security Roles</em>'.
-	 * @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 <em>Env Entries</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Env Entries</em>'.
-	 * @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 <em>Ejb Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Ejb Refs</em>'.
-	 * @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 <em>Ejb Local Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Ejb Local Refs</em>'.
-	 * @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 <em>Service Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Service Refs</em>'.
-	 * @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 <em>Resource Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Resource Refs</em>'.
-	 * @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 <em>Resource Env Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Resource Env Refs</em>'.
-	 * @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 <em>Message Destination Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Message Destination Refs</em>'.
-	 * @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 <em>Persistence Context Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Persistence Context Refs</em>'.
-	 * @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 <em>Persistence Unit Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Persistence Unit Refs</em>'.
-	 * @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 <em>Post Constructs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Post Constructs</em>'.
-	 * @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 <em>Pre Destroys</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Pre Destroys</em>'.
-	 * @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#getMessageDestinations <em>Message Destinations</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Message Destinations</em>'.
-	 * @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 <em>Local Encoding Mappings Lists</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Local Encoding Mappings Lists</em>'.
-	 * @see org.eclipse.jst.javaee.web.WebApp#getLocalEncodingMappingsLists()
-	 * @see #getWebApp()
-	 * @generated
-	 */
-	EReference getWebApp_LocalEncodingMappingsLists();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.WebApp#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @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 <em>Metadata Complete</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Metadata Complete</em>'.
-	 * @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 <em>Version</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Version</em>'.
-	 * @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 <em>App Deployment Descriptor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>App Deployment Descriptor</em>'.
-	 * @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 <em>Mixed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Mixed</em>'.
-	 * @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 <em>XMLNS Prefix Map</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the map '<em>XMLNS Prefix Map</em>'.
-	 * @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 <em>XSI Schema Location</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the map '<em>XSI Schema Location</em>'.
-	 * @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 <em>Web App</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Web App</em>'.
-	 * @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.WebResourceCollection <em>Resource Collection</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Resource Collection</em>'.
-	 * @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 <em>Web Resource Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Web Resource Name</em>'.
-	 * @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 <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @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 <em>Url Patterns</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Url Patterns</em>'.
-	 * @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 <em>Http Methods</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Http Methods</em>'.
-	 * @see org.eclipse.jst.javaee.web.WebResourceCollection#getHttpMethods()
-	 * @see #getWebResourceCollection()
-	 * @generated
-	 */
-	EAttribute getWebResourceCollection_HttpMethods();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.web.WebResourceCollection#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @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 <em>Welcome File List</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Welcome File List</em>'.
-	 * @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 <em>Welcome Files</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Welcome Files</em>'.
-	 * @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 <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @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 <em>Dispatcher Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Dispatcher Type</em>'.
-	 * @see org.eclipse.jst.javaee.web.DispatcherType
-	 * @generated
-	 */
-	EEnum getDispatcherType();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jst.javaee.web.NullCharType <em>Null Char Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Null Char Type</em>'.
-	 * @see org.eclipse.jst.javaee.web.NullCharType
-	 * @generated
-	 */
-	EEnum getNullCharType();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jst.javaee.web.TransportGuaranteeType <em>Transport Guarantee Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Transport Guarantee Type</em>'.
-	 * @see org.eclipse.jst.javaee.web.TransportGuaranteeType
-	 * @generated
-	 */
-	EEnum getTransportGuaranteeType();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jst.javaee.web.WebAppVersionType <em>App Version Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>App Version Type</em>'.
-	 * @see org.eclipse.jst.javaee.web.WebAppVersionType
-	 * @generated
-	 */
-	EEnum getWebAppVersionType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Auth Method Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Auth Method Type</em>'.
-	 * @see java.lang.String
-	 * @generated
-	 */
-	EDataType getAuthMethodType();
-
-	/**
-	 * Returns the meta object for data type '{@link org.eclipse.jst.javaee.web.DispatcherType <em>Dispatcher Type Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Dispatcher Type Object</em>'.
-	 * @see org.eclipse.jst.javaee.web.DispatcherType
-	 * @generated
-	 */
-	EDataType getDispatcherTypeObject();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Encoding Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Encoding Type</em>'.
-	 * @see java.lang.String
-	 * @generated
-	 */
-	EDataType getEncodingType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Error Code Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Error Code Type</em>'.
-	 * @see java.math.BigInteger
-	 * @generated
-	 */
-	EDataType getErrorCodeType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Filter Name Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Filter Name Type</em>'.
-	 * @see java.lang.String
-	 * @generated
-	 */
-	EDataType getFilterNameType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Http Method Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Http Method Type</em>'.
-	 * @see java.lang.String
-	 * @generated
-	 */
-	EDataType getHttpMethodType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.Object <em>Load On Startup Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Load On Startup Type</em>'.
-	 * @see java.lang.Object
-	 * @generated
-	 */
-	EDataType getLoadOnStartupType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Locale Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Locale Type</em>'.
-	 * @see java.lang.String
-	 * @generated
-	 */
-	EDataType getLocaleType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Mime Type Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Mime Type Type</em>'.
-	 * @see java.lang.String
-	 * @generated
-	 */
-	EDataType getMimeTypeType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Non Empty String Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Non Empty String Type</em>'.
-	 * @see java.lang.String
-	 * @generated
-	 */
-	EDataType getNonEmptyStringType();
-
-	/**
-	 * Returns the meta object for data type '{@link org.eclipse.jst.javaee.web.NullCharType <em>Null Char Type Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Null Char Type Object</em>'.
-	 * @see org.eclipse.jst.javaee.web.NullCharType
-	 * @generated
-	 */
-	EDataType getNullCharTypeObject();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Servlet Name Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Servlet Name Type</em>'.
-	 * @see java.lang.String
-	 * @generated
-	 */
-	EDataType getServletNameType();
-
-	/**
-	 * Returns the meta object for data type '{@link org.eclipse.jst.javaee.web.TransportGuaranteeType <em>Transport Guarantee Type Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Transport Guarantee Type Object</em>'.
-	 * @see org.eclipse.jst.javaee.web.TransportGuaranteeType
-	 * @generated
-	 */
-	EDataType getTransportGuaranteeTypeObject();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>War Path Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>War Path Type</em>'.
-	 * @see java.lang.String
-	 * @generated
-	 */
-	EDataType getWarPathType();
-
-	/**
-	 * Returns the meta object for data type '{@link org.eclipse.jst.javaee.web.WebAppVersionType <em>App Version Type Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>App Version Type Object</em>'.
-	 * @see org.eclipse.jst.javaee.web.WebAppVersionType
-	 * @generated
-	 */
-	EDataType getWebAppVersionTypeObject();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	WebFactory getWebFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * 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>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals  {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.AuthConstraintImpl <em>Auth Constraint</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @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 '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference AUTH_CONSTRAINT__DESCRIPTIONS = eINSTANCE.getAuthConstraint_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Role Names</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute AUTH_CONSTRAINT__ROLE_NAMES = eINSTANCE.getAuthConstraint_RoleNames();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute AUTH_CONSTRAINT__ID = eINSTANCE.getAuthConstraint_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.ErrorPageImpl <em>Error Page</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @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 '<em><b>Error Code</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ERROR_PAGE__ERROR_CODE = eINSTANCE.getErrorPage_ErrorCode();
-
-		/**
-		 * The meta object literal for the '<em><b>Exception Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ERROR_PAGE__EXCEPTION_TYPE = eINSTANCE.getErrorPage_ExceptionType();
-
-		/**
-		 * The meta object literal for the '<em><b>Location</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ERROR_PAGE__LOCATION = eINSTANCE.getErrorPage_Location();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ERROR_PAGE__ID = eINSTANCE.getErrorPage_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.FilterImpl <em>Filter</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @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 '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference FILTER__DESCRIPTIONS = eINSTANCE.getFilter_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Display Names</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference FILTER__DISPLAY_NAMES = eINSTANCE.getFilter_DisplayNames();
-
-		/**
-		 * The meta object literal for the '<em><b>Icons</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference FILTER__ICONS = eINSTANCE.getFilter_Icons();
-
-		/**
-		 * The meta object literal for the '<em><b>Filter Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FILTER__FILTER_NAME = eINSTANCE.getFilter_FilterName();
-
-		/**
-		 * The meta object literal for the '<em><b>Filter Class</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FILTER__FILTER_CLASS = eINSTANCE.getFilter_FilterClass();
-
-		/**
-		 * The meta object literal for the '<em><b>Init Params</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference FILTER__INIT_PARAMS = eINSTANCE.getFilter_InitParams();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FILTER__ID = eINSTANCE.getFilter_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.FilterMappingImpl <em>Filter Mapping</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @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 '<em><b>Filter Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FILTER_MAPPING__FILTER_NAME = eINSTANCE.getFilterMapping_FilterName();
-
-		/**
-		 * The meta object literal for the '<em><b>Group</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FILTER_MAPPING__GROUP = eINSTANCE.getFilterMapping_Group();
-
-		/**
-		 * The meta object literal for the '<em><b>Url Patterns</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference FILTER_MAPPING__URL_PATTERNS = eINSTANCE.getFilterMapping_UrlPatterns();
-
-		/**
-		 * The meta object literal for the '<em><b>Servlet Names</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FILTER_MAPPING__SERVLET_NAMES = eINSTANCE.getFilterMapping_ServletNames();
-
-		/**
-		 * The meta object literal for the '<em><b>Dispatchers</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FILTER_MAPPING__DISPATCHERS = eINSTANCE.getFilterMapping_Dispatchers();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FILTER_MAPPING__ID = eINSTANCE.getFilterMapping_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.FormLoginConfigImpl <em>Form Login Config</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @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 '<em><b>Form Login Page</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FORM_LOGIN_CONFIG__FORM_LOGIN_PAGE = eINSTANCE.getFormLoginConfig_FormLoginPage();
-
-		/**
-		 * The meta object literal for the '<em><b>Form Error Page</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FORM_LOGIN_CONFIG__FORM_ERROR_PAGE = eINSTANCE.getFormLoginConfig_FormErrorPage();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FORM_LOGIN_CONFIG__ID = eINSTANCE.getFormLoginConfig_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.LocaleEncodingMappingImpl <em>Locale Encoding Mapping</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @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 '<em><b>Locale</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute LOCALE_ENCODING_MAPPING__LOCALE = eINSTANCE.getLocaleEncodingMapping_Locale();
-
-		/**
-		 * The meta object literal for the '<em><b>Encoding</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute LOCALE_ENCODING_MAPPING__ENCODING = eINSTANCE.getLocaleEncodingMapping_Encoding();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute LOCALE_ENCODING_MAPPING__ID = eINSTANCE.getLocaleEncodingMapping_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.LocaleEncodingMappingListImpl <em>Locale Encoding Mapping List</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @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 '<em><b>Local Encoding Mappings</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference LOCALE_ENCODING_MAPPING_LIST__LOCAL_ENCODING_MAPPINGS = eINSTANCE.getLocaleEncodingMappingList_LocalEncodingMappings();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @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 <em>Login Config</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @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 '<em><b>Auth Method</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute LOGIN_CONFIG__AUTH_METHOD = eINSTANCE.getLoginConfig_AuthMethod();
-
-		/**
-		 * The meta object literal for the '<em><b>Realm Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute LOGIN_CONFIG__REALM_NAME = eINSTANCE.getLoginConfig_RealmName();
-
-		/**
-		 * The meta object literal for the '<em><b>Form Login Config</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference LOGIN_CONFIG__FORM_LOGIN_CONFIG = eINSTANCE.getLoginConfig_FormLoginConfig();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute LOGIN_CONFIG__ID = eINSTANCE.getLoginConfig_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.MimeMappingImpl <em>Mime Mapping</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @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 '<em><b>Extension</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MIME_MAPPING__EXTENSION = eINSTANCE.getMimeMapping_Extension();
-
-		/**
-		 * The meta object literal for the '<em><b>Mime Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MIME_MAPPING__MIME_TYPE = eINSTANCE.getMimeMapping_MimeType();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MIME_MAPPING__ID = eINSTANCE.getMimeMapping_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.SecurityConstraintImpl <em>Security Constraint</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @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();
-
-		/**
-		 * The meta object literal for the '<em><b>Display Names</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SECURITY_CONSTRAINT__DISPLAY_NAMES = eINSTANCE.getSecurityConstraint_DisplayNames();
-
-		/**
-		 * The meta object literal for the '<em><b>Web Resource Collections</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SECURITY_CONSTRAINT__WEB_RESOURCE_COLLECTIONS = eINSTANCE.getSecurityConstraint_WebResourceCollections();
-
-		/**
-		 * The meta object literal for the '<em><b>Auth Constraint</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SECURITY_CONSTRAINT__AUTH_CONSTRAINT = eINSTANCE.getSecurityConstraint_AuthConstraint();
-
-		/**
-		 * The meta object literal for the '<em><b>User Data Constraint</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT = eINSTANCE.getSecurityConstraint_UserDataConstraint();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SECURITY_CONSTRAINT__ID = eINSTANCE.getSecurityConstraint_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.ServletImpl <em>Servlet</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.web.internal.impl.ServletImpl
-		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getServlet()
-		 * @generated
-		 */
-		EClass SERVLET = eINSTANCE.getServlet();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SERVLET__DESCRIPTIONS = eINSTANCE.getServlet_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Display Names</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SERVLET__DISPLAY_NAMES = eINSTANCE.getServlet_DisplayNames();
-
-		/**
-		 * The meta object literal for the '<em><b>Icons</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SERVLET__ICONS = eINSTANCE.getServlet_Icons();
-
-		/**
-		 * The meta object literal for the '<em><b>Servlet Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SERVLET__SERVLET_NAME = eINSTANCE.getServlet_ServletName();
-
-		/**
-		 * The meta object literal for the '<em><b>Servlet Class</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SERVLET__SERVLET_CLASS = eINSTANCE.getServlet_ServletClass();
-
-		/**
-		 * The meta object literal for the '<em><b>Jsp File</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SERVLET__JSP_FILE = eINSTANCE.getServlet_JspFile();
-
-		/**
-		 * The meta object literal for the '<em><b>Init Params</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SERVLET__INIT_PARAMS = eINSTANCE.getServlet_InitParams();
-
-		/**
-		 * The meta object literal for the '<em><b>Load On Startup</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SERVLET__LOAD_ON_STARTUP = eINSTANCE.getServlet_LoadOnStartup();
-
-		/**
-		 * The meta object literal for the '<em><b>Run As</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SERVLET__RUN_AS = eINSTANCE.getServlet_RunAs();
-
-		/**
-		 * The meta object literal for the '<em><b>Security Role Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SERVLET__SECURITY_ROLE_REFS = eINSTANCE.getServlet_SecurityRoleRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SERVLET__ID = eINSTANCE.getServlet_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.ServletMappingImpl <em>Servlet Mapping</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @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();
-
-		/**
-		 * The meta object literal for the '<em><b>Servlet Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SERVLET_MAPPING__SERVLET_NAME = eINSTANCE.getServletMapping_ServletName();
-
-		/**
-		 * The meta object literal for the '<em><b>Url Patterns</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SERVLET_MAPPING__URL_PATTERNS = eINSTANCE.getServletMapping_UrlPatterns();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SERVLET_MAPPING__ID = eINSTANCE.getServletMapping_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.SessionConfigImpl <em>Session Config</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @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();
-
-		/**
-		 * The meta object literal for the '<em><b>Session Timeout</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SESSION_CONFIG__SESSION_TIMEOUT = eINSTANCE.getSessionConfig_SessionTimeout();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SESSION_CONFIG__ID = eINSTANCE.getSessionConfig_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.UserDataConstraintImpl <em>User Data Constraint</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @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();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference USER_DATA_CONSTRAINT__DESCRIPTIONS = eINSTANCE.getUserDataConstraint_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Transport Guarantee</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute USER_DATA_CONSTRAINT__TRANSPORT_GUARANTEE = eINSTANCE.getUserDataConstraint_TransportGuarantee();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute USER_DATA_CONSTRAINT__ID = eINSTANCE.getUserDataConstraint_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl <em>App</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.web.internal.impl.WebAppImpl
-		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getWebApp()
-		 * @generated
-		 */
-		EClass WEB_APP = eINSTANCE.getWebApp();
-
-		/**
-		 * The meta object literal for the '<em><b>Group</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WEB_APP__GROUP = eINSTANCE.getWebApp_Group();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__DESCRIPTIONS = eINSTANCE.getWebApp_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Display Names</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__DISPLAY_NAMES = eINSTANCE.getWebApp_DisplayNames();
-
-		/**
-		 * The meta object literal for the '<em><b>Icons</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__ICONS = eINSTANCE.getWebApp_Icons();
-
-		/**
-		 * The meta object literal for the '<em><b>Distributables</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__DISTRIBUTABLES = eINSTANCE.getWebApp_Distributables();
-
-		/**
-		 * The meta object literal for the '<em><b>Context Params</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__CONTEXT_PARAMS = eINSTANCE.getWebApp_ContextParams();
-
-		/**
-		 * The meta object literal for the '<em><b>Filters</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__FILTERS = eINSTANCE.getWebApp_Filters();
-
-		/**
-		 * The meta object literal for the '<em><b>Filter Mappings</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__FILTER_MAPPINGS = eINSTANCE.getWebApp_FilterMappings();
-
-		/**
-		 * The meta object literal for the '<em><b>Listeners</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__LISTENERS = eINSTANCE.getWebApp_Listeners();
-
-		/**
-		 * The meta object literal for the '<em><b>Servlets</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__SERVLETS = eINSTANCE.getWebApp_Servlets();
-
-		/**
-		 * The meta object literal for the '<em><b>Servlet Mappings</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__SERVLET_MAPPINGS = eINSTANCE.getWebApp_ServletMappings();
-
-		/**
-		 * The meta object literal for the '<em><b>Session Configs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__SESSION_CONFIGS = eINSTANCE.getWebApp_SessionConfigs();
-
-		/**
-		 * The meta object literal for the '<em><b>Mime Mappings</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__MIME_MAPPINGS = eINSTANCE.getWebApp_MimeMappings();
-
-		/**
-		 * The meta object literal for the '<em><b>Welcome File Lists</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__WELCOME_FILE_LISTS = eINSTANCE.getWebApp_WelcomeFileLists();
-
-		/**
-		 * The meta object literal for the '<em><b>Error Pages</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__ERROR_PAGES = eINSTANCE.getWebApp_ErrorPages();
-
-		/**
-		 * The meta object literal for the '<em><b>Jsp Configs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__JSP_CONFIGS = eINSTANCE.getWebApp_JspConfigs();
-
-		/**
-		 * The meta object literal for the '<em><b>Security Constraints</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__SECURITY_CONSTRAINTS = eINSTANCE.getWebApp_SecurityConstraints();
-
-		/**
-		 * The meta object literal for the '<em><b>Login Configs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__LOGIN_CONFIGS = eINSTANCE.getWebApp_LoginConfigs();
-
-		/**
-		 * The meta object literal for the '<em><b>Security Roles</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__SECURITY_ROLES = eINSTANCE.getWebApp_SecurityRoles();
-
-		/**
-		 * The meta object literal for the '<em><b>Env Entries</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__ENV_ENTRIES = eINSTANCE.getWebApp_EnvEntries();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__EJB_REFS = eINSTANCE.getWebApp_EjbRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb Local Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__EJB_LOCAL_REFS = eINSTANCE.getWebApp_EjbLocalRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Service Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__SERVICE_REFS = eINSTANCE.getWebApp_ServiceRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Resource Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__RESOURCE_REFS = eINSTANCE.getWebApp_ResourceRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Resource Env Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__RESOURCE_ENV_REFS = eINSTANCE.getWebApp_ResourceEnvRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Message Destination Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__MESSAGE_DESTINATION_REFS = eINSTANCE.getWebApp_MessageDestinationRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Persistence Context Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__PERSISTENCE_CONTEXT_REFS = eINSTANCE.getWebApp_PersistenceContextRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Persistence Unit Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__PERSISTENCE_UNIT_REFS = eINSTANCE.getWebApp_PersistenceUnitRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Post Constructs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__POST_CONSTRUCTS = eINSTANCE.getWebApp_PostConstructs();
-
-		/**
-		 * The meta object literal for the '<em><b>Pre Destroys</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__PRE_DESTROYS = eINSTANCE.getWebApp_PreDestroys();
-
-		/**
-		 * The meta object literal for the '<em><b>Message Destinations</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__MESSAGE_DESTINATIONS = eINSTANCE.getWebApp_MessageDestinations();
-
-		/**
-		 * The meta object literal for the '<em><b>Local Encoding Mappings Lists</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS = eINSTANCE.getWebApp_LocalEncodingMappingsLists();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WEB_APP__ID = eINSTANCE.getWebApp_Id();
-
-		/**
-		 * The meta object literal for the '<em><b>Metadata Complete</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WEB_APP__METADATA_COMPLETE = eINSTANCE.getWebApp_MetadataComplete();
-
-		/**
-		 * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WEB_APP__VERSION = eINSTANCE.getWebApp_Version();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.WebAppDeploymentDescriptorImpl <em>App Deployment Descriptor</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @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();
-
-		/**
-		 * The meta object literal for the '<em><b>Mixed</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WEB_APP_DEPLOYMENT_DESCRIPTOR__MIXED = eINSTANCE.getWebAppDeploymentDescriptor_Mixed();
-
-		/**
-		 * The meta object literal for the '<em><b>XMLNS Prefix Map</b></em>' map feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP = eINSTANCE.getWebAppDeploymentDescriptor_XMLNSPrefixMap();
-
-		/**
-		 * The meta object literal for the '<em><b>XSI Schema Location</b></em>' map feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION = eINSTANCE.getWebAppDeploymentDescriptor_XSISchemaLocation();
-
-		/**
-		 * The meta object literal for the '<em><b>Web App</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP_DEPLOYMENT_DESCRIPTOR__WEB_APP = eINSTANCE.getWebAppDeploymentDescriptor_WebApp();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.WebResourceCollectionImpl <em>Resource Collection</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.web.internal.impl.WebResourceCollectionImpl
-		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getWebResourceCollection()
-		 * @generated
-		 */
-		EClass WEB_RESOURCE_COLLECTION = eINSTANCE.getWebResourceCollection();
-
-		/**
-		 * The meta object literal for the '<em><b>Web Resource Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WEB_RESOURCE_COLLECTION__WEB_RESOURCE_NAME = eINSTANCE.getWebResourceCollection_WebResourceName();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_RESOURCE_COLLECTION__DESCRIPTIONS = eINSTANCE.getWebResourceCollection_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>Url Patterns</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_RESOURCE_COLLECTION__URL_PATTERNS = eINSTANCE.getWebResourceCollection_UrlPatterns();
-
-		/**
-		 * The meta object literal for the '<em><b>Http Methods</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WEB_RESOURCE_COLLECTION__HTTP_METHODS = eINSTANCE.getWebResourceCollection_HttpMethods();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WEB_RESOURCE_COLLECTION__ID = eINSTANCE.getWebResourceCollection_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.internal.impl.WelcomeFileListImpl <em>Welcome File List</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.web.internal.impl.WelcomeFileListImpl
-		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getWelcomeFileList()
-		 * @generated
-		 */
-		EClass WELCOME_FILE_LIST = eINSTANCE.getWelcomeFileList();
-
-		/**
-		 * The meta object literal for the '<em><b>Welcome Files</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WELCOME_FILE_LIST__WELCOME_FILES = eINSTANCE.getWelcomeFileList_WelcomeFiles();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WELCOME_FILE_LIST__ID = eINSTANCE.getWelcomeFileList_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.DispatcherType <em>Dispatcher Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.web.DispatcherType
-		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getDispatcherType()
-		 * @generated
-		 */
-		EEnum DISPATCHER_TYPE = eINSTANCE.getDispatcherType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.NullCharType <em>Null Char Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.web.NullCharType
-		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getNullCharType()
-		 * @generated
-		 */
-		EEnum NULL_CHAR_TYPE = eINSTANCE.getNullCharType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.TransportGuaranteeType <em>Transport Guarantee Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.web.TransportGuaranteeType
-		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getTransportGuaranteeType()
-		 * @generated
-		 */
-		EEnum TRANSPORT_GUARANTEE_TYPE = eINSTANCE.getTransportGuaranteeType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.web.WebAppVersionType <em>App Version Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.web.WebAppVersionType
-		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getWebAppVersionType()
-		 * @generated
-		 */
-		EEnum WEB_APP_VERSION_TYPE = eINSTANCE.getWebAppVersionType();
-
-		/**
-		 * The meta object literal for the '<em>Auth Method Type</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.lang.String
-		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getAuthMethodType()
-		 * @generated
-		 */
-		EDataType AUTH_METHOD_TYPE = eINSTANCE.getAuthMethodType();
-
-		/**
-		 * The meta object literal for the '<em>Dispatcher Type Object</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.web.DispatcherType
-		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getDispatcherTypeObject()
-		 * @generated
-		 */
-		EDataType DISPATCHER_TYPE_OBJECT = eINSTANCE.getDispatcherTypeObject();
-
-		/**
-		 * The meta object literal for the '<em>Encoding Type</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.lang.String
-		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getEncodingType()
-		 * @generated
-		 */
-		EDataType ENCODING_TYPE = eINSTANCE.getEncodingType();
-
-		/**
-		 * The meta object literal for the '<em>Error Code Type</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.math.BigInteger
-		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getErrorCodeType()
-		 * @generated
-		 */
-		EDataType ERROR_CODE_TYPE = eINSTANCE.getErrorCodeType();
-
-		/**
-		 * The meta object literal for the '<em>Filter Name Type</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.lang.String
-		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getFilterNameType()
-		 * @generated
-		 */
-		EDataType FILTER_NAME_TYPE = eINSTANCE.getFilterNameType();
-
-		/**
-		 * The meta object literal for the '<em>Http Method Type</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.lang.String
-		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getHttpMethodType()
-		 * @generated
-		 */
-		EDataType HTTP_METHOD_TYPE = eINSTANCE.getHttpMethodType();
-
-		/**
-		 * The meta object literal for the '<em>Load On Startup Type</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.lang.Object
-		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getLoadOnStartupType()
-		 * @generated
-		 */
-		EDataType LOAD_ON_STARTUP_TYPE = eINSTANCE.getLoadOnStartupType();
-
-		/**
-		 * The meta object literal for the '<em>Locale Type</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.lang.String
-		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getLocaleType()
-		 * @generated
-		 */
-		EDataType LOCALE_TYPE = eINSTANCE.getLocaleType();
-
-		/**
-		 * The meta object literal for the '<em>Mime Type Type</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.lang.String
-		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getMimeTypeType()
-		 * @generated
-		 */
-		EDataType MIME_TYPE_TYPE = eINSTANCE.getMimeTypeType();
-
-		/**
-		 * The meta object literal for the '<em>Non Empty String Type</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.lang.String
-		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getNonEmptyStringType()
-		 * @generated
-		 */
-		EDataType NON_EMPTY_STRING_TYPE = eINSTANCE.getNonEmptyStringType();
-
-		/**
-		 * The meta object literal for the '<em>Null Char Type Object</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.web.NullCharType
-		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getNullCharTypeObject()
-		 * @generated
-		 */
-		EDataType NULL_CHAR_TYPE_OBJECT = eINSTANCE.getNullCharTypeObject();
-
-		/**
-		 * The meta object literal for the '<em>Servlet Name Type</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.lang.String
-		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getServletNameType()
-		 * @generated
-		 */
-		EDataType SERVLET_NAME_TYPE = eINSTANCE.getServletNameType();
-
-		/**
-		 * The meta object literal for the '<em>Transport Guarantee Type Object</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.web.TransportGuaranteeType
-		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getTransportGuaranteeTypeObject()
-		 * @generated
-		 */
-		EDataType TRANSPORT_GUARANTEE_TYPE_OBJECT = eINSTANCE.getTransportGuaranteeTypeObject();
-
-		/**
-		 * The meta object literal for the '<em>War Path Type</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.lang.String
-		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getWarPathType()
-		 * @generated
-		 */
-		EDataType WAR_PATH_TYPE = eINSTANCE.getWarPathType();
-
-		/**
-		 * The meta object literal for the '<em>App Version Type Object</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.javaee.web.WebAppVersionType
-		 * @see org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl#getWebAppVersionTypeObject()
-		 * @generated
-		 */
-		EDataType WEB_APP_VERSION_TYPE_OBJECT = eINSTANCE.getWebAppVersionTypeObject();
-
-	}
-
-} //WebPackage
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/util/WebAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/util/WebAdapterFactory.java
deleted file mode 100644
index 258c80216..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/util/WebAdapterFactory.java
+++ /dev/null
@@ -1,415 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.web.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.web.*;
-
-import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage
- * @generated
- */
-public class WebAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static WebPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WebAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = WebPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected WebSwitch modelSwitch =
-		new WebSwitch() {
-			public Object caseAuthConstraint(AuthConstraint object) {
-				return createAuthConstraintAdapter();
-			}
-			public Object caseErrorPage(ErrorPage object) {
-				return createErrorPageAdapter();
-			}
-			public Object caseFilter(Filter object) {
-				return createFilterAdapter();
-			}
-			public Object caseFilterMapping(FilterMapping object) {
-				return createFilterMappingAdapter();
-			}
-			public Object caseFormLoginConfig(FormLoginConfig object) {
-				return createFormLoginConfigAdapter();
-			}
-			public Object caseLocaleEncodingMapping(LocaleEncodingMapping object) {
-				return createLocaleEncodingMappingAdapter();
-			}
-			public Object caseLocaleEncodingMappingList(LocaleEncodingMappingList object) {
-				return createLocaleEncodingMappingListAdapter();
-			}
-			public Object caseLoginConfig(LoginConfig object) {
-				return createLoginConfigAdapter();
-			}
-			public Object caseMimeMapping(MimeMapping object) {
-				return createMimeMappingAdapter();
-			}
-			public Object caseSecurityConstraint(SecurityConstraint object) {
-				return createSecurityConstraintAdapter();
-			}
-			public Object caseServlet(Servlet object) {
-				return createServletAdapter();
-			}
-			public Object caseServletMapping(ServletMapping object) {
-				return createServletMappingAdapter();
-			}
-			public Object caseSessionConfig(SessionConfig object) {
-				return createSessionConfigAdapter();
-			}
-			public Object caseUserDataConstraint(UserDataConstraint object) {
-				return createUserDataConstraintAdapter();
-			}
-			public Object caseWebApp(WebApp object) {
-				return createWebAppAdapter();
-			}
-			public Object caseWebAppDeploymentDescriptor(WebAppDeploymentDescriptor object) {
-				return createWebAppDeploymentDescriptorAdapter();
-			}
-			public Object caseWebResourceCollection(WebResourceCollection object) {
-				return createWebResourceCollectionAdapter();
-			}
-			public Object caseWelcomeFileList(WelcomeFileList object) {
-				return createWelcomeFileListAdapter();
-			}
-			public Object defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	public Adapter createAdapter(Notifier target) {
-		return (Adapter)modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.web.AuthConstraint <em>Auth Constraint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.web.AuthConstraint
-	 * @generated
-	 */
-	public Adapter createAuthConstraintAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.web.ErrorPage <em>Error Page</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.web.ErrorPage
-	 * @generated
-	 */
-	public Adapter createErrorPageAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.web.Filter <em>Filter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.web.Filter
-	 * @generated
-	 */
-	public Adapter createFilterAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.web.FilterMapping <em>Filter Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.web.FilterMapping
-	 * @generated
-	 */
-	public Adapter createFilterMappingAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.web.FormLoginConfig <em>Form Login Config</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.web.FormLoginConfig
-	 * @generated
-	 */
-	public Adapter createFormLoginConfigAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.web.LocaleEncodingMapping <em>Locale Encoding Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.web.LocaleEncodingMapping
-	 * @generated
-	 */
-	public Adapter createLocaleEncodingMappingAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.web.LocaleEncodingMappingList <em>Locale Encoding Mapping List</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.web.LocaleEncodingMappingList
-	 * @generated
-	 */
-	public Adapter createLocaleEncodingMappingListAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.web.LoginConfig <em>Login Config</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.web.LoginConfig
-	 * @generated
-	 */
-	public Adapter createLoginConfigAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.web.MimeMapping <em>Mime Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.web.MimeMapping
-	 * @generated
-	 */
-	public Adapter createMimeMappingAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.web.SecurityConstraint <em>Security Constraint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.web.SecurityConstraint
-	 * @generated
-	 */
-	public Adapter createSecurityConstraintAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.web.Servlet <em>Servlet</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.web.Servlet
-	 * @generated
-	 */
-	public Adapter createServletAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.web.ServletMapping <em>Servlet Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.web.ServletMapping
-	 * @generated
-	 */
-	public Adapter createServletMappingAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.web.SessionConfig <em>Session Config</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.web.SessionConfig
-	 * @generated
-	 */
-	public Adapter createSessionConfigAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.web.UserDataConstraint <em>User Data Constraint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.web.UserDataConstraint
-	 * @generated
-	 */
-	public Adapter createUserDataConstraintAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.web.WebApp <em>App</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.web.WebApp
-	 * @generated
-	 */
-	public Adapter createWebAppAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.web.WebAppDeploymentDescriptor <em>App Deployment Descriptor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.web.WebAppDeploymentDescriptor
-	 * @generated
-	 */
-	public Adapter createWebAppDeploymentDescriptorAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.web.WebResourceCollection <em>Resource Collection</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.web.WebResourceCollection
-	 * @generated
-	 */
-	public Adapter createWebResourceCollectionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.web.WelcomeFileList <em>Welcome File List</em>}'.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.javaee.web.WelcomeFileList
-	 * @generated
-	 */
-	public Adapter createWelcomeFileListAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //WebAdapterFactory
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/util/WebResourceFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/util/WebResourceFactoryImpl.java
deleted file mode 100644
index 46401bb72..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/util/WebResourceFactoryImpl.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.web.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.XMLOptions;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.ecore.xmi.impl.XMLOptionsImpl;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource Factory</b> associated with the package.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.javaee.web.internal.util.WebResourceImpl
- * @generated
- */
-public class WebResourceFactoryImpl extends ResourceFactoryImpl {
-	/**
-	 * Creates an instance of the resource factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WebResourceFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public Resource createResource(URI uri) {
-		XMLResource result = new WebResourceImpl(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);
-		XMLOptions xmlOptions = new XMLOptionsImpl();
-
-		xmlOptions.setProcessSchemaLocations(true);
-		    
-		result.getDefaultLoadOptions().put(XMLResource.OPTION_XML_OPTIONS, xmlOptions);
-		
-		return result;
-	}
-
-} //WebResourceFactoryImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/util/WebResourceImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/util/WebResourceImpl.java
deleted file mode 100644
index 3cdd1c199..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/util/WebResourceImpl.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.web.internal.util;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.xmi.XMLHelper;
-import org.eclipse.emf.ecore.xmi.XMLLoad;
-import org.eclipse.jst.javaee.core.JEEXMLLoadImpl;
-import org.eclipse.jst.javaee.core.internal.util.JavaeeResourceImpl;
-import org.eclipse.jst.javaee.web.IWebResource;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.javaee.web.WebAppDeploymentDescriptor;
-import org.eclipse.wst.common.internal.emf.resource.IRootObjectResource;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource </b> associated with the package.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.javaee.web.internal.util.WebResourceFactoryImpl
- * @generated
- */
-public class WebResourceImpl extends JavaeeResourceImpl implements IRootObjectResource, IWebResource{
-	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param uri the URI of the new resource.
-	 * @generated
-	 */
-	public WebResourceImpl(URI uri) {
-		super(uri);
-	}
-
-	protected XMLLoad createXMLLoad() {
-		 return new JEEXMLLoadImpl(createXMLHelper());
-	}
-
-	protected XMLHelper createXMLHelper() {
-		
-		return new WebXMLHelperImpl(this);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.javaee.web.internal.util.IWebResource#getRootObject()
-	 */
-	public EObject getRootObject() {
-		if (contents == null || contents.isEmpty())
-			return null;
-		Object root = getContents().get(0);
-		if(root == null){
-			return null;
-		}
-		return (EObject)((WebAppDeploymentDescriptor)root).getWebApp();
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.javaee.web.internal.util.IWebResource#getWebApp()
-	 */
-	public WebApp getWebApp() {
-		return (WebApp)getRootObject();
-	}
-
-} //WebResourceImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/util/WebSwitch.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/util/WebSwitch.java
deleted file mode 100644
index 2f688bf70..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/util/WebSwitch.java
+++ /dev/null
@@ -1,493 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.web.internal.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.jst.javaee.web.*;
-
-import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> 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.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage
- * @generated
- */
-public class WebSwitch {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static WebPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WebSwitch() {
-		if (modelPackage == null) {
-			modelPackage = WebPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	public Object 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.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage) {
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
-			List eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch((EClass)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.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case WebPackage.AUTH_CONSTRAINT: {
-				AuthConstraint authConstraint = (AuthConstraint)theEObject;
-				Object result = caseAuthConstraint(authConstraint);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WebPackage.ERROR_PAGE: {
-				ErrorPage errorPage = (ErrorPage)theEObject;
-				Object result = caseErrorPage(errorPage);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WebPackage.FILTER: {
-				Filter filter = (Filter)theEObject;
-				Object result = caseFilter(filter);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WebPackage.FILTER_MAPPING: {
-				FilterMapping filterMapping = (FilterMapping)theEObject;
-				Object result = caseFilterMapping(filterMapping);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WebPackage.FORM_LOGIN_CONFIG: {
-				FormLoginConfig formLoginConfig = (FormLoginConfig)theEObject;
-				Object result = caseFormLoginConfig(formLoginConfig);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WebPackage.LOCALE_ENCODING_MAPPING: {
-				LocaleEncodingMapping localeEncodingMapping = (LocaleEncodingMapping)theEObject;
-				Object 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);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WebPackage.LOGIN_CONFIG: {
-				LoginConfig loginConfig = (LoginConfig)theEObject;
-				Object result = caseLoginConfig(loginConfig);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WebPackage.MIME_MAPPING: {
-				MimeMapping mimeMapping = (MimeMapping)theEObject;
-				Object result = caseMimeMapping(mimeMapping);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WebPackage.SECURITY_CONSTRAINT: {
-				SecurityConstraint securityConstraint = (SecurityConstraint)theEObject;
-				Object result = caseSecurityConstraint(securityConstraint);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WebPackage.SERVLET: {
-				Servlet servlet = (Servlet)theEObject;
-				Object result = caseServlet(servlet);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WebPackage.SERVLET_MAPPING: {
-				ServletMapping servletMapping = (ServletMapping)theEObject;
-				Object result = caseServletMapping(servletMapping);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WebPackage.SESSION_CONFIG: {
-				SessionConfig sessionConfig = (SessionConfig)theEObject;
-				Object result = caseSessionConfig(sessionConfig);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WebPackage.USER_DATA_CONSTRAINT: {
-				UserDataConstraint userDataConstraint = (UserDataConstraint)theEObject;
-				Object result = caseUserDataConstraint(userDataConstraint);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WebPackage.WEB_APP: {
-				WebApp webApp = (WebApp)theEObject;
-				Object 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);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WebPackage.WEB_RESOURCE_COLLECTION: {
-				WebResourceCollection webResourceCollection = (WebResourceCollection)theEObject;
-				Object result = caseWebResourceCollection(webResourceCollection);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WebPackage.WELCOME_FILE_LIST: {
-				WelcomeFileList welcomeFileList = (WelcomeFileList)theEObject;
-				Object result = caseWelcomeFileList(welcomeFileList);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Auth Constraint</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Auth Constraint</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseAuthConstraint(AuthConstraint object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Error Page</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Error Page</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseErrorPage(ErrorPage object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Filter</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Filter</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseFilter(Filter object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Filter Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Filter Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseFilterMapping(FilterMapping object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Form Login Config</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Form Login Config</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseFormLoginConfig(FormLoginConfig object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Locale Encoding Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Locale Encoding Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseLocaleEncodingMapping(LocaleEncodingMapping object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Locale Encoding Mapping List</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Locale Encoding Mapping List</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseLocaleEncodingMappingList(LocaleEncodingMappingList object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Login Config</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Login Config</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseLoginConfig(LoginConfig object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Mime Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Mime Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMimeMapping(MimeMapping object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Security Constraint</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Security Constraint</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseSecurityConstraint(SecurityConstraint object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Servlet</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Servlet</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseServlet(Servlet object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Servlet Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Servlet Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseServletMapping(ServletMapping object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Session Config</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Session Config</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseSessionConfig(SessionConfig object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>User Data Constraint</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>User Data Constraint</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseUserDataConstraint(UserDataConstraint object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>App</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>App</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWebApp(WebApp object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>App Deployment Descriptor</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>App Deployment Descriptor</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWebAppDeploymentDescriptor(WebAppDeploymentDescriptor object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Resource Collection</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Resource Collection</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWebResourceCollection(WebResourceCollection object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Welcome File List</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Welcome File List</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWelcomeFileList(WelcomeFileList object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	public Object defaultCase(EObject object) {
-		return null;
-	}
-
-} //WebSwitch
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/util/WebValidator.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/util/WebValidator.java
deleted file mode 100644
index 3f69ecf6d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/util/WebValidator.java
+++ /dev/null
@@ -1,721 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.web.internal.util;
-
-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.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.util.EObjectValidator;
-
-import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-
-import org.eclipse.emf.ecore.xml.type.util.XMLTypeUtil;
-import org.eclipse.emf.ecore.xml.type.util.XMLTypeValidator;
-
-import org.eclipse.jst.javaee.web.*;
-
-import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Validator</b> for the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage
- * @generated
- */
-public class WebValidator extends EObjectValidator {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final WebValidator INSTANCE = new WebValidator();
-
-	/**
-	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.common.util.Diagnostic#getSource()
-	 * @see org.eclipse.emf.common.util.Diagnostic#getCode()
-	 * @generated
-	 */
-	public static final String DIAGNOSTIC_SOURCE = "org.eclipse.jst.javaee.web"; //$NON-NLS-1$
-
-	/**
-	 * A constant with a fixed name that can be used as the base value for additional hand written constants.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 0;
-
-	/**
-	 * A constant with a fixed name that can be used as the base value for additional hand written constants in a derived class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static final int DIAGNOSTIC_CODE_COUNT = GENERATED_DIAGNOSTIC_CODE_COUNT;
-
-	/**
-	 * The cached base package validator.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XMLTypeValidator xmlTypeValidator;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WebValidator() {
-		super();
-		xmlTypeValidator = XMLTypeValidator.INSTANCE;
-	}
-
-	/**
-	 * Returns the package of this validator switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EPackage getEPackage() {
-	  return WebPackage.eINSTANCE;
-	}
-
-	/**
-	 * Calls <code>validateXXX</code> for the corresonding classifier of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map context) {
-		switch (classifierID) {
-			case WebPackage.AUTH_CONSTRAINT:
-				return validateAuthConstraint((AuthConstraint)value, diagnostics, context);
-			case WebPackage.ERROR_PAGE:
-				return validateErrorPage((ErrorPage)value, diagnostics, context);
-			case WebPackage.FILTER:
-				return validateFilter((Filter)value, diagnostics, context);
-			case WebPackage.FILTER_MAPPING:
-				return validateFilterMapping((FilterMapping)value, diagnostics, context);
-			case WebPackage.FORM_LOGIN_CONFIG:
-				return validateFormLoginConfig((FormLoginConfig)value, diagnostics, context);
-			case WebPackage.LOCALE_ENCODING_MAPPING:
-				return validateLocaleEncodingMapping((LocaleEncodingMapping)value, diagnostics, context);
-			case WebPackage.LOCALE_ENCODING_MAPPING_LIST:
-				return validateLocaleEncodingMappingList((LocaleEncodingMappingList)value, diagnostics, context);
-			case WebPackage.LOGIN_CONFIG:
-				return validateLoginConfig((LoginConfig)value, diagnostics, context);
-			case WebPackage.MIME_MAPPING:
-				return validateMimeMapping((MimeMapping)value, diagnostics, context);
-			case WebPackage.SECURITY_CONSTRAINT:
-				return validateSecurityConstraint((SecurityConstraint)value, diagnostics, context);
-			case WebPackage.SERVLET:
-				return validateServlet((Servlet)value, diagnostics, context);
-			case WebPackage.SERVLET_MAPPING:
-				return validateServletMapping((ServletMapping)value, diagnostics, context);
-			case WebPackage.SESSION_CONFIG:
-				return validateSessionConfig((SessionConfig)value, diagnostics, context);
-			case WebPackage.USER_DATA_CONSTRAINT:
-				return validateUserDataConstraint((UserDataConstraint)value, diagnostics, context);
-			case WebPackage.WEB_APP:
-				return validateWebApp((WebApp)value, diagnostics, context);
-			case WebPackage.WEB_APP_DEPLOYMENT_DESCRIPTOR:
-				return validateWebAppDeploymentDescriptor((WebAppDeploymentDescriptor)value, diagnostics, context);
-			case WebPackage.WEB_RESOURCE_COLLECTION:
-				return validateWebResourceCollection((WebResourceCollection)value, diagnostics, context);
-			case WebPackage.WELCOME_FILE_LIST:
-				return validateWelcomeFileList((WelcomeFileList)value, diagnostics, context);
-			case WebPackage.DISPATCHER_TYPE:
-				return validateDispatcherType((DispatcherType)value, diagnostics, context);
-			case WebPackage.NULL_CHAR_TYPE:
-				return validateNullCharType((NullCharType)value, diagnostics, context);
-			case WebPackage.TRANSPORT_GUARANTEE_TYPE:
-				return validateTransportGuaranteeType((TransportGuaranteeType)value, diagnostics, context);
-			case WebPackage.WEB_APP_VERSION_TYPE:
-				return validateWebAppVersionType((WebAppVersionType)value, diagnostics, context);
-			case WebPackage.AUTH_METHOD_TYPE:
-				return validateAuthMethodType((String)value, diagnostics, context);
-			case WebPackage.DISPATCHER_TYPE_OBJECT:
-				return validateDispatcherTypeObject((DispatcherType)value, diagnostics, context);
-			case WebPackage.ENCODING_TYPE:
-				return validateEncodingType((String)value, diagnostics, context);
-			case WebPackage.ERROR_CODE_TYPE:
-				return validateErrorCodeType((BigInteger)value, diagnostics, context);
-			case WebPackage.FILTER_NAME_TYPE:
-				return validateFilterNameType((String)value, diagnostics, context);
-			case WebPackage.HTTP_METHOD_TYPE:
-				return validateHttpMethodType((String)value, diagnostics, context);
-			case WebPackage.LOAD_ON_STARTUP_TYPE:
-				return validateLoadOnStartupType(value, diagnostics, context);
-			case WebPackage.LOCALE_TYPE:
-				return validateLocaleType((String)value, diagnostics, context);
-			case WebPackage.MIME_TYPE_TYPE:
-				return validateMimeTypeType((String)value, diagnostics, context);
-			case WebPackage.NON_EMPTY_STRING_TYPE:
-				return validateNonEmptyStringType((String)value, diagnostics, context);
-			case WebPackage.NULL_CHAR_TYPE_OBJECT:
-				return validateNullCharTypeObject((NullCharType)value, diagnostics, context);
-			case WebPackage.SERVLET_NAME_TYPE:
-				return validateServletNameType((String)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: 
-				return true;
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateAuthConstraint(AuthConstraint authConstraint, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)authConstraint, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateErrorPage(ErrorPage errorPage, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)errorPage, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateFilter(Filter filter, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)filter, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateFilterMapping(FilterMapping filterMapping, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)filterMapping, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateFormLoginConfig(FormLoginConfig formLoginConfig, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)formLoginConfig, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateLocaleEncodingMapping(LocaleEncodingMapping localeEncodingMapping, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)localeEncodingMapping, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateLocaleEncodingMappingList(LocaleEncodingMappingList localeEncodingMappingList, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)localeEncodingMappingList, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateLoginConfig(LoginConfig loginConfig, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)loginConfig, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateMimeMapping(MimeMapping mimeMapping, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)mimeMapping, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateSecurityConstraint(SecurityConstraint securityConstraint, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)securityConstraint, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateServlet(Servlet servlet, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)servlet, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateServletMapping(ServletMapping servletMapping, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)servletMapping, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateSessionConfig(SessionConfig sessionConfig, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)sessionConfig, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateUserDataConstraint(UserDataConstraint userDataConstraint, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)userDataConstraint, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateWebApp(WebApp webApp, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)webApp, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateWebAppDeploymentDescriptor(WebAppDeploymentDescriptor webAppDeploymentDescriptor, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)webAppDeploymentDescriptor, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateWebResourceCollection(WebResourceCollection webResourceCollection, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)webResourceCollection, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateWelcomeFileList(WelcomeFileList welcomeFileList, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint((EObject)welcomeFileList, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateDispatcherType(DispatcherType dispatcherType, DiagnosticChain diagnostics, Map context) {
-		return true;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateNullCharType(NullCharType nullCharType, DiagnosticChain diagnostics, Map context) {
-		return true;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateTransportGuaranteeType(TransportGuaranteeType transportGuaranteeType, DiagnosticChain diagnostics, Map context) {
-		return true;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateWebAppVersionType(WebAppVersionType webAppVersionType, DiagnosticChain diagnostics, Map context) {
-		return true;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateAuthMethodType(String authMethodType, DiagnosticChain diagnostics, Map context) {
-		return true;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateDispatcherTypeObject(DispatcherType dispatcherTypeObject, DiagnosticChain diagnostics, Map context) {
-		return true;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateEncodingType(String encodingType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateEncodingType_Pattern(encodingType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateEncodingType_Pattern
-	 */
-	public static final  PatternMatcher [][] ENCODING_TYPE__PATTERN__VALUES =
-		new PatternMatcher [][] {
-			new PatternMatcher [] {
-				XMLTypeUtil.createPatternMatcher("[^\\s]+")
-			}
-		};
-
-	/**
-	 * Validates the Pattern constraint of '<em>Encoding Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateEncodingType_Pattern(String encodingType, DiagnosticChain diagnostics, Map context) {
-		return validatePattern(WebPackage.Literals.ENCODING_TYPE, encodingType, ENCODING_TYPE__PATTERN__VALUES, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateErrorCodeType(BigInteger errorCodeType, DiagnosticChain diagnostics, Map context) {
-		boolean result = xmlTypeValidator.validatePositiveInteger_Min(errorCodeType, diagnostics, context);
-		if (result || diagnostics != null) result &= validateErrorCodeType_Pattern(errorCodeType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateErrorCodeType_Pattern
-	 */
-	public static final  PatternMatcher [][] ERROR_CODE_TYPE__PATTERN__VALUES =
-		new PatternMatcher [][] {
-			new PatternMatcher [] {
-				XMLTypeUtil.createPatternMatcher("\\d{3}")
-			}
-		};
-
-	/**
-	 * Validates the Pattern constraint of '<em>Error Code Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateErrorCodeType_Pattern(BigInteger errorCodeType, DiagnosticChain diagnostics, Map context) {
-		return validatePattern(WebPackage.Literals.ERROR_CODE_TYPE, errorCodeType, ERROR_CODE_TYPE__PATTERN__VALUES, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateFilterNameType(String filterNameType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateNonEmptyStringType_MinLength(filterNameType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateHttpMethodType(String httpMethodType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateHttpMethodType_Pattern(httpMethodType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateHttpMethodType_Pattern
-	 */
-	public static final  PatternMatcher [][] HTTP_METHOD_TYPE__PATTERN__VALUES =
-		new PatternMatcher [][] {
-			new PatternMatcher [] {
-				XMLTypeUtil.createPatternMatcher("[\\p{L}-[\\p{Cc}\\p{Z}]]+")
-			}
-		};
-
-	/**
-	 * Validates the Pattern constraint of '<em>Http Method Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateHttpMethodType_Pattern(String httpMethodType, DiagnosticChain diagnostics, Map context) {
-		return validatePattern(WebPackage.Literals.HTTP_METHOD_TYPE, httpMethodType, HTTP_METHOD_TYPE__PATTERN__VALUES, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateLoadOnStartupType(Object loadOnStartupType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateLoadOnStartupType_MemberTypes(loadOnStartupType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * Validates the MemberTypes constraint of '<em>Load On Startup Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateLoadOnStartupType_MemberTypes(Object loadOnStartupType, DiagnosticChain diagnostics, Map context) {
-		if (diagnostics != null) {
-			BasicDiagnostic tempDiagnostics = new BasicDiagnostic();
-			if (WebPackage.Literals.NULL_CHAR_TYPE.isInstance(loadOnStartupType)) {
-				if (validateNullCharType((NullCharType)loadOnStartupType, tempDiagnostics, context)) return true;
-			}
-			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));
-			}
-		}
-		else {
-			if (WebPackage.Literals.NULL_CHAR_TYPE.isInstance(loadOnStartupType)) {
-				if (validateNullCharType((NullCharType)loadOnStartupType, null, context)) return true;
-			}
-			if (XMLTypePackage.Literals.INTEGER.isInstance(loadOnStartupType)) {
-				if (xmlTypeValidator.validateInteger((BigInteger)loadOnStartupType, null, context)) return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateLocaleType(String localeType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateLocaleType_Pattern(localeType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateLocaleType_Pattern
-	 */
-	public static final  PatternMatcher [][] LOCALE_TYPE__PATTERN__VALUES =
-		new PatternMatcher [][] {
-			new PatternMatcher [] {
-				XMLTypeUtil.createPatternMatcher("[a-z]{2}(_|-)?([\\p{L}\\-\\p{Nd}]{2})?")
-			}
-		};
-
-	/**
-	 * Validates the Pattern constraint of '<em>Locale Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateLocaleType_Pattern(String localeType, DiagnosticChain diagnostics, Map context) {
-		return validatePattern(WebPackage.Literals.LOCALE_TYPE, localeType, LOCALE_TYPE__PATTERN__VALUES, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateMimeTypeType(String mimeTypeType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateMimeTypeType_Pattern(mimeTypeType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateMimeTypeType_Pattern
-	 */
-	public static final  PatternMatcher [][] MIME_TYPE_TYPE__PATTERN__VALUES =
-		new PatternMatcher [][] {
-			new PatternMatcher [] {
-				XMLTypeUtil.createPatternMatcher("[^\\p{Cc}^\\s]+/[^\\p{Cc}^\\s]+")
-			}
-		};
-
-	/**
-	 * Validates the Pattern constraint of '<em>Mime Type Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateMimeTypeType_Pattern(String mimeTypeType, DiagnosticChain diagnostics, Map context) {
-		return validatePattern(WebPackage.Literals.MIME_TYPE_TYPE, mimeTypeType, MIME_TYPE_TYPE__PATTERN__VALUES, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateNonEmptyStringType(String nonEmptyStringType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateNonEmptyStringType_MinLength(nonEmptyStringType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * Validates the MinLength constraint of '<em>Non Empty String Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateNonEmptyStringType_MinLength(String nonEmptyStringType, DiagnosticChain diagnostics, Map context) {
-		int length = nonEmptyStringType.length();  
-		boolean result = length >= 1;
-		if (!result && diagnostics != null) 
-			reportMinLengthViolation(WebPackage.Literals.NON_EMPTY_STRING_TYPE, nonEmptyStringType, length, 1, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateNullCharTypeObject(NullCharType nullCharTypeObject, DiagnosticChain diagnostics, Map context) {
-		return true;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateServletNameType(String servletNameType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateNonEmptyStringType_MinLength(servletNameType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateTransportGuaranteeTypeObject(TransportGuaranteeType transportGuaranteeTypeObject, DiagnosticChain diagnostics, Map context) {
-		return true;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateWarPathType(String warPathType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateWarPathType_Pattern(warPathType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateWarPathType_Pattern
-	 */
-	public static final  PatternMatcher [][] WAR_PATH_TYPE__PATTERN__VALUES =
-		new PatternMatcher [][] {
-			new PatternMatcher [] {
-				XMLTypeUtil.createPatternMatcher("/.*")
-			}
-		};
-
-	/**
-	 * Validates the Pattern constraint of '<em>War Path Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateWarPathType_Pattern(String warPathType, DiagnosticChain diagnostics, Map context) {
-		return validatePattern(WebPackage.Literals.WAR_PATH_TYPE, warPathType, WAR_PATH_TYPE__PATTERN__VALUES, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateWebAppVersionTypeObject(WebAppVersionType webAppVersionTypeObject, DiagnosticChain diagnostics, Map context) {
-		return true;
-	}
-
-} //WebValidator
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/util/WebXMLHelperImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/util/WebXMLHelperImpl.java
deleted file mode 100644
index 171d38fe9..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/util/WebXMLHelperImpl.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.web.internal.util;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage;
-import org.eclipse.jst.javaee.core.internal.util.JEEXMLHelperImpl;
-import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
-
-public class WebXMLHelperImpl extends JEEXMLHelperImpl {
-
-	public WebXMLHelperImpl(XMLResource resource) {
-		super(resource);
-		// TODO Auto-generated constructor stub
-	}
-
-	public String getURI(String prefix) {
-		if (prefix != null && prefix.equals(""))
-			return WebPackage.eNS_URI;
-		else
-			return super.getURI(prefix);
-	}
-
-	protected String getQName(EPackage ePackage, String name, boolean mustHavePrefix) {
-		String nsPrefix = getPrefix(ePackage, mustHavePrefix);
-		// Not using EE5 package namespace - default jee5 namespace is used
-		if (nsPrefix.equals(WebPackage.eNS_PREFIX) || nsPrefix.equals(JspPackage.eNS_PREFIX)) {
-			return name;
-		} else
-			return super.getQName(ePackage, name, mustHavePrefix);
-	}
-
-	@Override
-	public EStructuralFeature getFeature(EClass class1, String namespaceURI, String name, boolean isElement) {
-		
-		EStructuralFeature feat = super.getFeature(class1, namespaceURI, name, isElement);
-		if (feat == null)
-			//Try to use JSP namespace
-			feat = super.getFeature(class1, JspPackage.eNS_URI, name, isElement);
-		return feat;
-		
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/util/WebXMLProcessor.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/util/WebXMLProcessor.java
deleted file mode 100644
index 3a8ff18c4..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/util/WebXMLProcessor.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.javaee.web.internal.util;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
-import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
-
-/**
- * This class contains helper methods to serialize and deserialize XML documents
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class WebXMLProcessor extends XMLProcessor {
-	/**
-	 * Public constructor to instantiate the helper.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WebXMLProcessor() {
-		super((EPackage.Registry.INSTANCE));
-		WebPackage.eINSTANCE.eClass();
-	}
-	
-	/**
-	 * Register for "*" and "xml" file extensions the WebResourceFactoryImpl factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Map getRegistrations() {
-		if (registrations == null) {
-			super.getRegistrations();
-			registrations.put(XML_EXTENSION, new WebResourceFactoryImpl());
-			registrations.put(STAR_EXTENSION, new WebResourceFactoryImpl());
-		}
-		return registrations;
-	}
-
-} //WebXMLProcessor